From f830870ca3925eca45c419bc7bad5df3465832b6 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 24 Sep 2024 23:21:02 +0200 Subject: [PATCH 1/2] Add ice cream to vending_machine layer --- .../vending_machine/vending_machine.json | 30 ++++++++- langs/layers/ca.json | 64 +++++++++---------- langs/layers/cs.json | 64 +++++++++---------- langs/layers/de.json | 64 +++++++++---------- langs/layers/en.json | 62 ++++++++++-------- langs/layers/es.json | 10 +-- langs/layers/fr.json | 20 +++--- langs/layers/nl.json | 58 +++++++++-------- langs/layers/pt.json | 10 +-- langs/layers/pt_BR.json | 10 +-- 10 files changed, 216 insertions(+), 176 deletions(-) diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json index d148f7c3a..a3f2c0b45 100644 --- a/assets/layers/vending_machine/vending_machine.json +++ b/assets/layers/vending_machine/vending_machine.json @@ -143,6 +143,10 @@ { "if": "vending=condoms", "then": "./assets/layers/vending_machine/condom.svg" + }, + { + "if": "vending=ice_cream", + "then": "./assets/layers/ice_cream/ice_cream.svg" } ] } @@ -336,6 +340,15 @@ ] }, "then": "circle:white;./assets/themes/stations/public_transport_tickets.svg" + }, + { + "if": { + "and": [ + "_vending_count>1", + "vending~.*ice_cream.*" + ] + }, + "then": "circle:white;./assets/layers/ice_cream/ice_cream.svg" } ] } @@ -530,6 +543,14 @@ }, "icon": "./assets/layers/vending_machine/egg.svg" }, + { + "if": "vending=ice_cream", + "then": { + "en": "Ice cream is sold", + "nl": "IJs wordt verkocht" + }, + "icon": "./assets/layers/ice_cream/ice_cream.svg" + }, { "if": "vending=cheese", "then": { @@ -1186,6 +1207,13 @@ }, "osmTags": "vending~i~.*eggs.*" }, + { + "question": { + "en": "Sale of ice cream", + "nl": "Verkoop van ijs" + }, + "osmTags": "vending~i~.*ice_cream.*" + }, { "question": { "en": "Sale of cheese", @@ -1353,4 +1381,4 @@ "enableImproveAccuracy": true, "enableRelocation": true } -} +} \ No newline at end of file diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 8f4d154ce..1212ae08a 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -9098,52 +9098,52 @@ "12": { "question": "Venda d'ous" }, - "13": { + "14": { "question": "Venda de formatge" }, - "14": { + "15": { "question": "Venda de mel" }, - "15": { + "16": { "question": "Venda de patates" }, - "16": { + "17": { "question": "Venda de productes carnis" }, - "17": { + "18": { "question": "Venda de fruites" }, - "18": { - "question": "Venda de maduixes" - }, "19": { - "question": "Venda de flors" + "question": "Venda de maduixes" }, "2": { "question": "Venda de llaminadures" }, "20": { - "question": "Venda de tiquets d'aparcament" + "question": "Venda de flors" }, "21": { - "question": "Venda de monedes premsades" + "question": "Venda de tiquets d'aparcament" }, "22": { - "question": "Venda de bitllets de transport públic" + "question": "Venda de monedes premsades" }, "23": { - "question": "Venda de llums de bicicletes" + "question": "Venda de bitllets de transport públic" }, "24": { - "question": "Venda de guants" + "question": "Venda de llums de bicicletes" }, "25": { - "question": "Venda de kits de reparació de bicicletes" + "question": "Venda de guants" }, "26": { - "question": "Venda de bombes de bicicletes" + "question": "Venda de kits de reparació de bicicletes" }, "27": { + "question": "Venda de bombes de bicicletes" + }, + "28": { "question": "Venda de cadenat per a bicicletes" }, "3": { @@ -9265,52 +9265,52 @@ "11": { "then": "Es venen ous" }, - "12": { + "13": { "then": "Es ven formatge" }, - "13": { + "14": { "then": "Es ven mel" }, - "14": { + "15": { "then": "Es venen papes" }, - "15": { + "16": { "then": "Es venen productes carnis" }, - "16": { + "17": { "then": "Es ven fruita" }, - "17": { + "18": { "then": "Es venen maduixes" }, - "18": { - "then": "Es venen flors" - }, "19": { - "then": "Es venen tiquets d'aparcament" + "then": "Es venen flors" }, "2": { "then": "Es ven menjar" }, "20": { - "then": "Es venen cèntims premsats" + "then": "Es venen tiquets d'aparcament" }, "21": { - "then": "Es venen bitllets de transport públic" + "then": "Es venen cèntims premsats" }, "22": { - "then": "Es venen llums per a bicicletes" + "then": "Es venen bitllets de transport públic" }, "23": { - "then": "Es venen guants" + "then": "Es venen llums per a bicicletes" }, "24": { - "then": "Es venen kits de reparació de bicicletes" + "then": "Es venen guants" }, "25": { - "then": "Es venen bombes de bicicletes" + "then": "Es venen kits de reparació de bicicletes" }, "26": { + "then": "Es venen bombes de bicicletes" + }, + "27": { "then": "Es venen cadenats per a bicicletes" }, "3": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 7d2ed45e8..f5f685abb 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -9116,52 +9116,52 @@ "12": { "question": "Prodej vajec" }, - "13": { + "14": { "question": "Prodej sýrů" }, - "14": { + "15": { "question": "Prodej medu" }, - "15": { + "16": { "question": "Prodej brambor" }, - "16": { + "17": { "question": "Prodej masa" }, - "17": { + "18": { "question": "Prodej ovoce" }, - "18": { - "question": "Prodej jahod" - }, "19": { - "question": "Prodej květin" + "question": "Prodej jahod" }, "2": { "question": "Prodej sladkostí" }, "20": { - "question": "Prodej parkovacích lístků" + "question": "Prodej květin" }, "21": { - "question": "Prodej pamětních mincí/lisované mince" + "question": "Prodej parkovacích lístků" }, "22": { - "question": "Prodej jízdenek MHD" + "question": "Prodej pamětních mincí/lisované mince" }, "23": { - "question": "Prodej světel na kolo" + "question": "Prodej jízdenek MHD" }, "24": { - "question": "Prodej rukavic" + "question": "Prodej světel na kolo" }, "25": { - "question": "Prodej sad na opravu jízdních kol" + "question": "Prodej rukavic" }, "26": { - "question": "Prodej pump na kolo" + "question": "Prodej sad na opravu jízdních kol" }, "27": { + "question": "Prodej pump na kolo" + }, + "28": { "question": "Prodej zámků na kola" }, "3": { @@ -9280,52 +9280,52 @@ "11": { "then": "Prodává vejce" }, - "12": { + "13": { "then": "Prodává sýr" }, - "13": { + "14": { "then": "Prodává med" }, - "14": { + "15": { "then": "Prodává brambory" }, - "15": { + "16": { "then": "Prodává maso" }, - "16": { + "17": { "then": "Prodává ovoce" }, - "17": { + "18": { "then": "Prodává jahody" }, - "18": { - "then": "Prodává květiny" - }, "19": { - "then": "Prodává parkovací lístky" + "then": "Prodává květiny" }, "2": { "then": "Prodává jídlo" }, "20": { - "then": "Prodává pamětní mince/lisované" + "then": "Prodává parkovací lístky" }, "21": { - "then": "Prodává lístky na MHD" + "then": "Prodává pamětní mince/lisované" }, "22": { - "then": "Prodává světla na kolo" + "then": "Prodává lístky na MHD" }, "23": { - "then": "Prodává rukavice" + "then": "Prodává světla na kolo" }, "24": { - "then": "Prodává sady na opravu jízdních kol" + "then": "Prodává rukavice" }, "25": { - "then": "Prodává pumpy na kolo" + "then": "Prodává sady na opravu jízdních kol" }, "26": { + "then": "Prodává pumpy na kolo" + }, + "27": { "then": "Prodává zámky na kolo" }, "3": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 126ed3707..f20f17272 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -11814,52 +11814,52 @@ "12": { "question": "Verkauf von Eiern" }, - "13": { + "14": { "question": "Verkauf von Käse" }, - "14": { + "15": { "question": "Verkauf von Honig" }, - "15": { + "16": { "question": "Verkauf von Kartoffeln" }, - "16": { + "17": { "question": "Verkauf von Fleisch" }, - "17": { + "18": { "question": "Verkauf von Obst" }, - "18": { - "question": "Verkauf von Erdbeeren" - }, "19": { - "question": "Verkauf von Blumen" + "question": "Verkauf von Erdbeeren" }, "2": { "question": "Verkauf von Süßigkeiten" }, "20": { - "question": "Verkauf von Parkscheinen" + "question": "Verkauf von Blumen" }, "21": { - "question": "Verkauf von Souvenirmünzen" + "question": "Verkauf von Parkscheinen" }, "22": { - "question": "Verkauf von Fahrscheinen" + "question": "Verkauf von Souvenirmünzen" }, "23": { - "question": "Verkauf von Fahrradlampen" + "question": "Verkauf von Fahrscheinen" }, "24": { - "question": "Verkauf von Fahrradhandschuhen" + "question": "Verkauf von Fahrradlampen" }, "25": { - "question": "Verkauf von Fahrrad-Reparatursets" + "question": "Verkauf von Fahrradhandschuhen" }, "26": { - "question": "Verkauf von Fahrradpumpen" + "question": "Verkauf von Fahrrad-Reparatursets" }, "27": { + "question": "Verkauf von Fahrradpumpen" + }, + "28": { "question": "Verkauf von Fahrradschlössern" }, "3": { @@ -11984,52 +11984,52 @@ "11": { "then": "Eier werden verkauft" }, - "12": { + "13": { "then": "Käse wird verkauft" }, - "13": { + "14": { "then": "Honig wird verkauft" }, - "14": { + "15": { "then": "Kartoffeln werden verkauft" }, - "15": { + "16": { "then": "Fleisch wird verkauft" }, - "16": { + "17": { "then": "Obst wird verkauft" }, - "17": { + "18": { "then": "Erdbeeren werden verkauft" }, - "18": { - "then": "Blumen werden verkauft" - }, "19": { - "then": "Parkscheine werden verkauft" + "then": "Blumen werden verkauft" }, "2": { "then": "Lebensmittel werden verkauft" }, "20": { - "then": "Souvenirmünzen werden verkauft" + "then": "Parkscheine werden verkauft" }, "21": { - "then": "Fahrscheine werden verkauft" + "then": "Souvenirmünzen werden verkauft" }, "22": { - "then": "Fahrradlampen werden verkauft" + "then": "Fahrscheine werden verkauft" }, "23": { - "then": "Fahrradhandschuhe werden verkauft" + "then": "Fahrradlampen werden verkauft" }, "24": { - "then": "Fahrrad-Reparaturset werden verkauft" + "then": "Fahrradhandschuhe werden verkauft" }, "25": { - "then": "Fahrradpumpen werden verkauft" + "then": "Fahrrad-Reparaturset werden verkauft" }, "26": { + "then": "Fahrradpumpen werden verkauft" + }, + "27": { "then": "Fahrradschlösser werden verkauft" }, "3": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 4c33a0212..47505399d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -11891,51 +11891,54 @@ "question": "Sale of eggs" }, "13": { - "question": "Sale of cheese" + "question": "Sale of ice cream" }, "14": { - "question": "Sale of honey" + "question": "Sale of cheese" }, "15": { - "question": "Sale of potatoes" + "question": "Sale of honey" }, "16": { - "question": "Sale of meat" + "question": "Sale of potatoes" }, "17": { - "question": "Sale of fruit" + "question": "Sale of meat" }, "18": { - "question": "Sale of strawberries" + "question": "Sale of fruit" }, "19": { - "question": "Sale of flowers" + "question": "Sale of strawberries" }, "2": { "question": "Sale of sweets" }, "20": { - "question": "Sale of parking tickets" + "question": "Sale of flowers" }, "21": { - "question": "Sale of pressed pennies" + "question": "Sale of parking tickets" }, "22": { - "question": "Sale of public transport tickets" + "question": "Sale of pressed pennies" }, "23": { - "question": "Sale of bicycle lights" + "question": "Sale of public transport tickets" }, "24": { - "question": "Sale of gloves" + "question": "Sale of bicycle lights" }, "25": { - "question": "Sale of bicycle repair kits" + "question": "Sale of gloves" }, "26": { - "question": "Sale of bicycle pumps" + "question": "Sale of bicycle repair kits" }, "27": { + "question": "Sale of bicycle pumps" + }, + "28": { "question": "Sale of bicycle locks" }, "3": { @@ -12061,51 +12064,54 @@ "then": "Eggs are sold" }, "12": { - "then": "Cheese is sold" + "then": "Ice cream is sold" }, "13": { - "then": "Honey is sold" + "then": "Cheese is sold" }, "14": { - "then": "Potatoes are sold" + "then": "Honey is sold" }, "15": { - "then": "Meat is sold" + "then": "Potatoes are sold" }, "16": { - "then": "Fruit is sold" + "then": "Meat is sold" }, "17": { - "then": "Strawberries are sold" + "then": "Fruit is sold" }, "18": { - "then": "Flowers are sold" + "then": "Strawberries are sold" }, "19": { - "then": "Parking tickets are sold" + "then": "Flowers are sold" }, "2": { "then": "Food is sold" }, "20": { - "then": "Pressed pennies are sold" + "then": "Parking tickets are sold" }, "21": { - "then": "Public transport tickets are sold" + "then": "Pressed pennies are sold" }, "22": { - "then": "Bicycle lights are sold" + "then": "Public transport tickets are sold" }, "23": { - "then": "Gloves are sold" + "then": "Bicycle lights are sold" }, "24": { - "then": "Bicycle repair kits are sold" + "then": "Gloves are sold" }, "25": { - "then": "Bicycle pumps are sold" + "then": "Bicycle repair kits are sold" }, "26": { + "then": "Bicycle pumps are sold" + }, + "27": { "then": "Bicycle locks are sold" }, "3": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 1a61c4cce..40d7fc0c1 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -4990,19 +4990,19 @@ }, "vending": { "mappings": { - "22": { + "23": { "then": "Las luces para bicicletas se venden aquí" }, - "23": { + "24": { "then": "Los guantes se venden aquí" }, - "24": { + "25": { "then": "Los kits de reparación de bicicletas se venden aquí" }, - "25": { + "26": { "then": "Las bombas para bicicletas se venden aquí" }, - "26": { + "27": { "then": "Aquí se venden candados para bicicletas" }, "8": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index aad37fa99..2552314fd 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -7208,21 +7208,21 @@ "12": { "question": "Vente d'œufs" }, - "13": { + "14": { "question": "Vente de fromage" }, - "14": { + "15": { "question": "Vente de miel" }, - "15": { + "16": { "question": "Vente de pommes de terre" }, - "19": { - "question": "Vente de fleurs" - }, "2": { "question": "Ventre de confiseries" }, + "20": { + "question": "Vente de fleurs" + }, "3": { "question": "Ventre de nourriture" }, @@ -7306,16 +7306,16 @@ "11": { "then": "Vent des œufs" }, - "12": { + "13": { "then": "Vent du fromage" }, - "13": { + "14": { "then": "Vent du miel" }, - "14": { + "15": { "then": "Vent des pommes de terre" }, - "18": { + "19": { "then": "Vent des fleurs" }, "2": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 94a65dded..a8bdf96b3 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -9380,42 +9380,45 @@ "question": "Verkoop van eieren" }, "13": { - "question": "Verkoop van kaas" + "question": "Verkoop van ijs" }, "14": { - "question": "Verkoop van honing" + "question": "Verkoop van kaas" }, "15": { - "question": "Verkoop van aardappelen" + "question": "Verkoop van honing" }, "16": { - "question": "Verkoop van vlees" + "question": "Verkoop van aardappelen" }, "17": { - "question": "Verkoop van fruit" + "question": "Verkoop van vlees" }, "18": { - "question": "Verkoop van aardbeien" + "question": "Verkoop van fruit" }, "19": { - "question": "Verkoop van bloemen" + "question": "Verkoop van aardbeien" }, "2": { "question": "Verkoop van snoep" }, - "23": { - "question": "Verkoop van fietslampjes" + "20": { + "question": "Verkoop van bloemen" }, "24": { - "question": "Verkoop van handschoenen" + "question": "Verkoop van fietslampjes" }, "25": { - "question": "Verkoop van fietsreparatiesets" + "question": "Verkoop van handschoenen" }, "26": { - "question": "Verkoop van fietspompen" + "question": "Verkoop van fietsreparatiesets" }, "27": { + "question": "Verkoop van fietspompen" + }, + "28": { "question": "Verkoop van fietssloten" }, "3": { @@ -9535,48 +9538,51 @@ "then": "Eieren worden verkocht" }, "12": { - "then": "Kaas wordt verkocht" + "then": "IJs wordt verkocht" }, "13": { - "then": "Honing wordt verkocht" + "then": "Kaas wordt verkocht" }, "14": { - "then": "Aardappelen worden verkocht" + "then": "Honing wordt verkocht" }, "15": { - "then": "Vlees wordt verkocht" + "then": "Aardappelen worden verkocht" }, "16": { - "then": "Fruit wordt verkocht" + "then": "Vlees wordt verkocht" }, "17": { - "then": "Aardbeien worden verkocht" + "then": "Fruit wordt verkocht" }, "18": { - "then": "Bloemen worden verkocht" + "then": "Aardbeien worden verkocht" }, "19": { - "then": "Parkeerkaarten worden verkocht" + "then": "Bloemen worden verkocht" }, "2": { "then": "Eten wordt verkocht" }, - "21": { - "then": "Openbaar vervoerkaartjes worden verkocht" + "20": { + "then": "Parkeerkaarten worden verkocht" }, "22": { - "then": "Fietslampjes worden verkocht" + "then": "Openbaar vervoerkaartjes worden verkocht" }, "23": { - "then": "Handschoenen worden verkocht" + "then": "Fietslampjes worden verkocht" }, "24": { - "then": "Fietsreparatiesets worden verkocht" + "then": "Handschoenen worden verkocht" }, "25": { - "then": "Fietspompen worden verkocht" + "then": "Fietsreparatiesets worden verkocht" }, "26": { + "then": "Fietspompen worden verkocht" + }, + "27": { "then": "Fietssloten worden verkocht" }, "3": { diff --git a/langs/layers/pt.json b/langs/layers/pt.json index 07aa7ac40..9a422c5ca 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -2025,19 +2025,19 @@ }, "vending": { "mappings": { - "22": { + "23": { "then": "Luzes para bicicleta são vendidas aqui" }, - "23": { + "24": { "then": "Luvas são vendidas aqui" }, - "24": { + "25": { "then": "Kits para reparo de bicicleta são vendidos aqui" }, - "25": { + "26": { "then": "Bombas de ar para bicicleta são vendidas aqui" }, - "26": { + "27": { "then": "Cadeados para bicicleta são vendidos aqui" }, "8": { diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index be9f4b946..8b02e1a05 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -1690,19 +1690,19 @@ }, "vending": { "mappings": { - "22": { + "23": { "then": "Luzes para bicicleta são vendidas aqui" }, - "23": { + "24": { "then": "Luvas são vendidas aqui" }, - "24": { + "25": { "then": "Kits para reparo de bicicleta são vendidos aqui" }, - "25": { + "26": { "then": "Bombas de ar para bicicleta são vendidas aqui" }, - "26": { + "27": { "then": "Cadeados para bicicleta são vendidos aqui" }, "8": { From e009ff93f699a52505470c3c1b91e0cac01929af Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 25 Sep 2024 00:44:34 +0200 Subject: [PATCH 2/2] Add basic bicycle count layer (#2101) --- .../bicycle_counter/bicycle_counter.json | 178 ++++++++++++++++++ .../bicycle_monitoring_station.svg | 11 ++ .../bicycle_monitoring_station.svg.license | 2 + .../layers/bicycle_counter/license_info.json | 12 ++ assets/themes/cycle_infra/cycle_infra.json | 3 +- assets/themes/cyclofix/cyclofix.json | 5 +- 6 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 assets/layers/bicycle_counter/bicycle_counter.json create mode 100644 assets/layers/bicycle_counter/bicycle_monitoring_station.svg create mode 100644 assets/layers/bicycle_counter/bicycle_monitoring_station.svg.license create mode 100644 assets/layers/bicycle_counter/license_info.json diff --git a/assets/layers/bicycle_counter/bicycle_counter.json b/assets/layers/bicycle_counter/bicycle_counter.json new file mode 100644 index 000000000..3ba016a86 --- /dev/null +++ b/assets/layers/bicycle_counter/bicycle_counter.json @@ -0,0 +1,178 @@ +{ + "id": "bicycle_counter", + "name": { + "en": "Bicycle counters" + }, + "description": { + "en": "Layer showing monitoring stations for bicycle traffic" + }, + "source": { + "osmTags": { + "and": [ + "man_made=monitoring_station", + "monitoring:bicycle=yes" + ] + } + }, + "title": { + "render": { + "en": "Bicycle counter" + } + }, + "tagRenderings": [ + { + "id": "display", + "question": { + "en": "Does this bicycle counter have a display showing the number of passing bicycles?" + }, + "mappings": [ + { + "if": "display=digital", + "then": { + "en": "This counter has a digital display" + } + }, + { + "if": "display=analog", + "then": { + "en": "This counter has an analog display" + } + }, + { + "if": "display=no", + "then": { + "en": "This counter has no display" + } + } + ] + }, + { + "id": "name", + "question": { + "en": "What is the name of the counted location?" + }, + "freeform": { + "key": "name", + "type": "string", + "placeholder": { + "en": "Name of the counted location" + } + }, + "render": { + "en": "Name of the counted location: {name}" + } + }, + { + "id": "start_date", + "question": { + "en": "When did this counter start counting?" + }, + "freeform": { + "key": "start_date", + "type": "date", + "placeholder": { + "en": "Start date of the counter" + } + }, + "render": { + "en": "This counter started counting on {start_date}" + } + }, + { + "id": "clock", + "question": { + "en": "Does this bicycle counter have a clock?" + }, + "mappings": [ + { + "if": "amenity=clock", + "then": { + "en": "This counter has a clock" + } + }, + { + "if": "amenity=", + "then": { + "en": "This counter has no clock" + } + } + ] + }, + { + "id": "ref", + "question": { + "en": "What is the reference number of this counter?" + }, + "freeform": { + "key": "ref", + "type": "string", + "placeholder": { + "en": "Reference number of the counter" + }, + "addExtraTags": [ + "noref=" + ] + }, + "render": { + "en": "Reference number of the counter: {ref}" + }, + "mappings": [ + { + "if": "noref=yes", + "then": { + "en": "This counter has no reference number" + } + } + ] + }, + { + "id": "website", + "question": { + "en": "Is there a website for this bicycle counter?" + }, + "freeform": { + "key": "website", + "type": "url", + "placeholder": { + "en": "Website of the counter" + } + }, + "render": { + "en": "Website of the counter: {website}" + } + } + ], + "pointRendering": [ + { + "marker": [ + { + "icon": "pin", + "color": "#538EE8" + }, + { + "icon": "./assets/layers/bicycle_counter/bicycle_monitoring_station.svg" + } + ], + "location": [ + "point", + "centroid" + ] + } + ], + "minzoom": 13, + "allowMove": { + "enableImproveAccuracy": true + }, + "deletion": true, + "presets": [ + { + "title": { + "en": "a bicycle counter" + }, + "tags": [ + "man_made=monitoring_station", + "monitoring:bicycle=yes" + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/bicycle_counter/bicycle_monitoring_station.svg b/assets/layers/bicycle_counter/bicycle_monitoring_station.svg new file mode 100644 index 000000000..a9da9d133 --- /dev/null +++ b/assets/layers/bicycle_counter/bicycle_monitoring_station.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/layers/bicycle_counter/bicycle_monitoring_station.svg.license b/assets/layers/bicycle_counter/bicycle_monitoring_station.svg.license new file mode 100644 index 000000000..a045bf4da --- /dev/null +++ b/assets/layers/bicycle_counter/bicycle_monitoring_station.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Modified from Lucas Verney +SPDX-License-Identifier: BSD-3-Clause \ No newline at end of file diff --git a/assets/layers/bicycle_counter/license_info.json b/assets/layers/bicycle_counter/license_info.json new file mode 100644 index 000000000..a77e68d82 --- /dev/null +++ b/assets/layers/bicycle_counter/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "bicycle_monitoring_station.svg", + "license": "BSD-3-Clause", + "authors": [ + "Modified from Lucas Verney" + ], + "sources": [ + "https://github.com/cyclosm/cyclosm-cartocss-style/blob/master/symbols/amenity/bicycle_monitoring_station.svg" + ] + } +] \ No newline at end of file diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index d3736d4e5..c6e32eeee 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -55,7 +55,8 @@ "layers": [ "cycleways_and_roads", "barrier", - "crossings" + "crossings", + "bicycle_counter" ], "enableDownload": true, "widenFactor": 1.5 diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json index 04d095cba..6d9d05934 100644 --- a/assets/themes/cyclofix/cyclofix.json +++ b/assets/themes/cyclofix/cyclofix.json @@ -216,7 +216,8 @@ "minzoom": 18, "isCounted": false } - } + }, + "bicycle_counter" ], "widenFactor": 2 -} +} \ No newline at end of file