Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add elevator questions #271

Merged
merged 43 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9069b35
Add elevator questions
wielandb Jul 1, 2024
3fb4f8b
Add german strings
wielandb Jul 1, 2024
397dde5
Remove nonexistent images
wielandb Jul 2, 2024
1cc9c1a
Make !parent a sibling condition to osm_tags
wielandb Jul 9, 2024
f951672
Add comma
wielandb Jul 9, 2024
1938fd1
Add comma
wielandb Jul 9, 2024
46390aa
Add comma
wielandb Jul 9, 2024
14a0b0f
Fix string reference
wielandb Jul 9, 2024
f9c2444
Update min height
wielandb Jul 9, 2024
eb1c3fc
Update min height
wielandb Jul 9, 2024
e6ccf6c
Fix wrong tags beeing written
wielandb Jul 9, 2024
d01ccde
remove unit from strings
wielandb Jul 9, 2024
5bae3e4
Update strings
wielandb Jul 9, 2024
45bda99
Update de.arb
wielandb Jul 9, 2024
e014988
Update de.arb
wielandb Jul 9, 2024
5d0974a
Update de.arb
wielandb Jul 9, 2024
a0e7306
Update en.arb
wielandb Jul 9, 2024
f9d03e5
Update en.arb
wielandb Jul 9, 2024
19278e4
Update en.arb
wielandb Jul 9, 2024
d651445
Update en.arb
wielandb Jul 9, 2024
778cd98
Increase min diameter
wielandb Jul 9, 2024
b1c691e
Update en.arb
wielandb Jul 9, 2024
5e85fe4
Update en.arb
wielandb Jul 9, 2024
6efc96f
Update en.arb
wielandb Jul 9, 2024
b2cc89f
Use centimeter as units
wielandb Jul 9, 2024
a7e1826
Fix missing comma
wielandb Jul 10, 2024
b188cd6
Make units actually cm
wielandb Jul 10, 2024
95771c0
Fix breaking typo
wielandb Jul 10, 2024
54e82d3
Update en.arb
wielandb Jul 10, 2024
783886a
Update en.arb
wielandb Jul 10, 2024
63e194b
Update en.arb
wielandb Jul 10, 2024
a079e09
Update en.arb
wielandb Jul 10, 2024
0b782ff
Update en.arb
wielandb Jul 10, 2024
3ff62c9
Add space before meters
wielandb Jul 10, 2024
382494b
Explement shape= question, only ask for rectangular elevators
wielandb Jul 11, 2024
acc0eea
Change minmax values
wielandb Jul 15, 2024
a253a5f
Add a comment
wielandb Jul 15, 2024
7e4f66c
Update translations
wielandb Jul 15, 2024
ec24d09
Tighten conditions for elevator door width
wielandb Jul 18, 2024
56b9922
Expand door:* conditions
wielandb Jul 18, 2024
cb72202
Update assets/question_catalog/definition.json
wielandb Jul 22, 2024
386671e
Update assets/question_catalog/definition.json
wielandb Jul 22, 2024
fe58e7f
Move elevator questions to other elevator questions
wielandb Jul 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 190 additions & 0 deletions assets/question_catalog/definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -2299,6 +2299,9 @@
"highway": "elevator",
"length": false
},
"!osm_tags": {
"shape": "circular"
},
"osm_element": "Node"
}
]
Expand Down Expand Up @@ -2376,10 +2379,197 @@
"highway": "elevator",
"width": false
},
"!osm_tags": {
"shape": "circular"
},
"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."
},
{
"question": {
"name": "@elevatorTactileWritingName",
Expand Down
36 changes: 32 additions & 4 deletions assets/question_catalog/locales/de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +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",
"@cycleBarrierWidthPlaceholder": {},
"@cycleBarrierWidthPlaceho}lder": {},
"cycleBarrierOpeningName": "Umlaufsperren-Zugangsbreite",
"@cycleBarrierOpeningName": {},
"cycleBarrierOpeningText": "Wie breit ist der (schmalste) Zugang der Umlaufsperre?",
Expand Down Expand Up @@ -368,13 +368,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": {},
Expand Down Expand Up @@ -617,5 +617,33 @@
"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": {},
"elevatorHeightName": "Höhe des Fahrstuhls",
"@elevatorHeightName": {},
"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 des Fahrstuhls?",
"@elevatorDiameterText": {},
"elevatorDiameterPlaceholder": "Durchmesser der Kabine",
"@elevatorDiameterPlaceholder": {},
"elevatorDoorWidthName": "Breite der Fahrstuhltür",
"@elevatorDoorWidthName": {},
"elevatorDoorWidthText": "Wie breit ist die Tür dieses Fahrstuhls?",
"@elevatorDoorWidthText": {},
"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": {},
"elevatorDoorHeightName": "Höhe der Fahrstuhltür",
"@elevatorDoorHeightName": {},
"elevatorDoorHeightText": "Wie hoch ist die Tür dieses Fahrstuhls?",
"@elevatorDoorHeightText": {},
"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": {}
}
30 changes: 29 additions & 1 deletion assets/question_catalog/locales/en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -617,5 +617,33 @@
"unitMeter": "meter",
"@unitMeter": {},
"unitKilogram": "kilogram",
"@unitKilogram": {}
"@unitKilogram": {},
"elevatorHeightName": "Elevator height",
"@elevatorHeightName": {},
"elevatorHeightText": "What is the height of the elevator cabin?",
"@elevatorHeightText": {},
"elevatorHeightPlaceholder": "Cabin height",
"@elevatorHeightPlaceholder": {},
"elevatorDiameterName": "Elevator diameter",
"@elevatorDiameterName": {},
"elevatorDiameterText": "What is the diameter of this elevator?",
"@elevatorDiameterText": {},
"elevatorDiameterPlaceholder": "Diameter of the cabin",
"@elevatorDiameterPlaceholder": {},
"elevatorDoorWidthName": "Elevator door width",
"@elevatorDoorWidthName": {},
"elevatorDoorWidthText": "What is the width of the elevator door?",
"@elevatorDoorWidthText": {},
"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": {},
"elevatorDoorHeightName": "Elevator door height",
"@elevatorDoorHeightName": {},
"elevatorDoorHeightText": "What is the height of the elevator door?",
"@elevatorDoorHeightText": {},
"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": {}
}
Loading