midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branches

Browse source
This commit is contained in:
pietervdvn 2021-04-12 13:40:33 +02:00
parent a2ba0e9fd0 70f2f0aa74
commit 7872282816
2 changed files with 84 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
assets/themes/hailhydrant/hailhydrant.json
View file

@ -27,6 +27,11 @@
"en": "Map of hydrants" "en": "Map of hydrants"
}, },
"minzoom": 14, "minzoom": 14,
"overpassTags": {
"and": [
"emergency=fire_hydrant"
]
},
"title": { "title": {
"render": { "render": {
"en": "Hydrant" "en": "Hydrant"
@ -36,6 +41,7 @@
"en": "Map layer to show fire hydrants." "en": "Map layer to show fire hydrants."
}, },
"tagRenderings": [ "tagRenderings": [
"images",
{ {
"question": { "question": {
"en": "What color is the hydrant?" "en": "What color is the hydrant?"
@ -176,7 +182,7 @@
"render": "8" "render": "8"
}, },
"iconSize": { "iconSize": {
"render": "15,15,center" "render": "20,20,center"
}, },
"color": { "color": {
"render": "#00f" "render": "#00f"
@ -201,13 +207,6 @@
"emergency=fire_hydrant" "emergency=fire_hydrant"
] ]
} }
},
"source": {
"osmTags": {
"and": [
"emergency=fire_hydrant"
]
}
} }
}, },
{ {
@ -216,6 +215,11 @@
"en": "Map of fire extinguishers." "en": "Map of fire extinguishers."
}, },
"minzoom": 14, "minzoom": 14,
"overpassTags": {
"and": [
"emergency=fire_extinguisher"
]
},
"title": { "title": {
"render": { "render": {
"en": "Extinguishers" "en": "Extinguishers"
@ -225,6 +229,7 @@
"en": "Map layer to show fire hydrants." "en": "Map layer to show fire hydrants."
}, },
"tagRenderings": [ "tagRenderings": [
"images",
{ {
"render": { "render": {
"en": "Location: {location}" "en": "Location: {location}"
@ -292,13 +297,6 @@
"emergency=fire_extinguisher" "emergency=fire_extinguisher"
] ]
} }
},
"source": {
"osmTags": {
"and": [
"emergency=fire_extinguisher"
]
}
} }
}, },
{ {
@ -307,6 +305,11 @@
"en": "Map of fire stations" "en": "Map of fire stations"
}, },
"minzoom": 12, "minzoom": 12,
"overpassTags": {
"and": [
"amenity=fire_station"
]
},
"title": { "title": {
"render": { "render": {
"en": "Fire Station" "en": "Fire Station"
@ -316,26 +319,38 @@
"en": "Map layer to show fire stations." "en": "Map layer to show fire stations."
}, },
"tagRenderings": [ "tagRenderings": [
"images",
{
"freeform": {
"key": "name"
},
"question": {
"en": "What is the name of this station?"
},
"render": {
"en": "This station is called {name}."
}
},
{ {
"freeform": { "freeform": {
"key": "addr:street" "key": "addr:street"
}, },
"question": { "question": {
"en": " What street is the station located?" "en": " What is the street name where the station located?"
}, },
"render": { "render": {
"en": "The station is along a highway called {addr:street}." "en": "This station is along a highway called {addr:street}."
} }
}, },
{ {
"question": { "question": {
"en": "In what place is the station located? (e.g. name of neighborhood, villlage, or town)" "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)"
}, },
"freeform": { "freeform": {
"key": "addr:place" "key": "addr:place"
}, },
"render": { "render": {
"en": "The station is to be found within {addr:place}." "en": "Th isstation is to be found within {addr:place}."
} }
}, },
{ {
@ -343,7 +358,7 @@
"en": "What agency operates this station?" "en": "What agency operates this station?"
}, },
"render": { "render": {
"en": "Operator: {operator}" "en": "This station is operated by {operator}."
}, },
"freeform": { "freeform": {
"key": "operator" "key": "operator"
@ -353,7 +368,7 @@
"if": { "if": {
"and": [ "and": [
"operator=Bureau of Fire Protection", "operator=Bureau of Fire Protection",
"operator:type=public" "operator:type=government"
] ]
}, },
"then": { "then": {
@ -364,10 +379,10 @@
}, },
{ {
"question": { "question": {
"en": "How would you classifiy the operator of this station?" "en": "How is the station operator classified??"
}, },
"render": { "render": {
"en": "Operator type: {operator:type}" "en": "The operator is a(n) {operator:type} entity."
}, },
"freeform": { "freeform": {
"key": "operator:type" "key": "operator:type"
@ -376,21 +391,11 @@
{ {
"if": { "if": {
"and": [ "and": [
"operator:type=public" "operator:type=government"
] ]
}, },
"then": { "then": {
"en": "Public" "en": "The station is operated by the government."
}
},
{
"if": {
"and": [
"operator:type=ngo"
]
},
"then": {
"en": "Volunteer"
} }
}, },
{ {
@ -400,7 +405,17 @@
] ]
}, },
"then": { "then": {
"en": "Community-based, or informal organization" "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."
} }
}, },
{ {
@ -410,7 +425,7 @@
] ]
}, },
"then": { "then": {
"en": "Private" "en": "The station is privately operated."
} }
} }
] ]
@ -424,7 +439,7 @@
"render": "8" "render": "8"
}, },
"iconSize": { "iconSize": {
"render": "20,20,center" "render": "35,35,center"
}, },
"color": { "color": {
"render": "#00f" "render": "#00f"
@ -435,7 +450,7 @@
"amenity=fire_station" "amenity=fire_station"
], ],
"title": { "title": {
"en": "fire station" "en": "Fire station"
}, },
"description": { "description": {
"en": "Add a fire station to the map." "en": "Add a fire station to the map."
@ -448,13 +463,6 @@
"amenity=fire_station" "amenity=fire_station"
] ]
} }
},
"source": {
"osmTags": {
"and": [
"amenity=fire_station"
]
}
} }
}, },
{ {
@ -463,6 +471,11 @@
"en": "Map of rescue stations" "en": "Map of rescue stations"
}, },
"minzoom": 12, "minzoom": 12,
"overpassTags": {
"and": [
"amenity=rescue_station"
]
},
"title": { "title": {
"render": { "render": {
"en": "Rescue Station" "en": "Rescue Station"
@ -471,7 +484,20 @@
"description": { "description": {
"en": "Map layer to show rescue stations." "en": "Map layer to show rescue stations."
}, },
"tagRenderings": [], "tagRenderings": [
"images",
{
"question": {
"en": "What is this entity called?"
},
"freeform": {
"key": "name"
},
"render": {
"en": "This entity is called {name}."
}
}
],
"hideUnderlayingFeaturesMinPercentage": 0, "hideUnderlayingFeaturesMinPercentage": 0,
"icon": { "icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_26d1.svg" "render": "./assets/themes/hailhydrant/Twemoji12_26d1.svg"
@ -480,7 +506,7 @@
"render": "8" "render": "8"
}, },
"iconSize": { "iconSize": {
"render": "20,20,center" "render": "35,35,center"
}, },
"color": { "color": {
"render": "#00f" "render": "#00f"
@ -491,7 +517,7 @@
"amenity=rescue_station" "amenity=rescue_station"
], ],
"title": { "title": {
"en": "rescue station" "en": "Rescue station"
}, },
"description": { "description": {
"en": "Add a rescue or emergency service station to the map" "en": "Add a rescue or emergency service station to the map"
@ -504,15 +530,9 @@
"amenity=rescue_station" "amenity=rescue_station"
] ]
} }
},
"source": {
"osmTags": {
"and": [
"amenity=rescue_station"
]
}
} }
} }
], ],
"defaultBackgroundId": "HDM_HOT" "defaultBackgroundId": "HDM_HOT"
} }

