From 369c2e6ee882476003807f9bef97f0b413ce0656 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 17 Apr 2025 22:51:37 +0200 Subject: [PATCH 1/3] Themes(mobility_hub): Add condition to marker question --- assets/layers/mobility_hub/mobility_hub.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json index d3d0cc710..085173bd8 100644 --- a/assets/layers/mobility_hub/mobility_hub.json +++ b/assets/layers/mobility_hub/mobility_hub.json @@ -179,7 +179,8 @@ "nl": "Deze mobiliteitshub is gemarkeerd door een eenvoudig bord met alleen simpele informatie zoals het logo of de naam" } } - ] + ], + "condition": "_geometry:type=Point" } ], "lineRendering": [ -- 2.39.5 From f072b82fc3937fac6ec90b3a69f0f551b4ef6313 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 19 Apr 2025 17:33:10 +0200 Subject: [PATCH 2/3] Themes(mobility_hub): noname and network options --- assets/layers/mobility_hub/mobility_hub.json | 36 +++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json index 085173bd8..d55ae9937 100644 --- a/assets/layers/mobility_hub/mobility_hub.json +++ b/assets/layers/mobility_hub/mobility_hub.json @@ -73,8 +73,20 @@ "placeholder": { "en": "Name of the mobility hub", "nl": "Naam van de mobiliteitshub" + }, + "addExtraTags": [ + "noname=" + ] + }, + "mappings": [ + { + "if": "noname=yes", + "then": { + "en": "This mobility hub does not have a name", + "nl": "Deze mobiliteitshub heeft geen naam" + } } - } + ] }, { "question": { @@ -90,7 +102,8 @@ "nl": "Netwerk van deze mobiliteitshub" }, "addExtraTags": [ - "network:wikidata=" + "network:wikidata=", + "nonetwork=" ] }, "render": { @@ -98,6 +111,16 @@ "nl": "Deze mobiliteitshub hoort bij het netwerk {network}" }, "mappings": [ + { + "if": "nonetwork=yes", + "then": { + "en": "This mobility hub does not belong to a network", + "nl": "Deze mobiliteitshub hoort niet bij een netwerk" + }, + "addExtraTags": [ + "network:wikidata=" + ] + }, { "if": "network=Groningen-Drenthe", "then": { @@ -107,7 +130,8 @@ "hideInAnswer": "_country!=nl", "icon": "./assets/layers/mobility_hub/hub-gd.svg", "addExtraTags": [ - "network:wikidata=Q108742233" + "network:wikidata=Q108742233", + "nonetwork=" ] }, { @@ -119,7 +143,8 @@ "hideInAnswer": "_country!=be", "icon": "./assets/layers/mobility_hub/logo-hoppin.svg", "addExtraTags": [ - "network:wikidata=Q124310711" + "network:wikidata=Q124310711", + "nonetwork=" ] }, { @@ -130,7 +155,8 @@ }, "hideInAnswer": "_country!=de", "addExtraTags": [ - "network:wikidata=Q110948933" + "network:wikidata=Q110948933", + "nonetwork=" ] } ] -- 2.39.5 From 45e20dadee71e5c23a1bfadfd8f69f986c84e898 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 19 Apr 2025 20:55:48 +0200 Subject: [PATCH 3/3] Themes(waste): Include excrement bag dispensers (#2020) --- .../excrement_bag_dispenser.json | 88 +++++++++++++++++++ .../excrement_bags.svg | 3 + .../excrement_bags.svg.license | 2 + .../excrement_bag_dispenser/license_info.json | 12 +++ assets/themes/waste/waste.json | 3 +- assets/themes/waste_basket/waste_basket.json | 3 +- 6 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json create mode 100644 assets/layers/excrement_bag_dispenser/excrement_bags.svg create mode 100644 assets/layers/excrement_bag_dispenser/excrement_bags.svg.license create mode 100644 assets/layers/excrement_bag_dispenser/license_info.json diff --git a/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json b/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json new file mode 100644 index 000000000..75ceaf117 --- /dev/null +++ b/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json @@ -0,0 +1,88 @@ +{ + "id": "excrement_bag_dispenser", + "name": { + "en": "Excrement bag dispensers" + }, + "description": { + "en": "Dispensers giving out bags for animal waste" + }, + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending=excrement_bags" + ] + } + }, + "minzoom": 16, + "title": { + "render": { + "en": "Excrement bag dispenser" + } + }, + "tagRenderings": [ + { + "id": "fee", + "question": { + "en": "Does it cost money to use this dispenser?" + }, + "mappings": [ + { + "if": "fee=", + "then": { + "en": "This dispenser probably gives out bags for free." + } + }, + { + "if": "fee=yes", + "then": { + "en": "This dispenser give out bags for a fee." + } + }, + { + "if": "fee=no", + "then": { + "en": "This dispenser gives out bags for free." + } + } + ] + }, + "check_date" + ], + "presets": [ + { + "tags": [ + "amenity=vending_machine", + "vending=excrement_bags" + ], + "title": { + "en": "an excrement bag dispenser" + }, + "description": { + "en": "A stand-alone dispenser giving out bags for animal waste." + } + } + ], + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "square", + "color": "white" + }, + { + "icon": "./assets/layers/excrement_bag_dispenser/excrement_bags.svg" + } + ], + "iconSize": "30,30" + } + ], + "allowMove": { + "enableImproveAccuracy": true, + "enableRelocation": true + } +} \ No newline at end of file diff --git a/assets/layers/excrement_bag_dispenser/excrement_bags.svg b/assets/layers/excrement_bag_dispenser/excrement_bags.svg new file mode 100644 index 000000000..755f008ac --- /dev/null +++ b/assets/layers/excrement_bag_dispenser/excrement_bags.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/layers/excrement_bag_dispenser/excrement_bags.svg.license b/assets/layers/excrement_bag_dispenser/excrement_bags.svg.license new file mode 100644 index 000000000..a342db9b9 --- /dev/null +++ b/assets/layers/excrement_bag_dispenser/excrement_bags.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jérémy Ragusa +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/excrement_bag_dispenser/license_info.json b/assets/layers/excrement_bag_dispenser/license_info.json new file mode 100644 index 000000000..b15d15270 --- /dev/null +++ b/assets/layers/excrement_bag_dispenser/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "excrement_bags.svg", + "license": "CC0-1.0", + "authors": [ + "Jérémy Ragusa" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/excrement_bags.svg" + ] + } +] \ No newline at end of file diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json index 5289104ba..f8cad0f8e 100644 --- a/assets/themes/waste/waste.json +++ b/assets/themes/waste/waste.json @@ -46,6 +46,7 @@ } }, "recycling", - "waste_disposal" + "waste_disposal", + "excrement_bag_dispenser" ] } \ No newline at end of file diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json index dd19d1026..39b466d21 100644 --- a/assets/themes/waste_basket/waste_basket.json +++ b/assets/themes/waste_basket/waste_basket.json @@ -60,7 +60,8 @@ "override": { "minzoom": 12 } - } + }, + "excrement_bag_dispenser" ], "widenFactor": 2 } \ No newline at end of file -- 2.39.5