Merge master

This commit is contained in:
Pieter Vander Vennet 2021-04-22 03:54:14 +02:00
commit 0153d4d262
33 changed files with 1440 additions and 755 deletions

View file

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 47.5 47.5" style="enable-background:new 0 0 47.5 47.5;" id="svg2" xml:space="preserve"><defs id="defs6"><clipPath id="clipPath18"><path d="M 0,38 38,38 38,0 0,0 0,38 z" id="path20"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,47.5)" id="g12"><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(36,27)" id="g22"><path d="M 0,0 C 0,1 -1,4 -4,4 L -17.494,4 -20,4 -25.599,4 c -1.377,0 -3.289,-1.791 -4.302,-4 L -33,-5 c -1.453,-0.599 -2,-2.331 -2,-4 l 0,-6 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 l 0,8 C 1,-5.973 0,0 0,0" id="path24" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(10.0005,14)" id="g26"><path d="M 0,0 C -3.267,0 -5.918,-2.612 -5.993,-5.861 -5.674,-5.942 -5.345,-6 -5,-6 L 6,-6 C 6,-2.687 3.313,0 0,0" id="path28" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(33.9932,8.1396)" id="g30"><path d="m 0,0 c -0.075,3.248 -2.726,5.86 -5.993,5.86 -3.313,0 -6,-2.686 -6,-6 l 11,0 c 0.345,0 0.674,0.058 0.993,0.14" id="path32" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(14,8)" id="g34"><path d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4" id="path36" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(12,8)" id="g38"><path d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 1.104,0 2,-0.896 2,-2" id="path40" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(32,8)" id="g42"><path d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4" id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(30,8)" id="g46"><path d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 1.104,0 2,-0.896 2,-2" id="path48" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><path d="m 37,15 -36,0 0,3 36,0 0,-3 z" id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none"/><g transform="translate(32,26)" id="g52"><path d="m 0,0 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 2,0 0,3 3,0 0,2 z" id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(9,29)" id="g56"><path d="m 0,0 5,0 0,-7 -9,0 4,7 z" id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(16,32.5)" id="g60"><path d="m 0,0 c 0,-0.829 -0.671,-1.5 -1.5,-1.5 l -2,0 c -0.829,0 -1.5,0.671 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 2,0 C -0.671,1.5 0,0.829 0,0" id="path62" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(19,32.5)" id="g64"><path d="m 0,0 c 0,-0.829 -0.671,-1.5 -1.5,-1.5 l -2,0 c -0.829,0 -1.5,0.671 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 2,0 C -0.671,1.5 0,0.829 0,0" id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></g></g></svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

@ -1,13 +1,13 @@
{
"id": "hailhydrant",
"title": {
"en": "Hydrants, Extinguishers, Fire stations, and Rescue stations."
"en": "Hydrants, Extinguishers, Fire stations, and Ambulance stations."
},
"shortDescription": {
"en": "Map to show hydrants, extinguishers, fire stations, and rescue stations."
"en": "Map to show hydrants, extinguishers, fire stations, and ambulance stations."
},
"description": {
"en": "On this map you can find and update hydrants, fire stations, rescue 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."
"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"
@ -43,7 +43,6 @@
"en": "Map layer to show fire hydrants."
},
"tagRenderings": [
"images",
{
"question": {
"en": "What color is the hydrant?"
@ -55,6 +54,17 @@
"key": "colour"
},
"mappings": [
{
"if": {
"and": [
"colour="
]
},
"then": {
"en": "The hydrant color is unknown."
},
"hideInAnswer": true
},
{
"if": {
"and": [
@ -88,6 +98,17 @@
"en": " Hydrant type: {fire_hydrant:type}"
},
"mappings": [
{
"if": {
"and": [
"fire_hydrant:type="
]
},
"then": {
"en": "The hydrant type is unknown."
},
"hideInAnswer": true
},
{
"if": {
"and": [
@ -174,7 +195,8 @@
}
}
]
}
},
"images"
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
@ -226,7 +248,6 @@
"en": "Map layer to show fire hydrants."
},
"tagRenderings": [
"images",
{
"render": {
"en": "Location: {location}"
@ -259,7 +280,8 @@
"freeform": {
"key": "location"
}
}
},
"images"
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
@ -312,13 +334,12 @@
"en": "Map layer to show fire stations."
},
"tagRenderings": [
"images",
{
"freeform": {
"key": "name"
},
"question": {
"en": "What is the name of this station?"
"en": "What is the name of this fire station?"
},
"render": {
"en": "This station is called {name}."
@ -343,7 +364,7 @@
"key": "addr:place"
},
"render": {
"en": "Th isstation is to be found within {addr:place}."
"en": "This station is found within {addr:place}."
}
},
{
@ -422,7 +443,8 @@
}
}
]
}
},
"images"
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
@ -452,43 +474,130 @@
]
},
{
"id": "rescuestation",
"id": "ambulancestation",
"name": {
"en": "Map of rescue stations"
"en": "Map of ambulance stations"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"amenity=rescue_station"
"emergency=ambulance_station"
]
}
},
"title": {
"render": {
"en": "Rescue Station"
"en": "Ambulance Station"
}
},
"description": {
"en": "Map layer to show rescue stations."
"en": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies."
},
"tagRenderings": [
"images",
{
"question": {
"en": "What is this entity called?"
},
"freeform": {
"key": "name"
},
"question": {
"en": "What is the name of this ambulance station?"
},
"render": {
"en": "This entity is called {name}."
"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/Twemoji12_26d1.svg"
"render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
},
"width": {
"render": "1"
@ -499,16 +608,16 @@
"color": {
"render": "#00f"
},
"presets-disabled": [
"presets": [
{
"tags": [
"amenity=rescue_station"
"emergency=ambulance_station"
],
"title": {
"en": "Rescue station"
"en": "Ambulance station"
},
"description": {
"en": "Add a rescue or emergency service station to the map"
"en": "Add an ambulance station to the map"
}
}
],
@ -517,4 +626,3 @@
],
"defaultBackgroundId": "HDM_HOT"
}

View file

@ -85,6 +85,17 @@
"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"

View file

@ -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.