60
assets/themes/hailhydrant/license_info.json
View file

@ -1,14 +1,4 @@
[ [
{
"authors": [
"https://openclipart.org/artist/rones"
],
"path": "extinguisher.svg",
"license": "CC0",
"sources": [
"https://openclipart.org/detail/315876/fire-extinguisher"
]
},
{ {
"authors": [ "authors": [
"http://jaanos.deviantart.com/" "http://jaanos.deviantart.com/"
@ -21,42 +11,16 @@
}, },
{ {
"authors": [ "authors": [
"https://openclipart.org/artist/TVLuke" "https://twemoji.twitter.com/"
], ],
"path": "fire_brigade.svg", "path": "Twemoji12_1f9ef.svg",
"license": "CC0", "license": "CC-BY 4.0",
"sources": [
"https://openclipart.org/detail/318142/fire-brigade"
]
},
{
"authors": [ "authors": [
"https://openclipart.org/artist/qubodup" "Twemoji Project"
], ],
"path": "blue-signal-light.svg",
"license": "CC0",
"sources": [ "sources": [
"https://openclipart.org/detail/177928/blue-signal-light" "https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg",
] "https://twemoji.twitter.com/"
},
{
"authors": [
"https://www.mapbox.com/maki-icons/"
],
"path": "fire-station-15.svg",
"license": "CC0",
"sources": [
"https://openclipart.org/detail/260728/firestation15"
]
},
{
"authors": [
"https://openclipart.org/artist/rdevries"
],
"path": "Fire-truck.svg",
"license": "CC0",
"sources": [
"https://openclipart.org/detail/190874/fire-truck"
] ]
}, },
{ {
@ -102,17 +66,7 @@
"https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg" "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg"
] ]
}, },
{
"path": "Twemoji12_1f9ef.svg",
"license": "CC-BY 4.0",
"authors": [
"Twemoji Project"
],
"sources": [
"https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg",
"https://twemoji.twitter.com/"
]
},
{ {
"path": "Twemoji12_1f692.svg", "path": "Twemoji12_1f692.svg",
"license": "CC-BY 4.0", "license": "CC-BY 4.0",