midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-04 21:57:23 +01:00
commit 4f37bf64a2
14 changed files with 1546 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

184
langs/layers/en.json
View file

@ -1936,6 +1936,13 @@
}
},
"defibrillator": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
},
"name": "Defibrillators",
"presets": {
"0": {
@ -2052,13 +2059,6 @@
},
"title": {
"render": "Defibrillator"
},
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
},
"direction": {
@ -3382,6 +3382,17 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
},
"name": "Waste Basket",
"presets": {
"0": {
@ -3429,20 +3440,157 @@
},
"title": {
"render": "Waste Basket"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
}
},
"watermill": {
"name": "Watermill"
},
"street_lamps": {
"name": "Street Lamps",
"presets": {
"0": {
"title": "street lamp"
}
},
"tagRenderings": {
"colour": {
"mappings": {
"0": {
"then": "This lamp emits white light"
},
"1": {
"then": "This lamp emits green light"
},
"2": {
"then": "This lamp emits orange light"
}
},
"question": "What colour light does this lamp emit?",
"render": "This lamp emits {light:colour} light"
},
"count": {
"mappings": {
"0": {
"then": "This lamp has 1 fixture"
},
"1": {
"then": "This lamp has 2 fixtures"
}
},
"question": "How many fixtures does this light have?",
"render": "This lamp has {light:count} fixtures"
},
"direction": {
"question": "Where does this lamp point to?",
"render": "This lamp points towards {light:direction}"
},
"lamp_mount": {
"mappings": {
"0": {
"then": "This lamp sits atop of a straight mast"
},
"1": {
"then": "This lamp sits at the end of a bent mast"
}
},
"question": "How is this lamp mounted to the pole?"
},
"lit": {
"mappings": {
"0": {
"then": "This lamp is lit at night"
},
"1": {
"then": "This lamp is lit 24/7"
},
"2": {
"then": "This lamp is lit based on motion"
},
"3": {
"then": "This lamp is lit based on demand (e.g. with a pushbutton)"
}
},
"question": "When is this lamp lit?"
},
"method": {
"mappings": {
"0": {
"then": "This lamp is lit electrically"
},
"1": {
"then": "This lamp uses LEDs"
},
"2": {
"then": "This lamp uses incandescent lighting"
},
"3": {
"then": "This lamp uses halogen lighting"
},
"4": {
"then": "This lamp uses discharge lamps (unknown type)"
},
"5": {
"then": "This lamp uses a mercury-vapour lamp (lightly blueish)"
},
"6": {
"then": "This lamp uses metal-halide lamps (bright white)"
},
"7": {
"then": "This lamp uses fluorescent lighting"
},
"8": {
"then": "This lamp uses sodium lamps (unknown type)"
},
"9": {
"then": "This lamp uses low pressure sodium lamps (monochrome orange)"
},
"10": {
"then": "This lamp uses high pressure sodium lamps (orange with white)"
},
"11": {
"then": "This lamp is lit using gas"
}
},
"question": "What kind of lighting does this lamp use?"
},
"ref": {
"question": "What is the reference number of this street lamp?",
"render": "This street lamp has the reference number {ref}"
},
"support": {
"mappings": {
"0": {
"then": "This lamp is suspended using cables"
},
"1": {
"then": "This lamp is mounted on a ceiling"
},
"2": {
"then": "This lamp is mounted in the ground"
},
"3": {
"then": "This lamp is mounted on a short pole (mostly < 1.5m)"
},
"4": {
"then": "This lamp is mounted on a pole"
},
"5": {
"then": "This lamp is mounted directly to the wall"
},
"6": {
"then": "This lamp is mounted to the wall using a metal bar"
}
},
"question": "How is this street lamp mounted?"
}
},
"title": {
"mappings": {
"0": {
"then": "Street Lamp {ref}"
}
},
"render": "Street Lamp"
}
}
}

184
langs/layers/nl.json
View file

