From 9069b359c5bd83cf421b963cb67944c2e4019525 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:22:11 +0200 Subject: [PATCH 01/43] Add elevator questions --- assets/question_catalog/definition.json | 179 ++++++++++++++++++++++++ assets/question_catalog/locales/en.arb | 40 +++++- 2 files changed, 218 insertions(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 4edf3c2a..3b2bbd15 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -2297,6 +2297,7 @@ { "osm_tags": { "highway": "elevator", + "shape": "rectangular", "length": false }, "osm_element": "Node" @@ -2374,6 +2375,7 @@ { "osm_tags": { "highway": "elevator", + "shape": "rectangular", "width": false }, "osm_element": "Node" @@ -4116,5 +4118,182 @@ "osm_element": "Node" } ] + }, + { + "question": { + "name": "@elevatorShapeName", + "text": "@elevatorShapeText" + }, + "answer": { + "type": "List", + "input": [ + { + "name": "@elevatorShapeRectangularOption", + "image": "assets/question_catalog/images/elevator_rectangular.jpg", + "osm_tags": { + "shape": "circular" + } + }, + { + "name": "@elevatorCircleOption", + "image": "assets/question_catalog/images/elevator_circle.jpg", + "osm_tags": { + "shape": "rectangular" + } + }, + { + "name": "@elevatorShapeCustomOption", + "image": "assets/question_catalog/images/elevator_custom.jpg", + "osm_tags": { + "shape": "custom" + } + } + ] + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "shape": false + }, + "osm_element": "Node" + } + ] + }, + { + "question": { + "name": "@elevatorHeightName", + "text": "@elevatorHeightText" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorHeightPlaceholder", + "decimals": 1, + "min": 1, + "max": 4, + "unit": "@unitMeter" + }, + "constructor": { + "height": ["$input"] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "height": false + } + } + ] + }, + { + "question": { + "name": "@elevatorDiameterName", + "text": "@elevatorDiameterText" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDiameterPlaceholder", + "decimals": 1, + "min": 1, + "max": 4, + "unit": "@unitMeter" + }, + "constructor": { + "diameter": ["CONCAT", "$input", "m"] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "shape": "circular", + "diameter": false + }, + "osm_element": "Node" + } + ] + }, + { + "question": { + "name": "@elevatorDoorWidthName", + "text": "@elevatorDoorWidthText", + "description": "@elevatorDoorWidthDescription" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDoorWidthPlaceholder", + "decimals": 1, + "min": 1, + "max": 4, + "unit": "@unitMeter" + }, + "constructor": { + "door:width": ["$input"] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "door:width": false + } + }, + { + "!parent": [ + { + "child": [ + { + "osm_tags": { + "indoor": "door" + } + } + ] + } + ] + } + ] + }, + { + "question":{ + "name": "@elevatorDoorHeightName", + "text": "@elevatorDoorHeightText", + "description": "@elevatorDoorHeightDescription" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDoorHeightPlaceholder", + "decimals": 1, + "min": 1, + "max": 4, + "unit": "@unitMeter" + }, + "constructor": { + "door:height": ["$input"] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "door:height": false + }, + "!parent": [ + { + "child": [ + { + "osm_tags": { + "indoor": "door" + } + } + ] + } + ] + } + ] } ] diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index f0f64f9d..dd90624f 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -617,5 +617,43 @@ "unitMeter": "meter", "@unitMeter": {}, "unitKilogram": "kilogram", - "@unitKilogram": {} + "@unitKilogram": {}, + "elevatorShapeName": "Elevator shape", + "@elevatorShapeName": {}, + "elevatorShapeText": "What shape does this elevator have?", + "@elevatorShapeText": {}, + "elevatorShapeRectangularOption": "Rectangular" + "@elevatorShapeRectangularOption": {}, + "elevatorShapeCircularOption": "Circular", + "@elevatorShapeCircularOption": {}, + "elevatorShapeCustomOption": "Something else", + "@elevatorShapeCustomOption": {}, + "elevatorHeightName": "Elevator height", + "@elevatorHeightName": {}, + "elevatorHeightText": "How tall is the inner cabin of this elevator?", + "@elevatorHeightText": {}, + "elevatorHeightPlaceholder": "Height of the cabin in meters" + "@elevatorHeightPlaceholder": {}, + "elevatorDiameterName": "Elevator diameter", + "@elevatorDiameterName": {}, + "elevatorDiameterText": "What's the diameter of this elevator?", + "@elevatorDiameterText": {}, + "elevatorDiameterPlaceholder": "Diameter of the cabin in meters", + "@elevatorDiameterPlaceholder": {}, + "elevatorDoorWidthName": "Elevator door width", + "@elevatorDoorWidthName": {}, + "elevatorDoorWidthText": "How wide is the door of this elevator?", + "@elevatorDoorWidthText": {}, + "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame" + "@elevatorDoorWidthDescription": {}, + "elevatorDoorWidthPlaceholder": "Clearance in meters", + "@elevatorDoorWidthPlaceholder": {}, + "elevatorDoorHeightName": "Elevator door height", + "@elevatorDoorHeightName": {}, + "elevatorDoorHeightText": "How tall is the door of this elevator?", + "@elevatorDoorHeightText": {}, + "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame" + "@elevatorDoorHeightDescription": {}, + "elevatorDoorHeightPlaceholder": "Clearance in meters", + "@elevatorDoorHeightPlaceholder": {} } From 3fb4f8b34de2ed70a04b59216f1e59a823331540 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:07:23 +0200 Subject: [PATCH 02/43] Add german strings --- assets/question_catalog/locales/de.arb | 40 +++++++++++++++++++++++++- assets/question_catalog/locales/en.arb | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index ecbb6383..9c366e70 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -617,5 +617,43 @@ "crossingAcousticWarningSignalText": "Gibt es ein akustisches Signal, das vor der Durchfahrt einer Bahn warnt?", "@crossingAcousticWarningSignalText": {}, "crossingAcousticWarningSignalDescription": "Das Warnsignal ertönt durch ein stationären Signalgeber und nicht durch das Triebfahrzeug.", - "@crossingAcousticWarningSignalDescription": {} + "@crossingAcousticWarningSignalDescription": {}, + "elevatorShapeName": "Fahrstuhl-Form", + "@elevatorShapeName": {}, + "elevatorShapeText": "Welche Form hat dieser Fahrstuhl?", + "@elevatorShapeText": {}, + "elevatorShapeRectangularOption": "Rechteckig" + "@elevatorShapeRectangularOption": {}, + "elevatorShapeCircularOption": "Rund", + "@elevatorShapeCircularOption": {}, + "elevatorShapeCustomOption": "Etwas anderes", + "@elevatorShapeCustomOption": {}, + "elevatorHeightName": "Fahrstuhlhöhe", + "@elevatorHeightName": {}, + "elevatorHeightText": "Wie hoch ist die Kabine dieses Fahrstuhls?", + "@elevatorHeightText": {}, + "elevatorHeightPlaceholder": "Höhe der Kabine in Metern", + "@elevatorHeightPlaceholder": {}, + "elevatorDiameterName": "Fahrstuhl-Durchmesser", + "@elevatorDiameterName": {}, + "elevatorDiameterText": "Welchen Durchmesser hat die Kabine dieses Fahrstuhls?", + "@elevatorDiameterText": {}, + "elevatorDiameterPlaceholder": "Durchmesser der Kabine in Metern", + "@elevatorDiameterPlaceholder": {}, + "elevatorDoorWidthName": "Fahrstuhltür-Breite", + "@elevatorDoorWidthName": {}, + "elevatorDoorWidthText": "Wie breit ist die Tür dieses Fahrstuhls?", + "@elevatorDoorWidthText": {}, + "elevatorDoorWidthDescription": "Gemeint ist die lichte Breite der Tür, also die Breite der Türöffnung, nicht die Breite des Türrahmens.", + "@elevatorDoorWidthDescription": {}, + "elevatorDoorWidthPlaceholder": "Breite in Metern", + "@elevatorDoorWidthPlaceholder": {}, + "elevatorDoorHeightName": "Fahrstuhltür-Höhe", + "@elevatorDoorHeightName": {}, + "elevatorDoorHeightText": "Wie hoch ist die Tür dieses Fahrstuhls?", + "@elevatorDoorHeightText": {}, + "elevatorDoorHeightDescription": "Gemeint ist die lichte Höhe der Tür, also die Höhe der Türöffnung, nicht die Höhe des Türrahmens.", + "@elevatorDoorHeightDescription": {}, + "elevatorDoorHeightPlaceholder": "Höhe in Metern", + "@elevatorDoorHeightPlaceholder": {} } diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index dd90624f..c9e8dbe4 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -632,7 +632,7 @@ "@elevatorHeightName": {}, "elevatorHeightText": "How tall is the inner cabin of this elevator?", "@elevatorHeightText": {}, - "elevatorHeightPlaceholder": "Height of the cabin in meters" + "elevatorHeightPlaceholder": "Height of the cabin in meters", "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Elevator diameter", "@elevatorDiameterName": {}, From 397dde5d49f85f6c1ee907917ed681063f995ef7 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:10:42 +0200 Subject: [PATCH 03/43] Remove nonexistent images --- assets/question_catalog/definition.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 3b2bbd15..fb90cba4 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4129,21 +4129,18 @@ "input": [ { "name": "@elevatorShapeRectangularOption", - "image": "assets/question_catalog/images/elevator_rectangular.jpg", "osm_tags": { "shape": "circular" } }, { "name": "@elevatorCircleOption", - "image": "assets/question_catalog/images/elevator_circle.jpg", "osm_tags": { "shape": "rectangular" } }, { "name": "@elevatorShapeCustomOption", - "image": "assets/question_catalog/images/elevator_custom.jpg", "osm_tags": { "shape": "custom" } From 1cc9c1af2250dc151b70ee7b08516468fdc8f7d9 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:42:51 +0200 Subject: [PATCH 04/43] Make !parent a sibling condition to osm_tags --- assets/question_catalog/definition.json | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index fb90cba4..938ee48a 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4237,21 +4237,19 @@ "osm_tags": { "highway": "elevator", "door:width": false - } - }, - { + }, "!parent": [ - { - "child": [ - { - "osm_tags": { - "indoor": "door" - } - } - ] - } - ] - } + { + "child": [ + { + "osm_tags": { + "indoor": "door" + } + } + ] + } + ] + } ] }, { From f9516720ae50ce7e94d630fe0cbe375fdcafb82f Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:43:29 +0200 Subject: [PATCH 05/43] Add comma --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index c9e8dbe4..d1a24ca1 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -622,7 +622,7 @@ "@elevatorShapeName": {}, "elevatorShapeText": "What shape does this elevator have?", "@elevatorShapeText": {}, - "elevatorShapeRectangularOption": "Rectangular" + "elevatorShapeRectangularOption": "Rectangular", "@elevatorShapeRectangularOption": {}, "elevatorShapeCircularOption": "Circular", "@elevatorShapeCircularOption": {}, From 1938fd19f29216862f73533b1f6ea6c93a241d7d Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:44:00 +0200 Subject: [PATCH 06/43] Add comma --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index d1a24ca1..49fe869c 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -644,7 +644,7 @@ "@elevatorDoorWidthName": {}, "elevatorDoorWidthText": "How wide is the door of this elevator?", "@elevatorDoorWidthText": {}, - "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame" + "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame", "@elevatorDoorWidthDescription": {}, "elevatorDoorWidthPlaceholder": "Clearance in meters", "@elevatorDoorWidthPlaceholder": {}, From 46390aab368cd118c4c3923ec0d0700cc9e8d4ce Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:44:42 +0200 Subject: [PATCH 07/43] Add comma --- assets/question_catalog/locales/de.arb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index 9c366e70..b3fb5390 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -315,7 +315,10 @@ "cycleBarrierWidthDescription": "Die Durchgangsbreite, auch lichte Breite genannt, beschreibt die maximal zulässige Breite, um eine Sperre passieren zu können.", "@cycleBarrierWidthDescription": {}, "cycleBarrierWidthPlaceholder": "Breite", - "@cycleBarrierWidthPlaceholder": {}, + "@cycleBarrierWidthPlaceho, + { + + }lder": {}, "cycleBarrierOpeningName": "Umlaufsperren-Zugangsbreite", "@cycleBarrierOpeningName": {}, "cycleBarrierOpeningText": "Wie breit ist der (schmalste) Zugang der Umlaufsperre?", @@ -618,11 +621,11 @@ "@crossingAcousticWarningSignalText": {}, "crossingAcousticWarningSignalDescription": "Das Warnsignal ertönt durch ein stationären Signalgeber und nicht durch das Triebfahrzeug.", "@crossingAcousticWarningSignalDescription": {}, - "elevatorShapeName": "Fahrstuhl-Form", + "elevatorShapeName": "Fahrstuhl-Form", "@elevatorShapeName": {}, "elevatorShapeText": "Welche Form hat dieser Fahrstuhl?", "@elevatorShapeText": {}, - "elevatorShapeRectangularOption": "Rechteckig" + "elevatorShapeRectangularOption": "Rechteckig", "@elevatorShapeRectangularOption": {}, "elevatorShapeCircularOption": "Rund", "@elevatorShapeCircularOption": {}, From 14a0b0f53fcd1a71728bb88bf25e0c530119d7f4 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:45:35 +0200 Subject: [PATCH 08/43] Fix string reference --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 938ee48a..1d1df511 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4134,7 +4134,7 @@ } }, { - "name": "@elevatorCircleOption", + "name": "@elevatorShapeCircularOption", "osm_tags": { "shape": "rectangular" } From f9c2444c93b479c38ce57f06b381236124bad454 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:54:16 +0200 Subject: [PATCH 09/43] Update min height --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 1d1df511..9514c19b 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4263,7 +4263,7 @@ "input": { "placeholder": "@elevatorDoorHeightPlaceholder", "decimals": 1, - "min": 1, + "min": 2, "max": 4, "unit": "@unitMeter" }, From eb1c3fc28c972d1ca46ee968f1fe9120eaeb19bb Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:55:03 +0200 Subject: [PATCH 10/43] Update min height --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 9514c19b..ac72320c 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4167,7 +4167,7 @@ "input": { "placeholder": "@elevatorHeightPlaceholder", "decimals": 1, - "min": 1, + "min": 1.5, "max": 4, "unit": "@unitMeter" }, From e6ccf6ca19a4d84e39af4f7d66214433083dfc59 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:56:10 +0200 Subject: [PATCH 11/43] Fix wrong tags beeing written --- assets/question_catalog/definition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index ac72320c..e912bce4 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4128,13 +4128,13 @@ "type": "List", "input": [ { - "name": "@elevatorShapeRectangularOption", + "name": "@elevatorShapeCircularOption", "osm_tags": { "shape": "circular" } }, { - "name": "@elevatorShapeCircularOption", + "name": "@elevatorShapeRectangularOption", "osm_tags": { "shape": "rectangular" } From d01ccde6154c4bba659c7183e00eaef6e6d302de Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:58:09 +0200 Subject: [PATCH 12/43] remove unit from strings --- assets/question_catalog/locales/de.arb | 8 ++++---- assets/question_catalog/locales/en.arb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index b3fb5390..be108685 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -635,13 +635,13 @@ "@elevatorHeightName": {}, "elevatorHeightText": "Wie hoch ist die Kabine dieses Fahrstuhls?", "@elevatorHeightText": {}, - "elevatorHeightPlaceholder": "Höhe der Kabine in Metern", + "elevatorHeightPlaceholder": "Höhe der Kabine", "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Fahrstuhl-Durchmesser", "@elevatorDiameterName": {}, "elevatorDiameterText": "Welchen Durchmesser hat die Kabine dieses Fahrstuhls?", "@elevatorDiameterText": {}, - "elevatorDiameterPlaceholder": "Durchmesser der Kabine in Metern", + "elevatorDiameterPlaceholder": "Durchmesser der Kabine", "@elevatorDiameterPlaceholder": {}, "elevatorDoorWidthName": "Fahrstuhltür-Breite", "@elevatorDoorWidthName": {}, @@ -649,7 +649,7 @@ "@elevatorDoorWidthText": {}, "elevatorDoorWidthDescription": "Gemeint ist die lichte Breite der Tür, also die Breite der Türöffnung, nicht die Breite des Türrahmens.", "@elevatorDoorWidthDescription": {}, - "elevatorDoorWidthPlaceholder": "Breite in Metern", + "elevatorDoorWidthPlaceholder": "Breite", "@elevatorDoorWidthPlaceholder": {}, "elevatorDoorHeightName": "Fahrstuhltür-Höhe", "@elevatorDoorHeightName": {}, @@ -657,6 +657,6 @@ "@elevatorDoorHeightText": {}, "elevatorDoorHeightDescription": "Gemeint ist die lichte Höhe der Tür, also die Höhe der Türöffnung, nicht die Höhe des Türrahmens.", "@elevatorDoorHeightDescription": {}, - "elevatorDoorHeightPlaceholder": "Höhe in Metern", + "elevatorDoorHeightPlaceholder": "Höhe", "@elevatorDoorHeightPlaceholder": {} } diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 49fe869c..cb477b6a 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -632,13 +632,13 @@ "@elevatorHeightName": {}, "elevatorHeightText": "How tall is the inner cabin of this elevator?", "@elevatorHeightText": {}, - "elevatorHeightPlaceholder": "Height of the cabin in meters", + "elevatorHeightPlaceholder": "Height of the cabin", "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Elevator diameter", "@elevatorDiameterName": {}, "elevatorDiameterText": "What's the diameter of this elevator?", "@elevatorDiameterText": {}, - "elevatorDiameterPlaceholder": "Diameter of the cabin in meters", + "elevatorDiameterPlaceholder": "Diameter of the cabin", "@elevatorDiameterPlaceholder": {}, "elevatorDoorWidthName": "Elevator door width", "@elevatorDoorWidthName": {}, @@ -646,7 +646,7 @@ "@elevatorDoorWidthText": {}, "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame", "@elevatorDoorWidthDescription": {}, - "elevatorDoorWidthPlaceholder": "Clearance in meters", + "elevatorDoorWidthPlaceholder": "Clearance", "@elevatorDoorWidthPlaceholder": {}, "elevatorDoorHeightName": "Elevator door height", "@elevatorDoorHeightName": {}, @@ -654,6 +654,6 @@ "@elevatorDoorHeightText": {}, "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame" "@elevatorDoorHeightDescription": {}, - "elevatorDoorHeightPlaceholder": "Clearance in meters", + "elevatorDoorHeightPlaceholder": "Clearance", "@elevatorDoorHeightPlaceholder": {} } From 5bae3e4cf78931a3f26a29bbd8f8484237837b17 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:59:33 +0200 Subject: [PATCH 13/43] Update strings --- assets/question_catalog/locales/de.arb | 2 +- assets/question_catalog/locales/en.arb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index be108685..ae7fda5f 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -629,7 +629,7 @@ "@elevatorShapeRectangularOption": {}, "elevatorShapeCircularOption": "Rund", "@elevatorShapeCircularOption": {}, - "elevatorShapeCustomOption": "Etwas anderes", + "elevatorShapeCustomOption": "Komplex", "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Fahrstuhlhöhe", "@elevatorHeightName": {}, diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index cb477b6a..5641513e 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -626,7 +626,7 @@ "@elevatorShapeRectangularOption": {}, "elevatorShapeCircularOption": "Circular", "@elevatorShapeCircularOption": {}, - "elevatorShapeCustomOption": "Something else", + "elevatorShapeCustomOption": "Complex", "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Elevator height", "@elevatorHeightName": {}, From 45bda9985c5ca3190ef0842098275b5d8f534649 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:04:32 +0200 Subject: [PATCH 14/43] Update de.arb --- assets/question_catalog/locales/de.arb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index ae7fda5f..13bd1b57 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -371,13 +371,13 @@ "@elevatorWidthDescription": {}, "elevatorWidthPlaceholder": "Breite", "@elevatorWidthPlaceholder": {}, - "elevatorTactileWritingName": "Fahrstuhl-Blindenschrift", + "elevatorTactileWritingName": "Blindenschrift im Fahrstuhl", "@elevatorTactileWritingName": {}, "elevatorTactileWritingText": "Ist auf den Bedienelementen des Fahrstuhls Blindenschrift vorhanden?", "@elevatorTactileWritingText": {}, "elevatorTactileWritingDescription": "Blindenschrift sind Zeichen, die mit den Fingern gelesen werden können. Diese können u.a. geprägte gewöhnliche Buchstaben oder besondere Symbole sein, wie z.B. bei der Brailleschrift.", "@elevatorTactileWritingDescription": {}, - "elevatorAnnouncementsName": "Fahrstuhl-Ansagen", + "elevatorAnnouncementsName": "Ansagen im Fahrstuhl", "@elevatorAnnouncementsName": {}, "elevatorAnnouncementsText": "Wird die aktuelle Etage im Aufzug angesagt?", "@elevatorAnnouncementsText": {}, @@ -631,19 +631,19 @@ "@elevatorShapeCircularOption": {}, "elevatorShapeCustomOption": "Komplex", "@elevatorShapeCustomOption": {}, - "elevatorHeightName": "Fahrstuhlhöhe", + "elevatorHeightName": "Höhe des Fahrstuhls", "@elevatorHeightName": {}, "elevatorHeightText": "Wie hoch ist die Kabine dieses Fahrstuhls?", "@elevatorHeightText": {}, "elevatorHeightPlaceholder": "Höhe der Kabine", "@elevatorHeightPlaceholder": {}, - "elevatorDiameterName": "Fahrstuhl-Durchmesser", + "elevatorDiameterName": "Durchmesser des Fahrstuhls", "@elevatorDiameterName": {}, "elevatorDiameterText": "Welchen Durchmesser hat die Kabine dieses Fahrstuhls?", "@elevatorDiameterText": {}, "elevatorDiameterPlaceholder": "Durchmesser der Kabine", "@elevatorDiameterPlaceholder": {}, - "elevatorDoorWidthName": "Fahrstuhltür-Breite", + "elevatorDoorWidthName": "Breite der Fahrstuhltür", "@elevatorDoorWidthName": {}, "elevatorDoorWidthText": "Wie breit ist die Tür dieses Fahrstuhls?", "@elevatorDoorWidthText": {}, @@ -651,7 +651,7 @@ "@elevatorDoorWidthDescription": {}, "elevatorDoorWidthPlaceholder": "Breite", "@elevatorDoorWidthPlaceholder": {}, - "elevatorDoorHeightName": "Fahrstuhltür-Höhe", + "elevatorDoorHeightName": "Höhe der Fahrstuhltür", "@elevatorDoorHeightName": {}, "elevatorDoorHeightText": "Wie hoch ist die Tür dieses Fahrstuhls?", "@elevatorDoorHeightText": {}, From e0149888cfa91c24b1531e8a94d1dcf94ab2ddaa Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:05:18 +0200 Subject: [PATCH 15/43] Update de.arb --- assets/question_catalog/locales/de.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index 13bd1b57..1891f3cd 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -623,7 +623,7 @@ "@crossingAcousticWarningSignalDescription": {}, "elevatorShapeName": "Fahrstuhl-Form", "@elevatorShapeName": {}, - "elevatorShapeText": "Welche Form hat dieser Fahrstuhl?", + "elevatorShapeText": "Welche Form hat die Kabine von diesem Fahrstuhl?", "@elevatorShapeText": {}, "elevatorShapeRectangularOption": "Rechteckig", "@elevatorShapeRectangularOption": {}, From 5d0974a5a150b571312be99998bd94d81f90ddca Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:05:52 +0200 Subject: [PATCH 16/43] Update de.arb --- assets/question_catalog/locales/de.arb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index 1891f3cd..cb18a198 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -623,7 +623,7 @@ "@crossingAcousticWarningSignalDescription": {}, "elevatorShapeName": "Fahrstuhl-Form", "@elevatorShapeName": {}, - "elevatorShapeText": "Welche Form hat die Kabine von diesem Fahrstuhl?", + "elevatorShapeText": "Welche Form hat die Kabine des Fahrstuhls?", "@elevatorShapeText": {}, "elevatorShapeRectangularOption": "Rechteckig", "@elevatorShapeRectangularOption": {}, @@ -633,13 +633,13 @@ "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Höhe des Fahrstuhls", "@elevatorHeightName": {}, - "elevatorHeightText": "Wie hoch ist die Kabine dieses Fahrstuhls?", + "elevatorHeightText": "Wie hoch ist die Kabine des Fahrstuhls?", "@elevatorHeightText": {}, "elevatorHeightPlaceholder": "Höhe der Kabine", "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Durchmesser des Fahrstuhls", "@elevatorDiameterName": {}, - "elevatorDiameterText": "Welchen Durchmesser hat die Kabine dieses Fahrstuhls?", + "elevatorDiameterText": "Welchen Durchmesser hat die Kabine des Fahrstuhls?", "@elevatorDiameterText": {}, "elevatorDiameterPlaceholder": "Durchmesser der Kabine", "@elevatorDiameterPlaceholder": {}, From a0e730656637c757964ab577cc4326fca7941899 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:08:32 +0200 Subject: [PATCH 17/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 5641513e..2d07ab38 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -620,7 +620,7 @@ "@unitKilogram": {}, "elevatorShapeName": "Elevator shape", "@elevatorShapeName": {}, - "elevatorShapeText": "What shape does this elevator have?", + "elevatorShapeText": "What is the shape of this elevator?", "@elevatorShapeText": {}, "elevatorShapeRectangularOption": "Rectangular", "@elevatorShapeRectangularOption": {}, From f9d03e56fbe640bcc191d85c9f357c32b50c1163 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:08:51 +0200 Subject: [PATCH 18/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 2d07ab38..37c2c561 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -624,7 +624,7 @@ "@elevatorShapeText": {}, "elevatorShapeRectangularOption": "Rectangular", "@elevatorShapeRectangularOption": {}, - "elevatorShapeCircularOption": "Circular", + "elevatorShapeCircularOption": "Round", "@elevatorShapeCircularOption": {}, "elevatorShapeCustomOption": "Complex", "@elevatorShapeCustomOption": {}, From 19278e4eca0812eb17ce5581377c0e46993c4a7b Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:09:06 +0200 Subject: [PATCH 19/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 37c2c561..eeb330dc 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -636,7 +636,7 @@ "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Elevator diameter", "@elevatorDiameterName": {}, - "elevatorDiameterText": "What's the diameter of this elevator?", + "elevatorDiameterText": "What is the diameter of this elevator?", "@elevatorDiameterText": {}, "elevatorDiameterPlaceholder": "Diameter of the cabin", "@elevatorDiameterPlaceholder": {}, From d651445c2404e8a9d113d2e8fd5b0cea96fb6f7a Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:09:26 +0200 Subject: [PATCH 20/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index eeb330dc..dc9f000a 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -630,7 +630,7 @@ "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Elevator height", "@elevatorHeightName": {}, - "elevatorHeightText": "How tall is the inner cabin of this elevator?", + "elevatorHeightText": "What is the height of the elevator cabin?", "@elevatorHeightText": {}, "elevatorHeightPlaceholder": "Height of the cabin", "@elevatorHeightPlaceholder": {}, From 778cd981a2767848f1668e07542cda124fa92162 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:10:00 +0200 Subject: [PATCH 21/43] Increase min diameter --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index e912bce4..b2e3bb06 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4194,7 +4194,7 @@ "input": { "placeholder": "@elevatorDiameterPlaceholder", "decimals": 1, - "min": 1, + "min": 1.5, "max": 4, "unit": "@unitMeter" }, From b1c691edb9fc59cb9d3367fdf164047fa9cbc420 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:11:02 +0200 Subject: [PATCH 22/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index dc9f000a..b57c252c 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -642,7 +642,7 @@ "@elevatorDiameterPlaceholder": {}, "elevatorDoorWidthName": "Elevator door width", "@elevatorDoorWidthName": {}, - "elevatorDoorWidthText": "How wide is the door of this elevator?", + "elevatorDoorWidthText": "What is the width of the elevator door?", "@elevatorDoorWidthText": {}, "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame", "@elevatorDoorWidthDescription": {}, From 5e85fe45355fd8c0074763bc13c8a8b95a92bed2 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:11:26 +0200 Subject: [PATCH 23/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index b57c252c..3b1da9bd 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -650,7 +650,7 @@ "@elevatorDoorWidthPlaceholder": {}, "elevatorDoorHeightName": "Elevator door height", "@elevatorDoorHeightName": {}, - "elevatorDoorHeightText": "How tall is the door of this elevator?", + "elevatorDoorHeightText": "What is the height of the elevator door?", "@elevatorDoorHeightText": {}, "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame" "@elevatorDoorHeightDescription": {}, From 6efc96f54d545f1c21580da699a866e68973693a Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:11:48 +0200 Subject: [PATCH 24/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 3b1da9bd..759d9916 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -654,6 +654,6 @@ "@elevatorDoorHeightText": {}, "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame" "@elevatorDoorHeightDescription": {}, - "elevatorDoorHeightPlaceholder": "Clearance", + "elevatorDoorHeightPlaceholder": "Height", "@elevatorDoorHeightPlaceholder": {} } From b2cc89f63122b4e0a0b75f8716e43fcdbc5d93a1 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:16:48 +0200 Subject: [PATCH 25/43] Use centimeter as units --- assets/question_catalog/definition.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index b2e3bb06..ea1c2ad6 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4169,7 +4169,7 @@ "decimals": 1, "min": 1.5, "max": 4, - "unit": "@unitMeter" + "unit": "@unitCentimeter" }, "constructor": { "height": ["$input"] @@ -4196,7 +4196,7 @@ "decimals": 1, "min": 1.5, "max": 4, - "unit": "@unitMeter" + "unit": "@unitCentimeter" }, "constructor": { "diameter": ["CONCAT", "$input", "m"] @@ -4226,7 +4226,7 @@ "decimals": 1, "min": 1, "max": 4, - "unit": "@unitMeter" + "unit": "@unitCentimeter" }, "constructor": { "door:width": ["$input"] @@ -4265,7 +4265,7 @@ "decimals": 1, "min": 2, "max": 4, - "unit": "@unitMeter" + "unit": "@unitCentimeter" }, "constructor": { "door:height": ["$input"] From a7e1826edd18396d6c30c08dd63d62fe0a5e9c1f Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:23:56 +0200 Subject: [PATCH 26/43] Fix missing comma --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 759d9916..c563821b 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -652,7 +652,7 @@ "@elevatorDoorHeightName": {}, "elevatorDoorHeightText": "What is the height of the elevator door?", "@elevatorDoorHeightText": {}, - "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame" + "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame", "@elevatorDoorHeightDescription": {}, "elevatorDoorHeightPlaceholder": "Height", "@elevatorDoorHeightPlaceholder": {} From b188cd612acac8372271639ebe957352fa95e465 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:29:24 +0200 Subject: [PATCH 27/43] Make units actually cm --- assets/question_catalog/definition.json | 59 ++++++++++++++++++------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index ea1c2ad6..d45d363d 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4166,13 +4166,19 @@ "type": "Number", "input": { "placeholder": "@elevatorHeightPlaceholder", - "decimals": 1, - "min": 1.5, - "max": 4, + "decimals": 0, + "min": 200, + "max": 400, "unit": "@unitCentimeter" }, "constructor": { - "height": ["$input"] + "width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] } }, "conditions": [ @@ -4193,13 +4199,22 @@ "type": "Number", "input": { "placeholder": "@elevatorDiameterPlaceholder", - "decimals": 1, - "min": 1.5, - "max": 4, + "decimals": 0, + "min": 150, + "max": 1000, "unit": "@unitCentimeter" }, "constructor": { - "diameter": ["CONCAT", "$input", "m"] + "diameter": [ + + "CONCAT", [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ], "m" + ] } }, "conditions": [ @@ -4223,13 +4238,19 @@ "type": "Number", "input": { "placeholder": "@elevatorDoorWidthPlaceholder", - "decimals": 1, - "min": 1, - "max": 4, + "decimals": 0, + "min": 150, + "max": 400, "unit": "@unitCentimeter" }, "constructor": { - "door:width": ["$input"] + "door:width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] } }, "conditions": [ @@ -4262,13 +4283,19 @@ "type": "Number", "input": { "placeholder": "@elevatorDoorHeightPlaceholder", - "decimals": 1, - "min": 2, - "max": 4, + "decimals": 0, + "min": 200, + "max": 400, "unit": "@unitCentimeter" }, "constructor": { - "door:height": ["$input"] + "width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] } }, "conditions": [ From 95771c0b81f255314899562f45937fa6b876e4d0 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:30:10 +0200 Subject: [PATCH 28/43] Fix breaking typo --- assets/question_catalog/locales/de.arb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index cb18a198..95a474fb 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -315,10 +315,7 @@ "cycleBarrierWidthDescription": "Die Durchgangsbreite, auch lichte Breite genannt, beschreibt die maximal zulässige Breite, um eine Sperre passieren zu können.", "@cycleBarrierWidthDescription": {}, "cycleBarrierWidthPlaceholder": "Breite", - "@cycleBarrierWidthPlaceho, - { - - }lder": {}, + "@cycleBarrierWidthPlaceho}lder": {}, "cycleBarrierOpeningName": "Umlaufsperren-Zugangsbreite", "@cycleBarrierOpeningName": {}, "cycleBarrierOpeningText": "Wie breit ist der (schmalste) Zugang der Umlaufsperre?", From 54e82d3fea0b0964456e37e1d359d7cc1e594689 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:31:17 +0200 Subject: [PATCH 29/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index c563821b..463692ee 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -646,7 +646,7 @@ "@elevatorDoorWidthText": {}, "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame", "@elevatorDoorWidthDescription": {}, - "elevatorDoorWidthPlaceholder": "Clearance", + "elevatorDoorWidthPlaceholder": "Clearance width", "@elevatorDoorWidthPlaceholder": {}, "elevatorDoorHeightName": "Elevator door height", "@elevatorDoorHeightName": {}, From 783886afc8ab26175de7e4b43356dcb5984d6819 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:31:37 +0200 Subject: [PATCH 30/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 463692ee..4d606fab 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -654,6 +654,6 @@ "@elevatorDoorHeightText": {}, "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame", "@elevatorDoorHeightDescription": {}, - "elevatorDoorHeightPlaceholder": "Height", + "elevatorDoorHeightPlaceholder": "Clearance height", "@elevatorDoorHeightPlaceholder": {} } From 63e194baa23bb25981b83f970ca85da4d7c97813 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:31:59 +0200 Subject: [PATCH 31/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 4d606fab..303d85aa 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -652,7 +652,7 @@ "@elevatorDoorHeightName": {}, "elevatorDoorHeightText": "What is the height of the elevator door?", "@elevatorDoorHeightText": {}, - "elevatorDoorHeightDescription": "This means the inner clearance from the bottom of the door to the top, not the height of the frame", + "elevatorDoorHeightDescription": "The clearance height is the inner measurement from the bottom of the door to the top, not the outer height of the door frame.", "@elevatorDoorHeightDescription": {}, "elevatorDoorHeightPlaceholder": "Clearance height", "@elevatorDoorHeightPlaceholder": {} From a079e09a3e6fe72620bdded994f3bae7924ab12c Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:32:22 +0200 Subject: [PATCH 32/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index 303d85aa..a66a8923 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -644,7 +644,7 @@ "@elevatorDoorWidthName": {}, "elevatorDoorWidthText": "What is the width of the elevator door?", "@elevatorDoorWidthText": {}, - "elevatorDoorWidthDescription": "This means the inner clearance from one side of the door to the other, not the width of the frame", + "elevatorDoorWidthDescription": "The clearance width is the inner measurement from one side of the door to the other, not the outer width of the door frame.", "@elevatorDoorWidthDescription": {}, "elevatorDoorWidthPlaceholder": "Clearance width", "@elevatorDoorWidthPlaceholder": {}, From 0b782ff7c8efe4f13702b4d969920c753d636b91 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:59:23 +0200 Subject: [PATCH 33/43] Update en.arb --- assets/question_catalog/locales/en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index a66a8923..ec2102d7 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -632,7 +632,7 @@ "@elevatorHeightName": {}, "elevatorHeightText": "What is the height of the elevator cabin?", "@elevatorHeightText": {}, - "elevatorHeightPlaceholder": "Height of the cabin", + "elevatorHeightPlaceholder": "Cabin height", "@elevatorHeightPlaceholder": {}, "elevatorDiameterName": "Elevator diameter", "@elevatorDiameterName": {}, From 3ff62c95b4090c912ce42156aa65e3f94420c59b Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:52:37 +0200 Subject: [PATCH 34/43] Add space before meters --- assets/question_catalog/definition.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index d45d363d..8cea0cc3 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4206,14 +4206,13 @@ }, "constructor": { "diameter": [ - "CONCAT", [ "REPLACE", "/\\.?0{1,2}$/", "", [ "INSERT", ".", "-2", [ "PAD", "0", "3", "$input" ] ] - ], "m" + ], " m" ] } }, From 382494b3c9252880a7addaf667500b27356ea017 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:22:07 +0200 Subject: [PATCH 35/43] Explement shape= question, only ask for rectangular elevators --- assets/question_catalog/definition.json | 46 ++++--------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 8cea0cc3..73eec2de 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -2297,9 +2297,11 @@ { "osm_tags": { "highway": "elevator", - "shape": "rectangular", "length": false }, + "!osm_tags": { + "shape": "circular" + }, "osm_element": "Node" } ] @@ -2375,9 +2377,11 @@ { "osm_tags": { "highway": "elevator", - "shape": "rectangular", "width": false }, + "!osm_tags": { + "shape": "circular" + }, "osm_element": "Node" } ] @@ -4119,44 +4123,6 @@ } ] }, - { - "question": { - "name": "@elevatorShapeName", - "text": "@elevatorShapeText" - }, - "answer": { - "type": "List", - "input": [ - { - "name": "@elevatorShapeCircularOption", - "osm_tags": { - "shape": "circular" - } - }, - { - "name": "@elevatorShapeRectangularOption", - "osm_tags": { - "shape": "rectangular" - } - }, - { - "name": "@elevatorShapeCustomOption", - "osm_tags": { - "shape": "custom" - } - } - ] - }, - "conditions": [ - { - "osm_tags": { - "highway": "elevator", - "shape": false - }, - "osm_element": "Node" - } - ] - }, { "question": { "name": "@elevatorHeightName", From acc0eeaac90fd5e9a63eb2682eb4ccc4e7284536 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:43:59 +0200 Subject: [PATCH 36/43] Change minmax values --- assets/question_catalog/definition.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 73eec2de..e2b8699c 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4133,7 +4133,7 @@ "input": { "placeholder": "@elevatorHeightPlaceholder", "decimals": 0, - "min": 200, + "min": 150, "max": 400, "unit": "@unitCentimeter" }, @@ -4204,8 +4204,8 @@ "input": { "placeholder": "@elevatorDoorWidthPlaceholder", "decimals": 0, - "min": 150, - "max": 400, + "min": 80, + "max": 300, "unit": "@unitCentimeter" }, "constructor": { @@ -4249,7 +4249,7 @@ "input": { "placeholder": "@elevatorDoorHeightPlaceholder", "decimals": 0, - "min": 200, + "min": 150, "max": 400, "unit": "@unitCentimeter" }, @@ -4274,13 +4274,15 @@ "child": [ { "osm_tags": { - "indoor": "door" + "indoor": "door", + "door":"sliding", + "automatic_door": ["yes", "button"] } } ] } ] } - ] + ] } ] From a253a5f23de825782f8e1150f7dd5777ab4a9766 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:44:25 +0200 Subject: [PATCH 37/43] Add a comment --- assets/question_catalog/definition.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index e2b8699c..cc115076 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4283,6 +4283,7 @@ } ] } - ] + ], + "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator." } ] From 7e4f66c494c3bafb3b64785e4a171a7f6f73533d Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:48:42 +0200 Subject: [PATCH 38/43] Update translations --- assets/question_catalog/locales/de.arb | 14 ++------------ assets/question_catalog/locales/en.arb | 10 ---------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/assets/question_catalog/locales/de.arb b/assets/question_catalog/locales/de.arb index 95a474fb..7c989d6b 100644 --- a/assets/question_catalog/locales/de.arb +++ b/assets/question_catalog/locales/de.arb @@ -618,16 +618,6 @@ "@crossingAcousticWarningSignalText": {}, "crossingAcousticWarningSignalDescription": "Das Warnsignal ertönt durch ein stationären Signalgeber und nicht durch das Triebfahrzeug.", "@crossingAcousticWarningSignalDescription": {}, - "elevatorShapeName": "Fahrstuhl-Form", - "@elevatorShapeName": {}, - "elevatorShapeText": "Welche Form hat die Kabine des Fahrstuhls?", - "@elevatorShapeText": {}, - "elevatorShapeRectangularOption": "Rechteckig", - "@elevatorShapeRectangularOption": {}, - "elevatorShapeCircularOption": "Rund", - "@elevatorShapeCircularOption": {}, - "elevatorShapeCustomOption": "Komplex", - "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Höhe des Fahrstuhls", "@elevatorHeightName": {}, "elevatorHeightText": "Wie hoch ist die Kabine des Fahrstuhls?", @@ -644,7 +634,7 @@ "@elevatorDoorWidthName": {}, "elevatorDoorWidthText": "Wie breit ist die Tür dieses Fahrstuhls?", "@elevatorDoorWidthText": {}, - "elevatorDoorWidthDescription": "Gemeint ist die lichte Breite der Tür, also die Breite der Türöffnung, nicht die Breite des Türrahmens.", + "elevatorDoorWidthDescription": "Die lichte Breite ist das Innenmaß von einer Seite der Tür zur anderen, nicht die Außenbreite des Türrahmens.", "@elevatorDoorWidthDescription": {}, "elevatorDoorWidthPlaceholder": "Breite", "@elevatorDoorWidthPlaceholder": {}, @@ -652,7 +642,7 @@ "@elevatorDoorHeightName": {}, "elevatorDoorHeightText": "Wie hoch ist die Tür dieses Fahrstuhls?", "@elevatorDoorHeightText": {}, - "elevatorDoorHeightDescription": "Gemeint ist die lichte Höhe der Tür, also die Höhe der Türöffnung, nicht die Höhe des Türrahmens.", + "elevatorDoorHeightDescription": "Die lichte Höhe ist das Innenmaß von der Unterseite der Tür bis zur Oberseite, nicht die Außenhöhe des Türrahmens.", "@elevatorDoorHeightDescription": {}, "elevatorDoorHeightPlaceholder": "Höhe", "@elevatorDoorHeightPlaceholder": {} diff --git a/assets/question_catalog/locales/en.arb b/assets/question_catalog/locales/en.arb index ec2102d7..96f525e5 100644 --- a/assets/question_catalog/locales/en.arb +++ b/assets/question_catalog/locales/en.arb @@ -618,16 +618,6 @@ "@unitMeter": {}, "unitKilogram": "kilogram", "@unitKilogram": {}, - "elevatorShapeName": "Elevator shape", - "@elevatorShapeName": {}, - "elevatorShapeText": "What is the shape of this elevator?", - "@elevatorShapeText": {}, - "elevatorShapeRectangularOption": "Rectangular", - "@elevatorShapeRectangularOption": {}, - "elevatorShapeCircularOption": "Round", - "@elevatorShapeCircularOption": {}, - "elevatorShapeCustomOption": "Complex", - "@elevatorShapeCustomOption": {}, "elevatorHeightName": "Elevator height", "@elevatorHeightName": {}, "elevatorHeightText": "What is the height of the elevator cabin?", From ec24d09b8dd2224df8fee3e80e9767f06832e5c8 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:52:50 +0200 Subject: [PATCH 39/43] Tighten conditions for elevator door width --- assets/question_catalog/definition.json | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index cc115076..1a1c8160 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4225,16 +4225,18 @@ "door:width": false }, "!parent": [ - { - "child": [ - { - "osm_tags": { - "indoor": "door" - } - } - ] - } - ] + { + "child": [ + { + "osm_tags": { + "indoor": "door", + "door":"sliding", + "automatic_door": ["yes", "button"] + } + } + ] + } + ] } ] }, From 56b99226ea093277dbf57649f87f2a8a2dc3aa6e Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:01:09 +0200 Subject: [PATCH 40/43] Expand door:* conditions --- assets/question_catalog/definition.json | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 1a1c8160..14e2d967 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4224,8 +4224,10 @@ "highway": "elevator", "door:width": false }, + "osm_element": ["Node", "ClosedWay"], "!parent": [ { + "osm_element": ["OpenWay", "ClosedWay"], "child": [ { "osm_tags": { @@ -4236,9 +4238,17 @@ } ] } + ], + "!child": [ + { + "osm_tags": { + "door": ["yes", "sliding"] + } + } ] - } - ] + } + ], + "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." }, { "question":{ @@ -4271,8 +4281,10 @@ "highway": "elevator", "door:height": false }, + "osm_element": ["Node", "ClosedWay"], "!parent": [ { + "osm_element": ["OpenWay", "ClosedWay"], "child": [ { "osm_tags": { @@ -4283,9 +4295,16 @@ } ] } + ], + "!child": [ + { + "osm_tags": { + "door": ["yes", "sliding"] + } + } ] } ], - "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator." + "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." } ] From cb72202100264ac94a0c848bf8ee016029be40c4 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:19:36 +0200 Subject: [PATCH 41/43] Update assets/question_catalog/definition.json Co-authored-by: Robin Thomas --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 14e2d967..62d2028d 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4284,7 +4284,7 @@ "osm_element": ["Node", "ClosedWay"], "!parent": [ { - "osm_element": ["OpenWay", "ClosedWay"], + "osm_element": "OpenWay", "child": [ { "osm_tags": { From 386671e27584fc24e9f7f0afc5fe9be42e2d0c29 Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:19:43 +0200 Subject: [PATCH 42/43] Update assets/question_catalog/definition.json Co-authored-by: Robin Thomas --- assets/question_catalog/definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index 62d2028d..e275f568 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -4227,7 +4227,7 @@ "osm_element": ["Node", "ClosedWay"], "!parent": [ { - "osm_element": ["OpenWay", "ClosedWay"], + "osm_element": "OpenWay", "child": [ { "osm_tags": { From fe58e7fc1a2ec68847b2eac736e315dd30ec47ce Mon Sep 17 00:00:00 2001 From: Wieland <29458682+wielandb@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:25:50 +0200 Subject: [PATCH 43/43] Move elevator questions to other elevator questions --- assets/question_catalog/definition.json | 368 ++++++++++++------------ 1 file changed, 184 insertions(+), 184 deletions(-) diff --git a/assets/question_catalog/definition.json b/assets/question_catalog/definition.json index e275f568..921a51f7 100644 --- a/assets/question_catalog/definition.json +++ b/assets/question_catalog/definition.json @@ -2386,6 +2386,190 @@ } ] }, + { + "question": { + "name": "@elevatorHeightName", + "text": "@elevatorHeightText" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorHeightPlaceholder", + "decimals": 0, + "min": 150, + "max": 400, + "unit": "@unitCentimeter" + }, + "constructor": { + "width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "height": false + } + } + ] + }, + { + "question": { + "name": "@elevatorDiameterName", + "text": "@elevatorDiameterText" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDiameterPlaceholder", + "decimals": 0, + "min": 150, + "max": 1000, + "unit": "@unitCentimeter" + }, + "constructor": { + "diameter": [ + "CONCAT", [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ], " m" + ] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "shape": "circular", + "diameter": false + }, + "osm_element": "Node" + } + ] + }, + { + "question": { + "name": "@elevatorDoorWidthName", + "text": "@elevatorDoorWidthText", + "description": "@elevatorDoorWidthDescription" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDoorWidthPlaceholder", + "decimals": 0, + "min": 80, + "max": 300, + "unit": "@unitCentimeter" + }, + "constructor": { + "door:width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "door:width": false + }, + "osm_element": ["Node", "ClosedWay"], + "!parent": [ + { + "osm_element": "OpenWay", + "child": [ + { + "osm_tags": { + "indoor": "door", + "door":"sliding", + "automatic_door": ["yes", "button"] + } + } + ] + } + ], + "!child": [ + { + "osm_tags": { + "door": ["yes", "sliding"] + } + } + ] + } + ], + "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." + }, + { + "question":{ + "name": "@elevatorDoorHeightName", + "text": "@elevatorDoorHeightText", + "description": "@elevatorDoorHeightDescription" + }, + "answer": { + "type": "Number", + "input": { + "placeholder": "@elevatorDoorHeightPlaceholder", + "decimals": 0, + "min": 150, + "max": 400, + "unit": "@unitCentimeter" + }, + "constructor": { + "width": [ + "REPLACE", "/\\.?0{1,2}$/", "", [ + "INSERT", ".", "-2", [ + "PAD", "0", "3", "$input" + ] + ] + ] + } + }, + "conditions": [ + { + "osm_tags": { + "highway": "elevator", + "door:height": false + }, + "osm_element": ["Node", "ClosedWay"], + "!parent": [ + { + "osm_element": "OpenWay", + "child": [ + { + "osm_tags": { + "indoor": "door", + "door":"sliding", + "automatic_door": ["yes", "button"] + } + } + ] + } + ], + "!child": [ + { + "osm_tags": { + "door": ["yes", "sliding"] + } + } + ] + } + ], + "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." + }, { "question": { "name": "@elevatorTactileWritingName", @@ -4122,189 +4306,5 @@ "osm_element": "Node" } ] - }, - { - "question": { - "name": "@elevatorHeightName", - "text": "@elevatorHeightText" - }, - "answer": { - "type": "Number", - "input": { - "placeholder": "@elevatorHeightPlaceholder", - "decimals": 0, - "min": 150, - "max": 400, - "unit": "@unitCentimeter" - }, - "constructor": { - "width": [ - "REPLACE", "/\\.?0{1,2}$/", "", [ - "INSERT", ".", "-2", [ - "PAD", "0", "3", "$input" - ] - ] - ] - } - }, - "conditions": [ - { - "osm_tags": { - "highway": "elevator", - "height": false - } - } - ] - }, - { - "question": { - "name": "@elevatorDiameterName", - "text": "@elevatorDiameterText" - }, - "answer": { - "type": "Number", - "input": { - "placeholder": "@elevatorDiameterPlaceholder", - "decimals": 0, - "min": 150, - "max": 1000, - "unit": "@unitCentimeter" - }, - "constructor": { - "diameter": [ - "CONCAT", [ - "REPLACE", "/\\.?0{1,2}$/", "", [ - "INSERT", ".", "-2", [ - "PAD", "0", "3", "$input" - ] - ] - ], " m" - ] - } - }, - "conditions": [ - { - "osm_tags": { - "highway": "elevator", - "shape": "circular", - "diameter": false - }, - "osm_element": "Node" - } - ] - }, - { - "question": { - "name": "@elevatorDoorWidthName", - "text": "@elevatorDoorWidthText", - "description": "@elevatorDoorWidthDescription" - }, - "answer": { - "type": "Number", - "input": { - "placeholder": "@elevatorDoorWidthPlaceholder", - "decimals": 0, - "min": 80, - "max": 300, - "unit": "@unitCentimeter" - }, - "constructor": { - "door:width": [ - "REPLACE", "/\\.?0{1,2}$/", "", [ - "INSERT", ".", "-2", [ - "PAD", "0", "3", "$input" - ] - ] - ] - } - }, - "conditions": [ - { - "osm_tags": { - "highway": "elevator", - "door:width": false - }, - "osm_element": ["Node", "ClosedWay"], - "!parent": [ - { - "osm_element": "OpenWay", - "child": [ - { - "osm_tags": { - "indoor": "door", - "door":"sliding", - "automatic_door": ["yes", "button"] - } - } - ] - } - ], - "!child": [ - { - "osm_tags": { - "door": ["yes", "sliding"] - } - } - ] - } - ], - "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." - }, - { - "question":{ - "name": "@elevatorDoorHeightName", - "text": "@elevatorDoorHeightText", - "description": "@elevatorDoorHeightDescription" - }, - "answer": { - "type": "Number", - "input": { - "placeholder": "@elevatorDoorHeightPlaceholder", - "decimals": 0, - "min": 150, - "max": 400, - "unit": "@unitCentimeter" - }, - "constructor": { - "width": [ - "REPLACE", "/\\.?0{1,2}$/", "", [ - "INSERT", ".", "-2", [ - "PAD", "0", "3", "$input" - ] - ] - ] - } - }, - "conditions": [ - { - "osm_tags": { - "highway": "elevator", - "door:height": false - }, - "osm_element": ["Node", "ClosedWay"], - "!parent": [ - { - "osm_element": "OpenWay", - "child": [ - { - "osm_tags": { - "indoor": "door", - "door":"sliding", - "automatic_door": ["yes", "button"] - } - } - ] - } - ], - "!child": [ - { - "osm_tags": { - "door": ["yes", "sliding"] - } - } - ] - } - ], - "$comment": "The condition is trying to make sure that there is no separately mapped elevator door by excluding the question if another door with elevator-door-like properties is on the same footway as the elevator. It also excludes children of the elevator object in case the door is mapped as a node on the elevator way." } ]