diff --git a/assets/layers/assembly_point/assembly_point.json b/assets/layers/assembly_point/assembly_point.json
index 86bee7960a..da4dad2540 100644
--- a/assets/layers/assembly_point/assembly_point.json
+++ b/assets/layers/assembly_point/assembly_point.json
@@ -1,11 +1,19 @@
{
- "id": "assembly_point",
+ "allowMove": {
+ "enableRelocation": false,
+ "enableImproveAccuracy": true
+ },
"title": {
"en": "Emergency assembly points",
- "it": "Aree di attesa per emergenze"
+ "it": "Punti di raccolta per emergenze"
+ },
+ "description": {
+ "en": "This layer contains assembly points and waiting areas where all employees, passengers or a large crowd assemble in case of an emergency.",
+ "it": "Questo livello contiene punti di raccolta e aree di attesa in cui tutti i dipendenti, i passeggeri o una grande folla si riuniscono in caso di emergenza."
},
- "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",
+ "id": "assembly_point",
+ "minzoom": 10,
"source": {
"osmTags": {
"and": [
@@ -13,7 +21,6 @@
]
}
},
- "minzoom": 10,
"pointRendering": [
{
"iconSize": "20,20",
@@ -24,26 +31,47 @@
"anchor": "bottom",
"marker": [
{
- "icon": "pin",
- "color": "#6BC4F7"
- },
- {
- "icon": "./assets/themes/disaster_response/assembly_point.svg"
+ "icon": "./assets/layers/assembly_point/assembly_point.svg"
}
]
}
],
+ "presets": [
+ {
+ "title": {
+ "en": "an assembly point",
+ "it": "un punto di raccolta"
+ },
+ "tags": [
+ "emergency=assembly_point"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
- "id": "operator",
+ "id": "assembly_point_name",
+ "freeform": {
+ "key": "name"
+ },
+ "question": {
+ "en": "What is the name of this assembly point?",
+ "it": "Qual è il nome di questo punto di raccolta?"
+ },
"render": {
- "en": "This assembly point is operated by {operator}",
- "it": "Questa area di attesa è gestita da {operator}"
+ "en": "This assembly point is named {name}",
+ "it": "Questo punto di raccolta si chiama {name}"
+ }
+ },
+ {
+ "id": "assembly_point_operator",
+ "render": {
+ "en": "This assembly point is operated by {operator}",
+ "it": "Questo punto di raccolta è gestita da {operator}"
},
"question": {
"en": "What organization operates this assembly point?",
- "it": "Quale organizzazione gestisce questa area di attesa?"
+ "it": "Quale organizzazione gestisce questo punto di raccolta?"
},
"freeform": {
"key": "operator",
@@ -54,7 +82,7 @@
"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?"
+ "it": "Per quali tipi di disastro è pensato questo punto di raccolta?"
},
"multiAnswer": true,
"mappings": [
@@ -66,7 +94,7 @@
"it": "Terremoto"
},
"icon": {
- "path": "./assets/themes/disaster_response/earthquake.svg",
+ "path": "./assets/layers/assembly_point/earthquake.svg",
"class": "medium"
}
},
@@ -78,7 +106,7 @@
"it": "Alluvione"
},
"icon": {
- "path": "./assets/themes/disaster_response/flood.svg",
+ "path": "./assets/layers/assembly_point/flood.svg",
"class": "medium"
}
},
@@ -90,7 +118,7 @@
"it": "Incendio"
},
"icon": {
- "path": "./assets/themes/disaster_response/fire.svg",
+ "path": "./assets/layers/assembly_point/fire.svg",
"class": "medium"
}
},
@@ -102,7 +130,7 @@
"it": "Frana"
},
"icon": {
- "path": "./assets/themes/disaster_response/landslide.svg",
+ "path": "./assets/layers/assembly_point/landslide.svg",
"class": "medium"
}
}
diff --git a/assets/themes/disaster_response/disaster_response.json b/assets/themes/disaster_response/disaster_response.json
index 280bcbf4f0..d330e1eff1 100644
--- a/assets/themes/disaster_response/disaster_response.json
+++ b/assets/themes/disaster_response/disaster_response.json
@@ -1,7 +1,7 @@
{
"description": {
- "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."
+ "en": "This map contains elements meant for disaster preparedness and response.",
+ "it": "Questa mappa contiene elementi pensati per la preparazione e risposta ai disastri."
},
"docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities",
"icon": "./assets/themes/disaster_response/CivilDefence.svg",
@@ -17,7 +17,10 @@
{
"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",
+ "description": {
+ "en": "This layer contains organizations that have the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area.",
+ "it": "Questo livello contiene organizzazioni che hanno come obiettivo principale quello di aiutare la popolazione civile durante e dopo disastri naturali o antropogenici, lavorando nell'area colpita."
+ },
"docs": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Ddisaster_response",
"source": {
"osmTags": {
@@ -42,10 +45,6 @@
],
"anchor": "bottom",
"marker": [
- {
- "icon": "pin",
- "color": "#6BC4F7"
- },
{
"icon": "./assets/themes/disaster_response/CivilDefence.svg"
}
@@ -54,13 +53,30 @@
],
"tagRenderings": [
"images",
- "website"
+ "website",
+ {
+ "id": "disaster_response_name",
+ "freeform": {
+ "key": "name"
+ },
+ "question": {
+ "en": "What is the name of this organization?",
+ "it": "Qual è il nome di questa organizzazione?"
+ },
+ "render": {
+ "en": "This organization is named {name}",
+ "it": "Questa organizzazione si chiama {name}"
+ }
+ }
]
},
{
"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.",
+ "description": {
+ "en": "This layer contains stations of State Emergency Service (an Australian volunteer organization) mapped using a DEPRECATED tagging scheme.",
+ "it": "Questo livello contiene stazioni del State Emergency Service (un'organizzazione australiana di volontari) mappate utilizzando uno schema di tagging DEPRECATO."
+ },
"docs": "https://wiki.openstreetmap.org/wiki/Tag%3Aemergency%3Dses_station",
"source": {
"osmTags": {
@@ -79,10 +95,6 @@
],
"anchor": "bottom",
"marker": [
- {
- "icon": "pin",
- "color": "#6BC4F7"
- },
{
"icon": "./assets/themes/disaster_response/CivilDefence.svg"
}
@@ -91,7 +103,21 @@
],
"tagRenderings": [
"images",
- "website"
+ "website",
+ {
+ "id": "ses_station_name",
+ "freeform": {
+ "key": "name"
+ },
+ "question": {
+ "en": "What is the name of this organization?",
+ "it": "Qual è il nome di questa organizzazione?"
+ },
+ "render": {
+ "en": "This organization is named {name}",
+ "it": "Questa organizzazione si chiama {name}"
+ }
+ }
]
}
]
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 4e22c7ae7b..b5286c2f9b 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -216,6 +216,10 @@
"if": "theme=cyclofix",
"then": "./assets/themes/cyclofix/logo.svg"
},
+ {
+ "if": "theme=disaster_response",
+ "then": "./assets/themes/disaster_response/CivilDefence.svg"
+ },
{
"if": "theme=drinking_water",
"then": "./assets/themes/drinking_water/logo.svg"