@ -896,6 +896,13 @@
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
}
}
},
"name": "Vogelkijkhutten",
"presets": {
"0": {
@ -974,13 +981,6 @@
}
},
"render": "Vogelkijkplaats"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
}
}
}
},
"cafe_pub": {
@ -3821,6 +3821,17 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
},
"name": "Vuilnisbak",
"presets": {
"0": {
@ -3868,17 +3879,6 @@
},
"title": {
"render": "Vuilnisbak"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
}
},
"watermill": {
@ -3933,5 +3933,153 @@
},
"render": "Watermolens"
}
},
"street_lamps": {
"name": "Straatlantaarns",
"presets": {
"0": {
"title": "straatlantaarn"
}
},
"tagRenderings": {
"colour": {
"mappings": {
"0": {
"then": "Deze lantaarn geeft wit licht"
},
"1": {
"then": "Deze lantaarn geeft groen licht"
},
"2": {
"then": "Deze lantaarn geeft oranje licht"
}
},
"question": "Wat voor kleur licht geeft deze lantaarn?",
"render": "Deze lantaarn geeft {light:colour} licht"
},
"count": {
"mappings": {
"0": {
"then": "Deze lantaarn heeft 1 lamp"
},
"1": {
"then": "Deze lantaarn heeft 2 lampen"
}
},
"question": "Hoeveel lampen heeft deze lantaarn?",
"render": "Deze lantaarn heeft {light:count} lampen"
},
"direction": {
"question": "Waar is deze lamp heengericht?",
"render": "Deze lantaarn is gericht naar {light:direction}"
},
"lamp_mount": {
"mappings": {
"0": {
"then": "Deze lantaarn zit boven op een rechte paal"
},
"1": {
"then": "Deze lantaarn zit aan het eind van een gebogen paal"
}
},
"question": "Hoe zit deze lantaarn aan de paal?"
},
"lit": {
"mappings": {
"0": {
"then": "Deze lantaarn is 's nachts verlicht"
},
"1": {
"then": "Deze lantaarn is 24/7 verlicht"
},
"2": {
"then": "Deze lantaarn is verlicht op basis van beweging"
},
"3": {
"then": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)"
}
},
"question": "Wanneer is deze lantaarn verlicht?"
},
"method": {
"mappings": {
"0": {
"then": "Deze lantaarn is elektrisch verlicht"
},
"1": {
"then": "Deze lantaarn gebruikt LEDs"
},
"2": {
"then": "Deze lantaarn gebruikt gloeilampen"
},
"3": {
"then": "Deze lantaarn gebruikt halogeen verlichting"
},
"4": {
"then": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)"
},
"5": {
"then": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)"
},
"6": {
"then": "Deze lantaarn gebruikt metaalhalidelampen"
},
"7": {
"then": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)"
},
"8": {
"then": "Deze lantaarn gebruikt natriumlampen (onbekend type)"
},
"9": {
"then": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)"
},
"10": {
"then": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)"
},
"11": {
"then": "Deze lantaarn wordt verlicht met gas"
}
},
"question": "Wat voor verlichting gebruikt deze lantaarn?"
},
"ref": {
"question": "Wat is het nummer van deze straatlantaarn?",
"render": "Deze straatlantaarn heeft het nummer {ref}"
},
"support": {
"mappings": {
"0": {
"then": "Deze lantaarn hangt aan kabels"
},
"1": {
"then": "Deze lantaarn hangt aan een plafond"
},
"2": {
"then": "Deze lantaarn zit in de grond"
},
"3": {
"then": "Deze lantaarn zit op een korte paal (meestal < 1.5m)"
},
"4": {
"then": "Deze lantaarn zit op een paal"
},
"5": {
"then": "Deze lantaarn hangt direct aan de muur"
},
"6": {
"then": "Deze lantaarn hangt aan de muur met een metalen balk"
}
},
"question": "Hoe is deze straatlantaarn gemonteerd?"
}
},
"title": {
"mappings": {
"0": {
"then": "Straatlantaarn {ref}"
}
},
"render": "Straatlantaarn"
}
}
}