diff --git a/assets/layers/assembly_point/assembly_point.json b/assets/layers/assembly_point/assembly_point.json
new file mode 100644
index 000000000..86bee7960
--- /dev/null
+++ b/assets/layers/assembly_point/assembly_point.json
@@ -0,0 +1,112 @@
+{
+ "id": "assembly_point",
+ "title": {
+ "en": "Emergency assembly points",
+ "it": "Aree di attesa per emergenze"
+ },
+ "description": "This layer contains designated places or an area where all employees, passengers or a large crowd assemble in case of an emergency in an installation, building or a public place.",
+ "docs": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Dassembly_point",
+ "source": {
+ "osmTags": {
+ "and": [
+ "emergency=assembly_point"
+ ]
+ }
+ },
+ "minzoom": 10,
+ "pointRendering": [
+ {
+ "iconSize": "20,20",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "bottom",
+ "marker": [
+ {
+ "icon": "pin",
+ "color": "#6BC4F7"
+ },
+ {
+ "icon": "./assets/themes/disaster_response/assembly_point.svg"
+ }
+ ]
+ }
+ ],
+ "tagRenderings": [
+ "images",
+ {
+ "id": "operator",
+ "render": {
+ "en": "This assembly point is operated by {operator}",
+ "it": "Questa area di attesa è gestita da {operator}"
+ },
+ "question": {
+ "en": "What organization operates this assembly point?",
+ "it": "Quale organizzazione gestisce questa area di attesa?"
+ },
+ "freeform": {
+ "key": "operator",
+ "type": "string"
+ }
+ },
+ {
+ "id": "disaster_type",
+ "question": {
+ "en": "For which disaster type is this assembly point meant?",
+ "it": "Per quali tipi di disastro è pensata questa area di attesa?"
+ },
+ "multiAnswer": true,
+ "mappings": [
+ {
+ "if": "assembly_point:earthquake=yes",
+ "ifnot": "assembly_point:earthquake=",
+ "then": {
+ "en": "Earthquake",
+ "it": "Terremoto"
+ },
+ "icon": {
+ "path": "./assets/themes/disaster_response/earthquake.svg",
+ "class": "medium"
+ }
+ },
+ {
+ "if": "assembly_point:flood=yes",
+ "ifnot": "assembly_point:flood=",
+ "then": {
+ "en": "Flood",
+ "it": "Alluvione"
+ },
+ "icon": {
+ "path": "./assets/themes/disaster_response/flood.svg",
+ "class": "medium"
+ }
+ },
+ {
+ "if": "assembly_point:fire=yes",
+ "ifnot": "assembly_point:fire=",
+ "then": {
+ "en": "Fire",
+ "it": "Incendio"
+ },
+ "icon": {
+ "path": "./assets/themes/disaster_response/fire.svg",
+ "class": "medium"
+ }
+ },
+ {
+ "if": "assembly_point:landslide=yes",
+ "ifnot": "assembly_point:landslide=",
+ "then": {
+ "en": "Landslide",
+ "it": "Frana"
+ },
+ "icon": {
+ "path": "./assets/themes/disaster_response/landslide.svg",
+ "class": "medium"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/assets/layers/assembly_point/assembly_point.svg b/assets/layers/assembly_point/assembly_point.svg
new file mode 100644
index 000000000..83c5ce90e
--- /dev/null
+++ b/assets/layers/assembly_point/assembly_point.svg
@@ -0,0 +1,26 @@
+
+
\ No newline at end of file
diff --git a/assets/layers/assembly_point/assembly_point.svg.license b/assets/layers/assembly_point/assembly_point.svg.license
new file mode 100644
index 000000000..25004fa70
--- /dev/null
+++ b/assets/layers/assembly_point/assembly_point.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:Epop
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/disaster_response/earthquake.svg b/assets/layers/assembly_point/earthquake.svg
similarity index 100%
rename from assets/themes/disaster_response/earthquake.svg
rename to assets/layers/assembly_point/earthquake.svg
diff --git a/assets/layers/assembly_point/earthquake.svg.license b/assets/layers/assembly_point/earthquake.svg.license
new file mode 100644
index 000000000..a9272c432
--- /dev/null
+++ b/assets/layers/assembly_point/earthquake.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: United Nations Office for the Coordination of Humanitarian Affairs (OCHA)
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/disaster_response/fire.svg b/assets/layers/assembly_point/fire.svg
similarity index 100%
rename from assets/themes/disaster_response/fire.svg
rename to assets/layers/assembly_point/fire.svg
diff --git a/assets/layers/assembly_point/fire.svg.license b/assets/layers/assembly_point/fire.svg.license
new file mode 100644
index 000000000..a9272c432
--- /dev/null
+++ b/assets/layers/assembly_point/fire.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: United Nations Office for the Coordination of Humanitarian Affairs (OCHA)
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/disaster_response/flood.svg b/assets/layers/assembly_point/flood.svg
similarity index 100%
rename from assets/themes/disaster_response/flood.svg
rename to assets/layers/assembly_point/flood.svg
diff --git a/assets/layers/assembly_point/flood.svg.license b/assets/layers/assembly_point/flood.svg.license
new file mode 100644
index 000000000..9e50dbb72
--- /dev/null
+++ b/assets/layers/assembly_point/flood.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Iconathon
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/assembly_point/landslide.svg b/assets/layers/assembly_point/landslide.svg
new file mode 100644
index 000000000..509f02b69
--- /dev/null
+++ b/assets/layers/assembly_point/landslide.svg
@@ -0,0 +1,26 @@
+
+
+
\ No newline at end of file
diff --git a/assets/layers/assembly_point/landslide.svg.license b/assets/layers/assembly_point/landslide.svg.license
new file mode 100644
index 000000000..1d666bc5c
--- /dev/null
+++ b/assets/layers/assembly_point/landslide.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Development Seed
+SPDX-License-Identifier: CC-BY-3.0
\ No newline at end of file
diff --git a/assets/layers/assembly_point/license_info.json b/assets/layers/assembly_point/license_info.json
new file mode 100644
index 000000000..087834a74
--- /dev/null
+++ b/assets/layers/assembly_point/license_info.json
@@ -0,0 +1,56 @@
+[
+ {
+ "path": "assembly_point.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "https://commons.wikimedia.org/wiki/User:Epop"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:E011.svg"
+ ]
+ },
+ {
+ "path": "earthquake.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "United Nations Office for the Coordination of Humanitarian Affairs (OCHA)"
+ ],
+ "sources": [
+ "https://thenounproject.com/icon/fire-4232/",
+ "https://commons.wikimedia.org/wiki/File:Earthquake_-_The_Noun_Project.svg"
+ ]
+ },
+ {
+ "path": "fire.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "United Nations Office for the Coordination of Humanitarian Affairs (OCHA)"
+ ],
+ "sources": [
+ "https://thenounproject.com/icon/fire-4234/",
+ "https://commons.wikimedia.org/wiki/File:Fire_-_The_Noun_Project.svg"
+ ]
+ },
+ {
+ "path": "flood.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Iconathon"
+ ],
+ "sources": [
+ "https://thenounproject.com/icon/flood-752/",
+ "https://commons.wikimedia.org/wiki/File:Flood_(752)_-_The_Noun_Project.svg"
+ ]
+ },
+ {
+ "path": "landslide.svg",
+ "license": "CC-BY-3.0",
+ "authors": [
+ "Development Seed"
+ ],
+ "sources": [
+ "https://github.com/developmentseed/mapbox/blob/master/icons-maki/maki-icons.svg",
+ "https://commons.wikimedia.org/wiki/File:Maki1-landslide-15.svg"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/themes/disaster_response/CivilDefence.svg.license b/assets/themes/disaster_response/CivilDefence.svg.license
new file mode 100644
index 000000000..54aed4188
--- /dev/null
+++ b/assets/themes/disaster_response/CivilDefence.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:MStankie
+SPDX-License-Identifier: LicenseRef-TRIVIAL
\ No newline at end of file
diff --git a/assets/themes/disaster_response/assembly_point.svg b/assets/themes/disaster_response/assembly_point.svg
deleted file mode 100644
index 2ff9f9a78..000000000
--- a/assets/themes/disaster_response/assembly_point.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/themes/disaster_response/disaster_response.json b/assets/themes/disaster_response/disaster_response.json
index 0f75f0359..280bcbf4f 100644
--- a/assets/themes/disaster_response/disaster_response.json
+++ b/assets/themes/disaster_response/disaster_response.json
@@ -3,9 +3,7 @@
"en": "This theme contains elements meant for disaster risk reduction and response.",
"it": "Questo tema contiene elementi pensati per la riduzione del rischio e per la risposta ai disastri."
},
- "extraLink": {
- "href": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities"
- },
+ "docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities",
"icon": "./assets/themes/disaster_response/CivilDefence.svg",
"id": "disaster_response",
"socialImage": "./assets/themes/disaster_response/social.jpg",
@@ -15,13 +13,12 @@
},
"layers": [
"hospital",
+ "assembly_point",
{
"id": "disaster_response",
"title": "Disaster response",
"description": "This layer contains organizations that has the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area",
- "extraLink": {
- "href": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Ddisaster_response"
- },
+ "docs": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Ddisaster_response",
"source": {
"osmTags": {
"and": [
@@ -60,113 +57,11 @@
"website"
]
},
- {
- "id": "assembly_point",
- "title": {
- "en": "Emergency assembly points",
- "it": "Aree di attesa per emergenze"
- },
- "description": "This layer contains designated places or an area where all employees, passengers or a large crowd assemble in case of an emergency in an installation, building or a public place.",
- "extraLink": {
- "href": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Dassembly_point"
- },
- "source": {
- "osmTags": {
- "and": [
- "emergency=assembly_point"
- ]
- }
- },
- "minzoom": 10,
- "pointRendering": [
- {
- "iconSize": "20,20",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "bottom",
- "marker": [
- {
- "icon": "pin",
- "color": "#6BC4F7"
- },
- {
- "icon": "./assets/themes/disaster_response/assembly_point.svg"
- }
- ]
- }
- ],
- "tagRenderings": [
- "images",
- {
- "id": "operator",
- "render": {
- "en": "This assembly point is operated by {operator}",
- "it": "Questa area di attesa è gestita da {operator}"
- },
- "question": {
- "en": "What organization operates this assembly point?",
- "it": "Quale organizzazione gestisce questa area di attesa?"
- },
- "freeform": {
- "key": "operator",
- "type": "string"
- }
- },
- {
- "id": "disaster_type",
- "question": {
- "en": "For which disaster type is this assembly point meant?",
- "it": "Per quali tipi di disastro è pensata questa area di attesa?"
- },
- "multiAnswer": true,
- "mappings": [
- {
- "if": "assembly_point:earthquake=yes",
- "ifnot": "assembly_point:earthquake=",
- "then": {
- "en": "Earthquake",
- "it": "Terremoto"
- },
- "icon": {
- "path": "./assets/themes/disaster_response/earthquake.svg",
- "class": "medium"
- }
- },
- {
- "if": "assembly_point:flood=yes",
- "ifnot": "assembly_point:flood=",
- "then": {
- "en": "Flood",
- "it": "Alluvione"
- },
- "icon": {
- "path": "./assets/themes/disaster_response/flood.svg",
- "class": "medium"
- }
- },
- {
- "if": "assembly_point:fire=yes",
- "ifnot": "assembly_point:fire=",
- "then": {
- "en": "Fire",
- "it": "Incendio"
- },
- "icon": {
- "path": "./assets/themes/disaster_response/fire.svg",
- "class": "medium"
- }
- }
- ]
- }
- ]
- },
{
"id": "ses_station",
"title": "SES station",
"description": "This layer contains stations of State Emergency Service (SES), an Australian volunteer organisation that provides emergency help during and after declared (natural or otherwise) disasters.",
- "documentation": "https://wiki.openstreetmap.org/wiki/Tag%3Aemergency%3Dses_station",
+ "docs": "https://wiki.openstreetmap.org/wiki/Tag%3Aemergency%3Dses_station",
"source": {
"osmTags": {
"and": [
diff --git a/assets/themes/disaster_response/license_info.json b/assets/themes/disaster_response/license_info.json
index d32f23c09..37eb5bd05 100644
--- a/assets/themes/disaster_response/license_info.json
+++ b/assets/themes/disaster_response/license_info.json
@@ -9,60 +9,6 @@
"https://commons.wikimedia.org/wiki/File:CivilDefence.svg"
]
},
- {
- "path": "assembly_point.svg",
- "license": "CC0-1.0",
- "authors": [
- "https://commons.wikimedia.org/wiki/User:Epop"
- ],
- "sources": [
- "https://commons.wikimedia.org/wiki/File:E011.svg"
- ]
- },
- {
- "path": "earthquake.svg",
- "license": "CC0-1.0",
- "authors": [
- "United Nations Office for the Coordination of Humanitarian Affairs (OCHA)"
- ],
- "sources": [
- "https://thenounproject.com/icon/fire-4232/",
- "https://commons.wikimedia.org/wiki/File:Earthquake_-_The_Noun_Project.svg"
- ]
- },
- {
- "path": "fire.svg",
- "license": "CC0-1.0",
- "authors": [
- "United Nations Office for the Coordination of Humanitarian Affairs (OCHA)"
- ],
- "sources": [
- "https://thenounproject.com/icon/fire-4234/",
- "https://commons.wikimedia.org/wiki/File:Fire_-_The_Noun_Project.svg"
- ]
- },
- {
- "path": "flood.svg",
- "license": "CC0-1.0",
- "authors": [
- "Iconathon"
- ],
- "sources": [
- "https://thenounproject.com/icon/flood-752/",
- "https://commons.wikimedia.org/wiki/File:Flood_(752)_-_The_Noun_Project.svg"
- ]
- },
- {
- "path": "landslide.svg",
- "license": "CC-BY-3.0",
- "authors": [
- "Development Seed"
- ],
- "sources": [
- "https://github.com/developmentseed/mapbox/blob/master/icons-maki/maki-icons.svg",
- "https://commons.wikimedia.org/wiki/File:Maki1-landslide-15.svg"
- ]
- },
{
"path": "social.jpg",
"license": "CC0-1.0",
diff --git a/assets/themes/disaster_response/social.jpg.license b/assets/themes/disaster_response/social.jpg.license
new file mode 100644
index 000000000..08b6dec46
--- /dev/null
+++ b/assets/themes/disaster_response/social.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: United States Agency for International Development
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4870a3afe..9add3959d 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -483,6 +483,32 @@
"render": "Artwork"
}
},
+ "assembly_point": {
+ "tagRenderings": {
+ "disaster_type": {
+ "mappings": {
+ "0": {
+ "then": "Earthquake"
+ },
+ "1": {
+ "then": "Flood"
+ },
+ "2": {
+ "then": "Fire"
+ },
+ "3": {
+ "then": "Landslide"
+ }
+ },
+ "question": "For which disaster type is this assembly point meant?"
+ },
+ "operator": {
+ "question": "What organization operates this assembly point?",
+ "render": "This assembly point is operated by {operator}"
+ }
+ },
+ "title": "Emergency assembly points"
+ },
"atm": {
"description": "ATMs to withdraw money",
"filter": {
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 8652c3e0c..d24655427 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -142,6 +142,32 @@
"render": "Opera d’arte"
}
},
+ "assembly_point": {
+ "tagRenderings": {
+ "disaster_type": {
+ "mappings": {
+ "0": {
+ "then": "Terremoto"
+ },
+ "1": {
+ "then": "Alluvione"
+ },
+ "2": {
+ "then": "Incendio"
+ },
+ "3": {
+ "then": "Frana"
+ }
+ },
+ "question": "Per quali tipi di disastro è pensata questa area di attesa?"
+ },
+ "operator": {
+ "question": "Quale organizzazione gestisce questa area di attesa?",
+ "render": "Questa area di attesa è gestita da {operator}"
+ }
+ },
+ "title": "Aree di attesa per emergenze"
+ },
"atm": {
"description": "Sportello Bancomat per prelevare denaro",
"name": "Sportelli Bancomat",
diff --git a/langs/themes/en.json b/langs/themes/en.json
index b47384a05..85d87b62c 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -631,6 +631,10 @@
"description": "The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs.
You 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 more data by answering the questions.
All changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.
For more information about the cyclofix project, go to cyclofix.osm.be.",
"title": "Cyclofix - a map for cyclists"
},
+ "disaster_response": {
+ "description": "This theme contains elements meant for disaster risk reduction and response.",
+ "title": "Disaster response"
+ },
"drinking_water": {
"description": "On this map, publicly accessible drinking water spots are shown and can be easily added",
"title": "Drinking Water"
diff --git a/langs/themes/it.json b/langs/themes/it.json
index c8eace3e2..395c61d05 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -401,6 +401,10 @@
"description": "Questa mappa offre a chi va in bici una soluzione semplice per trovare tutte le infrastrutture di cui ha bisogno.
Puoi tracciare la tua posizione esatta (solo su mobile) e selezionare i livelli che ti interessano nell'angolo in basso a sinistra. Puoi anche usare questo strumento per aggiungere o modificare punti di interesse alla mappa e aggiungere nuove informazioni rispendendo alle domande.
Tutte le modifiche che apporterai saranno automaticamente salvate nel database mondiale di OpenStreetMap e potranno essere liberamente riutilizzate da tutti e tutte.
Per maggiori informazioni sul progetto ciclofix, visita cyclofix.osm.be.",
"title": "Cyclofix - una mappa libera per chi va in bici"
},
+ "disaster_response": {
+ "description": "Questo tema contiene elementi pensati per la riduzione del rischio e per la risposta ai disastri.",
+ "title": "Risposta ai disastri"
+ },
"drinking_water": {
"description": "Questa mappa mostra tutti i luoghi in cui è disponibile acqua potabile ed è possibile aggiungerne di nuovi",
"title": "Acqua potabile"