From acc09db587655ab3ed98334187119f569aad7895 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 13:15:05 +0800 Subject: [PATCH 1/9] Update hailhydrant.json Improve question text. Improve icon sizes. Add some questions for the rescue_station layer. --- assets/themes/hailhydrant/hailhydrant.json | 86 +++++++++++++++------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index efd198b..c6f0c79 100644 --- a/assets/themes/hailhydrant/hailhydrant.json +++ b/assets/themes/hailhydrant/hailhydrant.json @@ -181,7 +181,7 @@ "render": "8" }, "iconSize": { - "render": "15,15,center" + "render": "20,20,center" }, "color": { "render": "#00f" @@ -317,26 +317,37 @@ "en": "Map layer to show fire stations." }, "tagRenderings": [ + { + "freeform": { + "key": "name" + }, + "question": { + "en": "What is the name of this station?" + }, + "render": { + "en": "This station is called {name}." + } + }, { "freeform": { "key": "addr:street" }, "question": { - "en": " What street is the station located?" + "en": " What is the street name where the station located?" }, "render": { - "en": "The station is along a highway called {addr:street}." + "en": "This station is along a highway called {addr:street}." } }, { "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": { "key": "addr:place" }, "render": { - "en": "The station is to be found within {addr:place}." + "en": "Th isstation is to be found within {addr:place}." } }, { @@ -344,7 +355,7 @@ "en": "What agency operates this station?" }, "render": { - "en": "Operator: {operator}" + "en": "This station is operated by {operator}." }, "freeform": { "key": "operator" @@ -354,7 +365,7 @@ "if": { "and": [ "operator=Bureau of Fire Protection", - "operator:type=public" + "operator:type=government" ] }, "then": { @@ -365,10 +376,10 @@ }, { "question": { - "en": "How would you classifiy the operator of this station?" + "en": "How is the station operator classified??" }, "render": { - "en": "Operator type: {operator:type}" + "en": "The operator is a(n) {operator:type} entity." }, "freeform": { "key": "operator:type" @@ -377,21 +388,11 @@ { "if": { "and": [ - "operator:type=public" + "operator:type=government" ] }, "then": { - "en": "Public" - } - }, - { - "if": { - "and": [ - "operator:type=ngo" - ] - }, - "then": { - "en": "Volunteer" + "en": "The station is operated by the government." } }, { @@ -401,7 +402,17 @@ ] }, "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." } }, { @@ -411,7 +422,7 @@ ] }, "then": { - "en": "Private" + "en": "The station is privately operated." } } ] @@ -425,7 +436,7 @@ "render": "8" }, "iconSize": { - "render": "20,20,center" + "render": "35,35,center" }, "color": { "render": "#00f" @@ -470,7 +481,30 @@ "description": { "en": "Map layer to show rescue stations." }, - "tagRenderings": [], + "tagRenderings": [ + { + "freeform": { + "key": "image" + }, + "render": { + "en": "{all_tags()}" + }, + "question": { + "en": "Available images." + } + }, + { + "question": { + "en": "What is this service called?" + }, + "freeform": { + "key": "name" + }, + "render": { + "en": "This service is called {name}." + } + } + ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "https://upload.wikimedia.org/wikipedia/commons/e/eb/Twemoji12_26d1.svg" @@ -479,7 +513,7 @@ "render": "8" }, "iconSize": { - "render": "20,20,center" + "render": "35,35,center" }, "color": { "render": "#00f" From 9cf8aa2c3ae5a003fba20c224b50226eb0a2c21d Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 13:15:54 +0800 Subject: [PATCH 2/9] Delete Fire-truck.svg --- assets/themes/hailhydrant/Fire-truck.svg | 303 ----------------------- 1 file changed, 303 deletions(-) delete mode 100644 assets/themes/hailhydrant/Fire-truck.svg diff --git a/assets/themes/hailhydrant/Fire-truck.svg b/assets/themes/hailhydrant/Fire-truck.svg deleted file mode 100644 index 767960f..0000000 --- a/assets/themes/hailhydrant/Fire-truck.svg +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - - - - - - - - - \ No newline at end of file From f9c2373edf5a38cf8f803d0c0d32cdf4f9910407 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 13:16:28 +0800 Subject: [PATCH 3/9] Delete blue-signal-light.svg delete unused file --- .../themes/hailhydrant/blue-signal-light.svg | 115 ------------------ 1 file changed, 115 deletions(-) delete mode 100644 assets/themes/hailhydrant/blue-signal-light.svg diff --git a/assets/themes/hailhydrant/blue-signal-light.svg b/assets/themes/hailhydrant/blue-signal-light.svg deleted file mode 100644 index bcd6978..0000000 --- a/assets/themes/hailhydrant/blue-signal-light.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Blue signal light - 2013-05-10T09:38:15 - - https://openclipart.org/detail/177928/blue-signal-light-by-qubodup-177928 - - - qubodup - - - - - alarm - blue - emergency - fire brigade - fire truck - first aid - light - police - signal - siren - - - - - - - - - - - \ No newline at end of file From 564a7f3122d7af162d92e584e01e957f91fe10fa Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 13:17:10 +0800 Subject: [PATCH 4/9] Delete fire_brigade.svg Remove unused file. --- assets/themes/hailhydrant/fire_brigade.svg | 1327 -------------------- 1 file changed, 1327 deletions(-) delete mode 100644 assets/themes/hailhydrant/fire_brigade.svg diff --git a/assets/themes/hailhydrant/fire_brigade.svg b/assets/themes/hailhydrant/fire_brigade.svg deleted file mode 100644 index ad6e4fd..0000000 --- a/assets/themes/hailhydrant/fire_brigade.svg +++ /dev/null @@ -1,1327 +0,0 @@ - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Fire Brigade - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 3930e73e2c20106e21ecb805c3ef898f2fc6ecd7 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 13:23:34 +0800 Subject: [PATCH 5/9] wemoji12_26d1.svg Add icon for rescue_station --- assets/themes/hailhydrant/Twemoji12_26d1.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 assets/themes/hailhydrant/Twemoji12_26d1.svg 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 From 0d15d8b904a33e0c0fb345559c16d896fda2260a Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 14:29:07 +0800 Subject: [PATCH 6/9] Twemoji12_1f692.svg add icon for the fire station layer --- assets/themes/hailhydrant/Twemoji12_1f692.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 assets/themes/hailhydrant/Twemoji12_1f692.svg 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 From 6798fda712b557f0bff45cbea8be3f979da8798d Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 14:33:16 +0800 Subject: [PATCH 7/9] Add icon for extinguisher layer --- assets/themes/hailhydrant/Twemoji12_1f9ef.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 assets/themes/hailhydrant/Twemoji12_1f9ef.svg 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 From 8ee292d24f34d33b5404d5a4c71651f0b873369a Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 14:57:22 +0800 Subject: [PATCH 8/9] Add image to all layers --- assets/themes/hailhydrant/hailhydrant.json | 560 ++++++++++++++++++++- 1 file changed, 542 insertions(+), 18 deletions(-) diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index c6f0c79..e63d4b1 100644 --- a/assets/themes/hailhydrant/hailhydrant.json +++ b/assets/themes/hailhydrant/hailhydrant.json @@ -1,547 +1,1071 @@ { + "id": "hailhydrant", + "title": { + "en": "Hydrants, Extinguishers, Fire stations, and Rescue stations." + }, + "shortDescription": { + "en": "Map to show hydrants, extinguishers, fire stations, and rescue 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." + }, + "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, + "overpassTags": { + "and": [ + "emergency=fire_hydrant" + ] + }, + "title": { + "render": { + "en": "Hydrant" + } + }, + "description": { + "en": "Map layer to show fire hydrants." + }, + "tagRenderings": [ +"images", { + "question": { + "en": "What color is the hydrant?" + }, + "render": { + "en": "The hydrant color is {colour}" + }, + "freeform": { + "key": "colour" + }, + "mappings": [ + { + "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=pillar" + ] + }, + "then": { + "en": " Pillar type." + } + }, + { + "if": { + "and": [ + "fire_hydrant:type=pipe" + ] + }, + "then": { + "en": " Pipe type." + } + }, + { + "if": { + "and": [ + "fire_hydrant:type=wall" + ] + }, + "then": { + "en": " Wall type." + } + }, + { + "if": { + "and": [ + "fire_hydrant:type=underground" + ] + }, + "then": { + "en": " 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." + } + } + ] + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { + "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/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": "Add a new fire hydrant to the map." + } + } + ], + "wayHandling": 1, + "osmSource": { + "overpassTags": { + "and": [ + "emergency=fire_hydrant" + ] + } + } + }, + { + "id": "extinguisher", + "name": { + "en": "Map of fire extinguishers." + }, + "minzoom": 14, + "overpassTags": { + "and": [ + "emergency=fire_extinguisher" + ] + }, + "title": { + "render": { + "en": "Extinguishers" + } + }, + "description": { + "en": "Map layer to show fire hydrants." + }, + "tagRenderings": [ +"images", { + "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" + } + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg" + + "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/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": "Add a fire extinguisher to the map" + } + } + ], + "wayHandling": 1, + "osmSource": { + "overpassTags": { + "and": [ + "emergency=fire_extinguisher" + ] + } + } + }, + { + "id": "stations", + "name": { + "en": "Map of fire stations" + }, + "minzoom": 12, + "overpassTags": { + "and": [ + "amenity=fire_station" + ] + }, + "title": { + "render": { + "en": "Fire Station" + } + }, + "description": { + "en": "Map layer to show fire stations." + }, + "tagRenderings": [ +"images", { + "freeform": { + "key": "name" + }, + "question": { + "en": "What is the name of this 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": "Th isstation is to be 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." + } + } + ] + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/1/19/Twemoji12_1f692.svg" + + "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/Twemoji12_1f692.svg" + }, + "width": { + "render": "8" + }, + "iconSize": { + "render": "35,35,center" + }, + "color": { + "render": "#00f" + }, + "presets": [ + { + "tags": [ + "amenity=fire_station" + ], + "title": { - "en": "fire station" + + "en": "Fire station" + }, + "description": { + "en": "Add a fire station to the map." + } + } + ], + "osmSource": { + "overpassTags": { + "and": [ + "amenity=fire_station" + ] + } + } + }, + { + "id": "rescuestation", + "name": { + "en": "Map of rescue stations" + }, + "minzoom": 12, + "overpassTags": { + "and": [ + "amenity=rescue_station" + ] + }, + "title": { + "render": { + "en": "Rescue Station" + } + }, + "description": { + "en": "Map layer to show rescue stations." + }, + "tagRenderings": [ +"images", { - "freeform": { - "key": "image" - }, - "render": { - "en": "{all_tags()}" - }, + "question": { - "en": "Available images." - } - }, - { - "question": { - "en": "What is this service called?" + + "en": "What is this entity called?" + }, + "freeform": { + "key": "name" + }, + "render": { - "en": "This service is called {name}." + + "en": "This entity is called {name}." + } + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/e/eb/Twemoji12_26d1.svg" + + "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/Twemoji12_26d1.svg" + }, + "width": { + "render": "8" + }, + "iconSize": { + "render": "35,35,center" + }, + "color": { + "render": "#00f" + }, + "presets": [ + { + "tags": [ + "amenity=rescue_station" + ], + "title": { - "en": "rescue station" + + "en": "Rescue station" + }, + "description": { + "en": "Add a rescue or emergency service station to the map" + } + } + ], + "osmSource": { + "overpassTags": { + "and": [ + "amenity=rescue_station" + ] + } + } + } + ], + "roamingRenderings": [ + {} + ], + "defaultBackgroundId": "HDM_HOT" + } From 70f2f0aa74d6bb610925e6986dd5c789b55ff898 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Mon, 12 Apr 2021 15:05:43 +0800 Subject: [PATCH 9/9] Update license_info.json entries --- assets/themes/hailhydrant/license_info.json | 46 +++++++-------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json index eec8d11..097c742 100644 --- a/assets/themes/hailhydrant/license_info.json +++ b/assets/themes/hailhydrant/license_info.json @@ -1,13 +1,5 @@ [ { - "authors": ["https://openclipart.org/artist/rones"], - "path": "extinguisher.svg", - "license": "CC0", - "sources": [ - "https://openclipart.org/detail/315876/fire-extinguisher" - ] - }, - { "authors": ["http://jaanos.deviantart.com/"], "path": "hydrant.svg", "license": "GPL", @@ -15,36 +7,28 @@ "https://commons.wikimedia.org/wiki/File:Hydrant.svg" ] }, - { - "authors": ["https://openclipart.org/artist/TVLuke"], - "path": "fire_brigade.svg", - "license": "CC0", + { + "authors": ["https://twemoji.twitter.com/"], + "path": "Twemoji12_1f9ef.svg", + "license": "CC-BY", "sources": [ - "https://openclipart.org/detail/318142/fire-brigade" + "https://commons.wikimedia.org/wiki/File:Twemoji12_1f9ef.svg" ] }, - { - "authors": ["https://openclipart.org/artist/qubodup"], - "path": "blue-signal-light.svg", - "license": "CC0", + { + "authors": ["https://twemoji.twitter.com/"], + "path": "Twemoji12_1f692.svg", + "license": "CC-BY", "sources": [ - "https://openclipart.org/detail/177928/blue-signal-light" + "https://commons.wikimedia.org/wiki/File:Twemoji12_1f692.svg" ] }, - { - "authors": ["https://www.mapbox.com/maki-icons/"], - "path": "fire-station-15.svg", - "license": "CC0", + { + "authors": ["https://twemoji.twitter.com/"], + "path": "Twemoji12_26d1.svg", + "license": "CC-BY", "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" + "https://commons.wikimedia.org/wiki/File:Twemoji12_26d1.svg" ] } ]