diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 307c155..074d9be 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -196,7 +196,7 @@
{
"question": {
"nl": "Wanneer is dit fietsherstelpunt open?",
- "en": "When is this bicycle repair point opened?"
+ "en": "When is this bicycle repair point open?"
},
"render": "{opening_hours_table()}",
"freeform": {
@@ -208,14 +208,14 @@
"if": "opening_hours=24/7",
"then": {
"nl": "Dag en nacht open",
- "en": "Always opened"
+ "en": "Always open"
}
},
{
"if": "opening_hours=",
"then": {
"nl": "Dag en nacht open",
- "en": "Always opened"
+ "en": "Always open"
},
"hideInAnswer": true
}
@@ -255,7 +255,7 @@
},
{
"question": {
- "en": "Does this bike station have a hook to suspend your bike with or a stand to elevate it?",
+ "en": "Does this bike station have a hook to hang your bike on or a stand to raise it?",
"nl": "Heeft dit herstelpunt een haak of standaard om je fiets op te hangen/zetten?",
"fr": "Est-ce que cette station vélo à un crochet pour suspendre son velo ou une accroche pour l'élevé?",
"gl": "Esta estación de bicicletas ten un guindastre para pendurar a túa bicicleta ou un soporte para elevala?",
@@ -570,4 +570,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/themes/drinking_water/drinking_water.json b/assets/themes/drinking_water/drinking_water.json
index 09027e1..2492a1e 100644
--- a/assets/themes/drinking_water/drinking_water.json
+++ b/assets/themes/drinking_water/drinking_water.json
@@ -5,7 +5,7 @@
"nl": "Drinkwaterpunten"
},
"description": {
- "en": "On this map, publicly accessible drinkging water spots are shown and can be easily added",
+ "en": "On this map, publicly accessible drinking water spots are shown and can be easily added",
"nl": "Op deze kaart staan publiek toegankelijke drinkwaterpunten en kan je makkelijk een nieuw drinkwaterpunt toevoegen"
},
"language": [
@@ -24,4 +24,4 @@
"drinking_water"
],
"roamingRenderings": []
-}
\ No newline at end of file
+}
diff --git a/assets/themes/hailhydrant/Twemoji12_1f692.svg b/assets/themes/hailhydrant/Twemoji12_1f692.svg
new file mode 100644
index 0000000..711c996
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_1f692.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/Twemoji12_1f9ef.svg b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg
new file mode 100644
index 0000000..e8b17ac
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/Twemoji12_26d1.svg b/assets/themes/hailhydrant/Twemoji12_26d1.svg
new file mode 100644
index 0000000..e8457ae
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_26d1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/Twemoji_1f691.svg b/assets/themes/hailhydrant/Twemoji_1f691.svg
new file mode 100644
index 0000000..8f94fb9
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji_1f691.svg
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
new file mode 100644
index 0000000..dc2df55
--- /dev/null
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -0,0 +1,625 @@
+{
+ "id": "hailhydrant",
+ "title": {
+ "en": "Hydrants, Extinguishers, Fire stations, and Ambulance stations."
+ },
+ "shortDescription": {
+ "en": "Map to show hydrants, extinguishers, fire stations, and ambulance stations."
+ },
+ "description": {
+ "en": "On this map you can find and update hydrants, fire stations, ambulance stations, and extinguishers in your favorite neighborhoods. \n\nYou can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide additional details by answering available questions. \n\nAll changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others."
+ },
+ "language": [
+ "en"
+ ],
+ "maintainer": "",
+ "icon": "./assets/themes/hailhydrant/logo.svg",
+ "version": "0",
+ "startLat": 13.67801,
+ "startLon": 121.6625,
+ "startZoom": 6,
+ "widenFactor": 0.05,
+ "socialImage": "",
+ "layers": [
+ {
+ "id": "hydrants",
+ "name": {
+ "en": "Map of hydrants"
+ },
+ "minzoom": 14,
+ "source": {
+ "osmTags": {
+ "and": [
+ "emergency=fire_hydrant"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Hydrant"
+ }
+ },
+ "description": {
+ "en": "Map layer to show fire hydrants."
+ },
+ "tagRenderings": [
+ {
+ "question": {
+ "en": "What color is the hydrant?"
+ },
+ "render": {
+ "en": "The hydrant color is {colour}"
+ },
+ "freeform": {
+ "key": "colour"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "colour="
+ ]
+ },
+ "then": {
+ "en": "The hydrant color is unknown."
+ },
+ "hideInAnswer": true
+ },
+ {
+ "if": {
+ "and": [
+ "colour=yellow"
+ ]
+ },
+ "then": {
+ "en": "The hydrant color is yellow."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "colour=red"
+ ]
+ },
+ "then": {
+ "en": "The hydrant color is red."
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "What type of hydrant is it?"
+ },
+ "freeform": {
+ "key": "fire_hydrant:type"
+ },
+ "render": {
+ "en": " Hydrant type: {fire_hydrant:type}"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "fire_hydrant:type="
+ ]
+ },
+ "then": {
+ "en": "The hydrant type is unknown."
+ },
+ "hideInAnswer": true
+ },
+ {
+ "if": {
+ "and": [
+ "fire_hydrant:type=pillar"
+ ]
+ },
+ "then": {
+ "en": "![](\"./assets/themes/hailhydrant/hydrant_pillar.svg\")
Pillar type."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "fire_hydrant:type=pipe"
+ ]
+ },
+ "then": {
+ "en": "![](\"./assets/themes/hailhydrant/hydrant_unknown.svg\")
Pipe type."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "fire_hydrant:type=wall"
+ ]
+ },
+ "then": {
+ "en": " Wall type."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "fire_hydrant:type=underground"
+ ]
+ },
+ "then": {
+ "en": "![](\"./assets/themes/hailhydrant/hydrant_underground.svg\")
Underground type."
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "Update the lifecycle status of the hydrant."
+ },
+ "render": {
+ "en": "Lifecycle status"
+ },
+ "freeform": {
+ "key": "disused:emergency"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "emergency=fire_hydrant"
+ ]
+ },
+ "then": {
+ "en": "The hydrant is (fully or partially) working."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "disused:emergency=fire_hydrant",
+ "emergency="
+ ]
+ },
+ "then": {
+ "en": "The hydrant is unavailable."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "removed:emergency=fire_hydrant",
+ "emergency="
+ ]
+ },
+ "then": {
+ "en": "The hydrant has been removed."
+ }
+ }
+ ]
+ },"images"
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/themes/hailhydrant/hydrant.svg"
+ },
+ "width": {
+ "render": "8"
+ },
+ "iconSize": {
+ "render": "20,20,center"
+ },
+ "color": {
+ "render": "#00f"
+ },
+ "presets": [
+ {
+ "tags": [
+ "emergency=fire_hydrant"
+ ],
+ "title": {
+ "en": "Fire hydrant"
+ },
+ "description": {
+ "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground."
+ }
+ }
+ ],
+ "wayHandling": 2
+ },
+ {
+ "id": "extinguisher",
+ "name": {
+ "en": "Map of fire extinguishers."
+ },
+ "minzoom": 14,
+ "source": {
+ "osmTags": {
+ "and": [
+ "emergency=fire_extinguisher"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Extinguishers"
+ }
+ },
+ "description": {
+ "en": "Map layer to show fire hydrants."
+ },
+ "tagRenderings": [
+ {
+ "render": {
+ "en": "Location: {location}"
+ },
+ "question": {
+ "en": "Where is it positioned?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "location=indoor"
+ ]
+ },
+ "then": {
+ "en": "Found indoors."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "location=outdoor"
+ ]
+ },
+ "then": {
+ "en": "Found outdoors."
+ }
+ }
+ ],
+ "freeform": {
+ "key": "location"
+ }
+ },
+ "images"
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
+ },
+ "width": {
+ "render": "8"
+ },
+ "iconSize": {
+ "render": "20,20,center"
+ },
+ "color": {
+ "render": "#00f"
+ },
+ "presets": [
+ {
+ "tags": [
+ "emergency=fire_extinguisher"
+ ],
+ "title": {
+ "en": "Fire extinguisher"
+ },
+ "description": {
+ "en": "A fire extinguisher is a small, portable device used to stop a fire"
+ }
+ }
+ ],
+ "wayHandling": 1
+ },
+ {
+ "id": "fire_stations",
+ "name": {
+ "en": "Map of fire stations"
+ },
+ "minzoom": 12,
+ "source": {
+ "osmTags": {
+ "and": [
+ "amenity=fire_station"
+ ]
+ }
+ },
+ "wayHandling": 2,
+ "title": {
+ "render": {
+ "en": "Fire Station"
+ }
+ },
+ "description": {
+ "en": "Map layer to show fire stations."
+ },
+ "tagRenderings": [
+ {
+ "freeform": {
+ "key": "name"
+ },
+ "question": {
+ "en": "What is the name of this fire station?"
+ },
+ "render": {
+ "en": "This station is called {name}."
+ }
+ },
+ {
+ "freeform": {
+ "key": "addr:street"
+ },
+ "question": {
+ "en": " What is the street name where the station located?"
+ },
+ "render": {
+ "en": "This station is along a highway called {addr:street}."
+ }
+ },
+ {
+ "question": {
+ "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)"
+ },
+ "freeform": {
+ "key": "addr:place"
+ },
+ "render": {
+ "en": "This station is found within {addr:place}."
+ }
+ },
+ {
+ "question": {
+ "en": "What agency operates this station?"
+ },
+ "render": {
+ "en": "This station is operated by {operator}."
+ },
+ "freeform": {
+ "key": "operator"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "operator=Bureau of Fire Protection",
+ "operator:type=government"
+ ]
+ },
+ "then": {
+ "en": "Bureau of Fire Protection"
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "How is the station operator classified??"
+ },
+ "render": {
+ "en": "The operator is a(n) {operator:type} entity."
+ },
+ "freeform": {
+ "key": "operator:type"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "operator:type=government"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by the government."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=community"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by a community-based, or informal organization."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=ngo"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by a formal group of volunteers."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=private"
+ ]
+ },
+ "then": {
+ "en": "The station is privately operated."
+ }
+ }
+ ]
+ },"images"
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
+ },
+ "width": {
+ "render": "1"
+ },
+ "iconSize": {
+ "render": "35,35,center"
+ },
+ "color": {
+ "render": "#c22"
+ },
+ "presets": [
+ {
+ "tags": [
+ "amenity=fire_station"
+ ],
+ "title": {
+ "en": "Fire station"
+ },
+ "description": {
+ "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation."
+ }
+ }
+ ]
+ },
+ {
+ "id": "ambulancestation",
+ "name": {
+ "en": "Map of ambulance stations"
+ },
+ "minzoom": 12,
+ "source": {
+ "osmTags": {
+ "and": [
+ "emergency=ambulance_station"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Ambulance Station"
+ }
+ },
+ "description": {
+ "en": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies."
+ },
+ "tagRenderings": [
+ {
+ "freeform": {
+ "key": "name"
+ },
+ "question": {
+ "en": "What is the name of this ambulance station?"
+ },
+ "render": {
+ "en": "This station is called {name}."
+ }
+ },
+ {
+ "freeform": {
+ "key": "addr:street"
+ },
+ "question": {
+ "en": " What is the street name where the station located?"
+ },
+ "render": {
+ "en": "This station is along a highway called {addr:street}."
+ }
+ },
+ {
+ "question": {
+ "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)"
+ },
+ "freeform": {
+ "key": "addr:place"
+ },
+ "render": {
+ "en": "This station is found within {addr:place}."
+ }
+ },
+ {
+ "question": {
+ "en": "What agency operates this station?"
+ },
+ "render": {
+ "en": "This station is operated by {operator}."
+ },
+ "freeform": {
+ "key": "operator"
+ },
+ "mappings": []
+ },
+ {
+ "question": {
+ "en": "How is the station operator classified??"
+ },
+ "render": {
+ "en": "The operator is a(n) {operator:type} entity."
+ },
+ "freeform": {
+ "key": "operator:type"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "operator:type=government"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by the government."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=community"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by a community-based, or informal organization."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=ngo"
+ ]
+ },
+ "then": {
+ "en": "The station is operated by a formal group of volunteers."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "operator:type=private"
+ ]
+ },
+ "then": {
+ "en": "The station is privately operated."
+ }
+ }
+ ]
+ },"images"
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
+ },
+ "width": {
+ "render": "1"
+ },
+ "iconSize": {
+ "render": "35,35,center"
+ },
+ "color": {
+ "render": "#00f"
+ },
+ "presets": [
+ {
+ "tags": [
+ "emergency=ambulance_station"
+ ],
+ "title": {
+ "en": "Ambulance station"
+ },
+ "description": {
+ "en": "Add an ambulance station to the map"
+ }
+ }
+ ],
+ "wayHandling": 2
+ }
+ ],
+ "defaultBackgroundId": "HDM_HOT"
+}
diff --git a/assets/themes/hailhydrant/hydrant.svg b/assets/themes/hailhydrant/hydrant.svg
new file mode 100644
index 0000000..0dbda22
--- /dev/null
+++ b/assets/themes/hailhydrant/hydrant.svg
@@ -0,0 +1,107 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/hydrant_pillar.svg b/assets/themes/hailhydrant/hydrant_pillar.svg
new file mode 100644
index 0000000..27ef663
--- /dev/null
+++ b/assets/themes/hailhydrant/hydrant_pillar.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/assets/themes/hailhydrant/hydrant_underground.svg b/assets/themes/hailhydrant/hydrant_underground.svg
new file mode 100644
index 0000000..f7c0f3d
--- /dev/null
+++ b/assets/themes/hailhydrant/hydrant_underground.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/assets/themes/hailhydrant/hydrant_unknown.svg b/assets/themes/hailhydrant/hydrant_unknown.svg
new file mode 100644
index 0000000..10b31cd
--- /dev/null
+++ b/assets/themes/hailhydrant/hydrant_unknown.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json
new file mode 100644
index 0000000..0deab16
--- /dev/null
+++ b/assets/themes/hailhydrant/license_info.json
@@ -0,0 +1,109 @@
+[
+ {
+ "authors": [
+ "http://jaanos.deviantart.com/"
+ ],
+ "path": "hydrant.svg",
+ "license": "GPL",
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Hydrant.svg"
+ ]
+ },
+ {
+ "authors": [
+ "Twemoji Project"
+ ],
+ "path": "Twemoji12_1f9ef.svg",
+ "license": "CC-BY 4.0",
+ "sources": [
+ "https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg",
+ "https://twemoji.twitter.com/"
+ ]
+ },
+ {
+ "path": "hydrant_pillar.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "M!dgard"
+ ],
+ "sources": [
+ "https://www.openstreetmap.org/user/M!dgard",
+ "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg"
+ ]
+ },
+ {
+ "path": "hydrant_unknown.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "M!dgard"
+ ],
+ "sources": [
+ "https://www.openstreetmap.org/user/M!dgard",
+ "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg"
+ ]
+ },
+ {
+ "path": "hydrant_underground.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "M!dgard"
+ ],
+ "sources": [
+ "https://www.openstreetmap.org/user/M!dgard",
+ "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg"
+ ]
+ },
+ {
+ "path": "hydrant.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "GOwin"
+ ],
+ "sources": [
+ "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg"
+ ]
+ },
+ {
+ "path": "Twemoji12_1f692.svg",
+ "license": "CC-BY 4.0",
+ "authors": [
+ "Twemoji Project"
+ ],
+ "sources": [
+ "https://upload.wikimedia.org/wikipedia/commons/1/19/Twemoji12_1f692.svg",
+ "https://twemoji.twitter.com/"
+ ]
+ },
+ {
+ "path": "Twemoji12_26d1.svg",
+ "license": "CC-BY 4.0",
+ "authors": [
+ "Twemoji Project"
+ ],
+ "sources": [
+ "https://upload.wikimedia.org/wikipedia/commons/e/eb/Twemoji12_26d1.svg",
+ "https://twemoji.twitter.com/"
+ ]
+ },
+ {
+ "path": "Twemoji_1f691.svg",
+ "license": "CC-BY 4.0",
+ "authors": [
+ "Twemoji Project"
+ ],
+ "sources": [
+ "https://upload.wikimedia.org/wikipedia/commons/9/95/Twemoji_1f691.svg",
+ "https://twemoji.twitter.com/"
+ ]
+ } ,
+ {
+ "authors": [
+ "Erwin Olario"
+ ],
+ "path": "logo.svg",
+ "license": "CC-BY-SA 4.0",
+ "sources": [
+ "https://wiki.openstreetmap.org/wiki/File:Hailhydrant-logo.svg"
+ ]
+ }
+]
diff --git a/assets/themes/hailhydrant/logo.svg b/assets/themes/hailhydrant/logo.svg
new file mode 100644
index 0000000..d491480
--- /dev/null
+++ b/assets/themes/hailhydrant/logo.svg
@@ -0,0 +1,53 @@
+
+
+
diff --git a/assets/themes/hailhydrant/readme.md b/assets/themes/hailhydrant/readme.md
new file mode 100644
index 0000000..9182579
--- /dev/null
+++ b/assets/themes/hailhydrant/readme.md
@@ -0,0 +1 @@
+This MapComplete theme is intended to be a simple way of adding certain emergency-related features (currently: fire hydrants, fire stations, ambulance stations, and extinguishers) from the contributor's favorite neighbourhoods, and a gentle way to introduce people to contributing to OpenStreetMap.