From 6d5bcab19988ed4fe6835b90c1085b83c02589d0 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 15:11:06 +0200 Subject: [PATCH 01/17] started elevator layer --- assets/layers/elevator/elevator.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 assets/layers/elevator/elevator.json diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json new file mode 100644 index 0000000000..e17094c55f --- /dev/null +++ b/assets/layers/elevator/elevator.json @@ -0,0 +1,13 @@ +{ + "id": "elevator", + "name": { + "en": "elevator" + }, + "source": { + "osmTags": "elevator=yes" + }, + "minzoom": 13, + "mapRendering": [ + + ] +} \ No newline at end of file From caae66e0ae474c92bf99ee221294eb0efcc3eb30 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 17:04:55 +0200 Subject: [PATCH 02/17] tagrenderings --- assets/layers/elevator/elevator.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index e17094c55f..d414b6deca 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -7,6 +7,9 @@ "osmTags": "elevator=yes" }, "minzoom": 13, + "tagRenderings": [ + + ], "mapRendering": [ ] From 39d5ca424fd8c7c2eb4da90d019b3dacd105a07c Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 08:36:41 +0200 Subject: [PATCH 03/17] added kerb type and height question for entrance --- assets/layers/entrance/entrance.json | 90 ++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index c5df0bb8d3..efb9a8400b 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -340,6 +340,96 @@ "key": "width", "type": "distance" } + }, + { + "id": "kerb-type", + "question": { + "en": "What is the height of this kerb?", + "nl": "Hoe hoog is deze stoeprand?", + "de": "Wie hoch ist der Bordstein?" + }, + "mappings": [ + { + "if": "kerb=raised", + "then": { + "en": "This kerb is raised (>3 cm)", + "nl": "Deze stoeprand is hoog (>3 cm)", + "de": "Der Bordstein ist erhöht (>3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/raised.svg", + "class": "small" + } + }, + { + "if": "kerb=lowered", + "then": { + "en": "This kerb is lowered (~3 cm)", + "nl": "Deze stoeprand is verlaagd (~3 cm)", + "de": "Der Bordstein ist abgesenkt (~3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/lowered.svg", + "class": "small" + } + }, + { + "if": "kerb=flush", + "then": { + "en": "This kerb is flush (~0cm)", + "nl": "Deze stoeprand is vlak (~0cm)", + "de": "Der Bordstein ist bündig (~0cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/flush.svg", + "class": "small" + } + }, + { + "if": "kerb=no", + "then": { + "en": "There is no kerb here", + "nl": "Er is hier geen stoeprand", + "de": "Hier gibt es keinen Bordstein" + }, + "hideInAnswer": true, + "icon": { + "path": "./assets/layers/kerbs/no.svg", + "class": "small" + } + }, + { + "if": "kerb=yes", + "then": { + "en": "There is a kerb of unknown height", + "nl": "Er is een stoeprand met onbekende hoogte", + "de": "Es gibt einen Bordstein mit unbekannter Höhe" + }, + "hideInAnswer": true + } + ] + }, + { + "id": "kerb-height", + "question": { + "en": "What is the height of this kerb?", + "nl": "Hoe hoog is deze stoeprand?", + "de": "Wie hoch ist der Bordstein?" + }, + "render": { + "en": "Kerb height: {kerb:height}", + "nl": "Stoeprandhoogte: {kerb:height}", + "de": "Bordsteinhöhe: {kerb:height}" + }, + "freeform": { + "key": "kerb:height", + "placeholder": { + "en": "Height of the kerb", + "nl": "Hoogte van de stoeprand", + "de": "Höhe des Bordsteins" + }, + "type": "pnat" + } } ], "mapRendering": [ From 2611bd20523836c2c2e946fc191f9d9f79240fb9 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 09:41:25 +0200 Subject: [PATCH 04/17] added calculated tags --- assets/layers/entrance/entrance.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index efb9a8400b..651d251c94 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -32,6 +32,9 @@ "es": "Entrada" } }, + "calculatedTags": [ + "" + ], "tagRenderings": [ "images", { From ce24fb5b8852a8c293c05dec7cc5dc21dce6867d Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 10:50:29 +0200 Subject: [PATCH 05/17] entrance now has kerb-height questions --- assets/layers/entrance/entrance.json | 77 ++----------------- .../walls_and_buildings.json | 2 +- 2 files changed, 8 insertions(+), 71 deletions(-) diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 651d251c94..4f5a4dca31 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -33,7 +33,6 @@ } }, "calculatedTags": [ - "" ], "tagRenderings": [ "images", @@ -344,74 +343,6 @@ "type": "distance" } }, - { - "id": "kerb-type", - "question": { - "en": "What is the height of this kerb?", - "nl": "Hoe hoog is deze stoeprand?", - "de": "Wie hoch ist der Bordstein?" - }, - "mappings": [ - { - "if": "kerb=raised", - "then": { - "en": "This kerb is raised (>3 cm)", - "nl": "Deze stoeprand is hoog (>3 cm)", - "de": "Der Bordstein ist erhöht (>3 cm)" - }, - "icon": { - "path": "./assets/layers/kerbs/raised.svg", - "class": "small" - } - }, - { - "if": "kerb=lowered", - "then": { - "en": "This kerb is lowered (~3 cm)", - "nl": "Deze stoeprand is verlaagd (~3 cm)", - "de": "Der Bordstein ist abgesenkt (~3 cm)" - }, - "icon": { - "path": "./assets/layers/kerbs/lowered.svg", - "class": "small" - } - }, - { - "if": "kerb=flush", - "then": { - "en": "This kerb is flush (~0cm)", - "nl": "Deze stoeprand is vlak (~0cm)", - "de": "Der Bordstein ist bündig (~0cm)" - }, - "icon": { - "path": "./assets/layers/kerbs/flush.svg", - "class": "small" - } - }, - { - "if": "kerb=no", - "then": { - "en": "There is no kerb here", - "nl": "Er is hier geen stoeprand", - "de": "Hier gibt es keinen Bordstein" - }, - "hideInAnswer": true, - "icon": { - "path": "./assets/layers/kerbs/no.svg", - "class": "small" - } - }, - { - "if": "kerb=yes", - "then": { - "en": "There is a kerb of unknown height", - "nl": "Er is een stoeprand met onbekende hoogte", - "de": "Es gibt einen Bordstein mit unbekannter Höhe" - }, - "hideInAnswer": true - } - ] - }, { "id": "kerb-height", "question": { @@ -432,7 +363,13 @@ "de": "Höhe des Bordsteins" }, "type": "pnat" - } + }, + "mappings": [ + { + "if": "kerb-height=", + "then": "kerb-height=0" + } + ] } ], "mapRendering": [ diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 133a2bf0f2..4ef1816e6a 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -47,7 +47,7 @@ "calculatedTags": [ "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined).filter(p => p.width !== undefined)", "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)?.at(0)", - "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)" + "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)?.at(0)" ], "tagRenderings": [ { From 665ece1d3e6bd531eeeecff658eac1c8da80f067 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 10:56:07 +0200 Subject: [PATCH 06/17] removed calulatedTags --- assets/layers/entrance/entrance.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 4f5a4dca31..8683d4106c 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -32,8 +32,6 @@ "es": "Entrada" } }, - "calculatedTags": [ - ], "tagRenderings": [ "images", { From f4f845ae8f04959e5bce7f46e5457ec505d4a385 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 11:53:16 +0200 Subject: [PATCH 07/17] fixed typo --- assets/themes/onwheels/onwheels.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 2994e849b3..d62f1e68b9 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -34,17 +34,23 @@ "overrideAll": { "+calculatedTags": [ "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]", + "_poi_entrance:id=JSON.parce(feat.properties._poi_walls_and_buildings_entrance_properteis)?.id", "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width" ], "+tagRenderings": [ { "id": "_poi_entrance:width", - "condition": "entrance=", + "condition": { + "and": [ + "entrance=", + "kerb=" + ] + }, "render": { - "en": "This door has a width of {canonical(_poi_entrance:width)} meter", - "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter", - "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter", - "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" + "en": "This door has a width of {canonical(_poi_entrance:width)} meters", + "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter", + "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter", + "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" }, "freeform": { "key": "_poi_entrance:width", From 034e3cf282da86859d55aeccd745ec8dfd77270a Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 19 Jul 2022 11:55:46 +0200 Subject: [PATCH 08/17] Add reception desk layers --- Models/ThemeConfig/Json/UnitConfigJson.ts | 4 +++- assets/tagRenderings/license_info.json | 20 ++++++++++++++++ assets/tagRenderings/questions.json | 28 +++++++++++++++++++++++ assets/themes/onwheels/onwheels.json | 1 + 4 files changed, 52 insertions(+), 1 deletion(-) diff --git a/Models/ThemeConfig/Json/UnitConfigJson.ts b/Models/ThemeConfig/Json/UnitConfigJson.ts index bde2683b23..f69212f000 100644 --- a/Models/ThemeConfig/Json/UnitConfigJson.ts +++ b/Models/ThemeConfig/Json/UnitConfigJson.ts @@ -1,7 +1,9 @@ export default interface UnitConfigJson { /** - * Every key from this list will be normalized + * Every key from this list will be normalized. + * + * To render a united value properly, use */ appliesToKey: string[], /** diff --git a/assets/tagRenderings/license_info.json b/assets/tagRenderings/license_info.json index c65bd6f938..1f92135a1c 100644 --- a/assets/tagRenderings/license_info.json +++ b/assets/tagRenderings/license_info.json @@ -1,4 +1,24 @@ [ + { + "path": "audio_induction_loop.svg", + "license": "CC-BY 4.0", + "authors": [ + "Carl Holderness" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Noun_telecoil_audio_induction_hearing_loop_symbol_2011213.svg" + ] + }, + { + "path": "audio_induction_loop_missing.svg", + "license": "CC-BY 4.0", + "authors": [ + "Carl Holderness" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Noun_telecoil_audio_induction_hearing_loop_symbol_2011213.svg" + ] + }, { "path": "cash.svg", "license": "CC-BY 3.0", diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index aeafac6f44..ec5ee874af 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1086,5 +1086,33 @@ } } ] + }, + "induction-loop": { + "description": "An accessibility feature: induction loops are for hard-hearing persons which have an FM-receiver.", + "question": { + "en": "Does this place have an audio induction loop for people with reduced hearing?" + }, + "mappings": [ + { + "if": "hearing_loop=yes", + "then": { + "en": "This place has an audio induction loop" + }, + "icon": { + "path": "./assets/tagRenderings/audio_induction_loop.svg", + "class": "medium" + } + }, + { + "if": "hearing_loop=no", + "then": { + "en": "This place does not has an audio induction loop" + }, + "icon": { + "path": "./assets/tagRenderings/audio_induction_loop_missing.svg", + "class": "medium" + } + } + ] } } \ No newline at end of file diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 2994e849b3..7093afb065 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -29,6 +29,7 @@ "toilet", "viewpoint", "doctors", + "reception_desk", "walls_and_buildings" ], "overrideAll": { From 30c1ed94c5ceaaac11d5dfdcca1d25c7796beebf Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 19 Jul 2022 11:57:48 +0200 Subject: [PATCH 09/17] Add missing icons, actually add reception desk layer --- .../layers/reception_desk/license_info.json | 12 +++ .../layers/reception_desk/reception_desk.json | 79 +++++++++++++++++++ .../layers/reception_desk/reception_desk.svg | 29 +++++++ assets/tagRenderings/audio_induction_loop.svg | 44 +++++++++++ .../audio_induction_loop_missing.svg | 53 +++++++++++++ 5 files changed, 217 insertions(+) create mode 100644 assets/layers/reception_desk/license_info.json create mode 100644 assets/layers/reception_desk/reception_desk.json create mode 100644 assets/layers/reception_desk/reception_desk.svg create mode 100644 assets/tagRenderings/audio_induction_loop.svg create mode 100644 assets/tagRenderings/audio_induction_loop_missing.svg diff --git a/assets/layers/reception_desk/license_info.json b/assets/layers/reception_desk/license_info.json new file mode 100644 index 0000000000..5afdc20e73 --- /dev/null +++ b/assets/layers/reception_desk/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "reception_desk.svg", + "license": "CC-BY-SA", + "authors": [ + "Robin Julien" + ], + "sources": [ + "https://www.ctsteward.com/" + ] + } +] \ No newline at end of file diff --git a/assets/layers/reception_desk/reception_desk.json b/assets/layers/reception_desk/reception_desk.json new file mode 100644 index 0000000000..a9d3228c24 --- /dev/null +++ b/assets/layers/reception_desk/reception_desk.json @@ -0,0 +1,79 @@ +{ + "id": "reception_desk", + "name": { + "en": "Reception desks" + }, + "title": { + "render": { + "en": "Reception desk" + } + }, + "source": { + "osmTags": "amenity=reception_desk" + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": "circle:white;./assets/layers/reception_desk/reception_desk.svg", + "iconSize": "40,40,center" + } + ], + "tagRenderings": [ + "images", + { + "id": "desk-height", + "question": { + "en": "What is the height of the reception desk?
This is measured from the floor to the lowest usable part of the desk
" + }, + "render": { + "en": "The height of the desk is {canonical(desk:height)}" + }, + "freeform": { + "key": "desk:height", + "type": "pfloat" + } + }, + "induction-loop" + ], + "presets": [ + { + "tags": [ + "amenity=reception_desk" + ], + "title": { + "en": "a reception desk" + } + } + ], + "units": [ + { + "appliesToKey": [ + "desk:height" + ], + "applicableUnits": [ + { + "canonicalDenomination": "m", + "alternativeDenomination": [ + "meter" + ], + "human": { + "en": "meter" + } + }, + { + "canonicalDenomination": "cm", + "alternativeDenomination": [ + "centimeter", + "cms" + ], + "human": { + "en": "centimeter" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/reception_desk/reception_desk.svg b/assets/layers/reception_desk/reception_desk.svg new file mode 100644 index 0000000000..e8dd150704 --- /dev/null +++ b/assets/layers/reception_desk/reception_desk.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/assets/tagRenderings/audio_induction_loop.svg b/assets/tagRenderings/audio_induction_loop.svg new file mode 100644 index 0000000000..b56e877be2 --- /dev/null +++ b/assets/tagRenderings/audio_induction_loop.svg @@ -0,0 +1,44 @@ + + diff --git a/assets/tagRenderings/audio_induction_loop_missing.svg b/assets/tagRenderings/audio_induction_loop_missing.svg new file mode 100644 index 0000000000..b35a316069 --- /dev/null +++ b/assets/tagRenderings/audio_induction_loop_missing.svg @@ -0,0 +1,53 @@ + + From cb1e436b69ef4a182aa6b492104dd5cf1c2c9bcd Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 19 Jul 2022 12:06:57 +0200 Subject: [PATCH 10/17] Small fixes to the entrances --- assets/layers/entrance/entrance.json | 45 +++++++++++++++++++++------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 8683d4106c..0533936342 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -344,28 +344,25 @@ { "id": "kerb-height", "question": { - "en": "What is the height of this kerb?", - "nl": "Hoe hoog is deze stoeprand?", - "de": "Wie hoch ist der Bordstein?" + "en": "What is the height of this kerb?" }, "render": { - "en": "Kerb height: {kerb:height}", - "nl": "Stoeprandhoogte: {kerb:height}", - "de": "Bordsteinhöhe: {kerb:height}" + "en": "The kerb height of this door is {kerb:height}" }, "freeform": { "key": "kerb:height", "placeholder": { - "en": "Height of the kerb", - "nl": "Hoogte van de stoeprand", - "de": "Höhe des Bordsteins" + "en": "Height of the door kerb" }, "type": "pnat" }, "mappings": [ { "if": "kerb-height=", - "then": "kerb-height=0" + "then": { + "en": "This door does not have a kerb", + "nl": "Deze deur heeft geen drempel" + } } ] } @@ -403,5 +400,33 @@ "entrance=yes" ] } + ], + "units": [ + { + "appliesToKey": [ + "kerb:height" + ], + "applicableUnits": [ + { + "canonicalDenomination": "m", + "alternativeDenomination": [ + "meter" + ], + "human": { + "en": "meter" + } + }, + { + "canonicalDenomination": "cm", + "alternativeDenomination": [ + "centimeter", + "cms" + ], + "human": { + "en": "centimeter" + } + } + ] + } ] } \ No newline at end of file From 41186f9f3760a06bb347804b9c5c062346e3148a Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:20:57 +0200 Subject: [PATCH 11/17] added elevator layer --- assets/layers/elevator/elevator.json | 52 ++++++++++++++++++- .../layers/elevator/elevator_wheelchair.svg | 1 + 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 assets/layers/elevator/elevator_wheelchair.svg diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index d414b6deca..dbe7673bf6 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -8,9 +8,57 @@ }, "minzoom": 13, "tagRenderings": [ - + "images", + { + "id": "door-width", + "render": { + "en": "This elevator's doors have a width of {canonical(door-width) }" + }, + "question": { + "en": "What is the width of this elevator's entrance?" + }, + "freeform": { + "key": "door:width", + "type": "pfloat" + } + }, + { + "id": "elevator-width", + "render": { + "en": "This elevator has a width of {canonical(door-width) }" + }, + "question": { + "en": "What is the width of this elevator?" + }, + "freeform": { + "key": "elevator:width", + "type": "pfloat" + } + }, + { + "id": "elevator-depth", + "render": { + "en": "This elevator has a depth of {canonical(door-width) }" + }, + "question": { + "en": "What is the depth of this elevator?" + }, + "freeform": { + "key": "elevator:depth", + "type": "pfloat" + } + } ], "mapRendering": [ - + { + "icon": { + "render": "./assets/layers/elevator/elevator_wheelchair.svg" + }, + "iconSize": "40,40,bottom", + "location": [ + "point", + "centroid" + ] + } ] } \ No newline at end of file diff --git a/assets/layers/elevator/elevator_wheelchair.svg b/assets/layers/elevator/elevator_wheelchair.svg new file mode 100644 index 0000000000..35b934aeef --- /dev/null +++ b/assets/layers/elevator/elevator_wheelchair.svg @@ -0,0 +1 @@ + \ No newline at end of file From fe96875f7299959d80aabc1656f549ab041b53cd Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:26:41 +0200 Subject: [PATCH 12/17] fixed typos and query:licenses --- assets/layers/elevator/elevator.json | 6 +++--- assets/layers/elevator/license_info.json | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 assets/layers/elevator/license_info.json diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index dbe7673bf6..29baf18c5f 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -12,7 +12,7 @@ { "id": "door-width", "render": { - "en": "This elevator's doors have a width of {canonical(door-width) }" + "en": "This elevator's doors have a width of {canonical(door:width) }" }, "question": { "en": "What is the width of this elevator's entrance?" @@ -25,7 +25,7 @@ { "id": "elevator-width", "render": { - "en": "This elevator has a width of {canonical(door-width) }" + "en": "This elevator has a width of {canonical(elevator:width) }" }, "question": { "en": "What is the width of this elevator?" @@ -38,7 +38,7 @@ { "id": "elevator-depth", "render": { - "en": "This elevator has a depth of {canonical(door-width) }" + "en": "This elevator has a depth of {canonical(elevator:depth) }" }, "question": { "en": "What is the depth of this elevator?" diff --git a/assets/layers/elevator/license_info.json b/assets/layers/elevator/license_info.json new file mode 100644 index 0000000000..37b617e4f6 --- /dev/null +++ b/assets/layers/elevator/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "elevator_wheelchair.svg", + "license": "CC-BY-SA", + "authors": [ + "https://www.ctsteward.com/" + ], + "sources": [ + "https://www.ctsteward.com/" + ] + } +] \ No newline at end of file From fc7d287c377bb948fd227ae683620e37e09d3d8d Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:26:53 +0200 Subject: [PATCH 13/17] added elevator to onwheels theme --- assets/themes/onwheels/onwheels.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 38690d5240..fa3ded6a02 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -30,7 +30,8 @@ "viewpoint", "doctors", "reception_desk", - "walls_and_buildings" + "walls_and_buildings", + "elevator" ], "overrideAll": { "+calculatedTags": [ From dd90456638c1774a882d50deb640d0427b61518f Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:28:38 +0200 Subject: [PATCH 14/17] fixed typo --- assets/themes/onwheels/onwheels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index fa3ded6a02..274ec5e8ec 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -4,7 +4,7 @@ "en": "OnWheels" }, "description": { - "en": "On this map, publicly weelchair accessible places are shown and can be easily added" + "en": "On this map, publicly wheelchair accessible places are shown and can be easily added" }, "maintainer": "MapComplete", "icon": "./assets/themes/onwheels/crest.svg", From 59276968cc15353f748b7638132444fd9ed5bca9 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:57:14 +0200 Subject: [PATCH 15/17] finished elevator json --- assets/layers/elevator/elevator.json | 41 ++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 29baf18c5f..3aa5290285 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -60,5 +60,46 @@ "centroid" ] } + ], + "presets": [ + { + "title": { + "en": "an elevator", + "nl": "een lift" + }, + "tags": [ + "elevator=yes" + ] + } + ], + "units": [ + { + "appliesToKey": [ + "door:width", + "elevator:width", + "elevator:depth" + ], + "applicableUnits": [ + { + "canonicalDenomination": "m", + "alternativeDenomination": [ + "meter" + ], + "human": { + "en": "meter" + } + }, + { + "canonicalDenomination": "cm", + "alternativeDenomination": [ + "centimeter", + "cms" + ], + "human": { + "en": "centimeter" + } + } + ] + } ] } \ No newline at end of file From 86e3cb758bef38ce70c73ab5f00310d1314713d0 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 19 Jul 2022 15:07:30 +0200 Subject: [PATCH 16/17] fix elevator tagging --- assets/layers/elevator/elevator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 3aa5290285..55e496f1f0 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -4,7 +4,7 @@ "en": "elevator" }, "source": { - "osmTags": "elevator=yes" + "osmTags": "highway=elevator" }, "minzoom": 13, "tagRenderings": [ @@ -102,4 +102,4 @@ ] } ] -} \ No newline at end of file +} From 38497c458baa988bb4e2ab7d5c780e03c651fb04 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 19 Jul 2022 15:18:07 +0200 Subject: [PATCH 17/17] fix elevator preset --- assets/layers/elevator/elevator.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 55e496f1f0..2db635ffdb 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -68,7 +68,7 @@ "nl": "een lift" }, "tags": [ - "elevator=yes" + "highway=elevator" ] } ],