From 6d5bcab19988ed4fe6835b90c1085b83c02589d0 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 15:11:06 +0200 Subject: [PATCH 1/8] 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 000000000..e17094c55 --- /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 2/8] 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 e17094c55..d414b6dec 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 41186f9f3760a06bb347804b9c5c062346e3148a Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 19 Jul 2022 12:20:57 +0200 Subject: [PATCH 3/8] 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 d414b6dec..dbe7673bf 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 000000000..35b934aee --- /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 4/8] 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 dbe7673bf..29baf18c5 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 000000000..37b617e4f --- /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 5/8] 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 38690d524..fa3ded6a0 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 6/8] 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 fa3ded6a0..274ec5e8e 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 7/8] 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 29baf18c5..3aa529028 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 eb7d976e747566ca3a29fe6d4a39b468f7152af9 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 19 Jul 2022 13:30:26 +0200 Subject: [PATCH 8/8] Add more questions to the elevator theme --- Models/ThemeConfig/Conversion/Validation.ts | 4 ++ assets/layers/elevator/elevator.json | 38 +++++++++++-- .../layers/elevator/elevator_wheelchair.svg | 56 ++++++++++++++++++- assets/layers/entrance/entrance.json | 2 +- assets/layers/toilet/toilet.json | 47 +++++++++++++++- 5 files changed, 139 insertions(+), 8 deletions(-) diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts index bcc24c6b7..df2b80e22 100644 --- a/Models/ThemeConfig/Conversion/Validation.ts +++ b/Models/ThemeConfig/Conversion/Validation.ts @@ -520,6 +520,10 @@ export class ValidateLayer extends DesugaringStep { errors } } + + if(json.title === undefined && json.tagRenderings !== undefined){ + warnings.push(context + ": this layer does not have a title defined but it does have tagRenderings. Not having a title will disable the popups, resulting in an unclickable element.") + } if (json["builtin"] !== undefined) { errors.push(context + ": This layer hasn't been expanded: " + json) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 3aa529028..ec3de3e8c 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -7,12 +7,39 @@ "osmTags": "elevator=yes" }, "minzoom": 13, + "title": { + "en": "Elevator" + }, "tagRenderings": [ "images", + { + "id": "operational_status", + "mappings": [ + { + "if": "operational_status=broken", + "then": { + "en": "This elevator is broken" + } + }, + { + "if": "operational_status=ok", + "then": { + "en": "This elevator works" + } + }, + { + "if": "operational_status=", + "then": { + "en": "This elevator works" + }, + "hideInAnswer": true + } + ] + }, { "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 +52,7 @@ { "id": "elevator-width", "render": { - "en": "This elevator has a width of {canonical(elevator:width) }" + "en": "This elevator has a width of {canonical(elevator:width)}" }, "question": { "en": "What is the width of this elevator?" @@ -38,7 +65,7 @@ { "id": "elevator-depth", "render": { - "en": "This elevator has a depth of {canonical(elevator:depth) }" + "en": "This elevator has a depth of {canonical(elevator:depth)}" }, "question": { "en": "What is the depth of this elevator?" @@ -47,12 +74,13 @@ "key": "elevator:depth", "type": "pfloat" } - } + }, + "induction-loop" ], "mapRendering": [ { "icon": { - "render": "./assets/layers/elevator/elevator_wheelchair.svg" + "render": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg" }, "iconSize": "40,40,bottom", "location": [ diff --git a/assets/layers/elevator/elevator_wheelchair.svg b/assets/layers/elevator/elevator_wheelchair.svg index 35b934aee..5ad6ee402 100644 --- a/assets/layers/elevator/elevator_wheelchair.svg +++ b/assets/layers/elevator/elevator_wheelchair.svg @@ -1 +1,55 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 053393634..9bd4476a4 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -358,7 +358,7 @@ }, "mappings": [ { - "if": "kerb-height=", + "if": "kerb:height=0", "then": { "en": "This door does not have a kerb", "nl": "Deze deur heeft geen drempel" diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 5dfeb438d..794824f3f 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -277,6 +277,21 @@ } ] }, + { + "id": "wheelchair-door-width", + "question": { + "en": "What is the width of the door to the wheelchair accessible toilet?", + "nl": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?" + }, + "render": { + "en": "The door to the wheelchair-accessible toilet is {canonical(door:width)} wide", + "nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(door:width)} wide" + }, + "freeform": { + "key": "door:width", + "type": "pfloat" + } + }, { "id": "toilets-type", "question": { @@ -625,5 +640,35 @@ "nl": "Een laag die publieke toiletten toont", "de": "Eine Ebene mit (öffentlichen) Toiletten", "es": "Una capa que muestra baños (públicos)" - } + }, + "units": [ + { + "appliesToKey": [ + "door:width" + ], + "applicableUnits": [ + { + "canonicalDenomination": "m", + "alternativeDenomination": [ + "meter" + ], + "human": { + "en": "meter", + "nl": "meter" + } + }, + { + "canonicalDenomination": "cm", + "alternativeDenomination": [ + "centimeter", + "cms" + ], + "human": { + "en": "centimeter", + "nl": "centimeter" + } + } + ] + } + ] } \ No newline at end of file