From 47da78d5340ba4bcc7cf792ec7394bbeedbebaaa Mon Sep 17 00:00:00 2001 From: Paul Brunner Date: Sun, 30 Apr 2023 22:45:38 +0200 Subject: [PATCH 1/5] Added filters for second hand bicycles and DIY repair to bike_shop layer. --- assets/layers/bike_shop/bike_shop.json | 105 ++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 6ce9b5afb..363f591db 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -823,6 +823,107 @@ } ], "filter": [ - "open_now" + { + "open_now" + }, + { + "id": "sells_second-hand", + "options": [ + { + "question": { + "en": "Sells second hand bicycles", + "de": "Verkauft gebrauchte Fahrräder", + "nl": "Verkoopt twedehands fietsen", + "it": "Vende biciclette usate" + } + }, + { + "question": { + "en": "Sells second hand bicycles", + "de": "Verkauft gebrauchte Fahrräder", + "nl": "Verkoopt twedehands fietsen", + "it": "Vende biciclette usate" + }, + "osmTags": { + "or": [ + "service:bicycle:second_hand=yes", + "service:bicycle:second_hand=only" + ] + } + }, + { + "question": { + "en": "Only sells second hand bicycles", + "de": "Verkauft nur gebrauchte Fahrräder", + "nl": "Verkoopt enkel twedehands fietsen", + "it": "Vende solo biciclette usate" + }, + "osmTags":"service:bicycle:second_hand=only" + }, + { + "question": { + "en": "Doesn't sell second hand bicycles", + "de": "Verkauft keine gebrauchten Fahrräder", + "nl": "Verkoopt geen twedehands fietsen", + "it": "Non vende biciclette usate" + }, + "osmTags":"service:bicycle:second_hand=no" + }, + { + "question": { + "en": "No information about used bicycles yet", + "de": "Keine Information über gebrauchte Fahrräder", + "nl": "Geen informatie over twedehands fietsen", + "it": "Nessuna informazione sulle biciclette usate" + }, + "osmTags": "service:bicycle:second_hand=" + } + ] + }, + { + "id": "offers_diy_repair", + "options": [ + { + "question": { + "en": "Offers DIY bike repair", + "de": "Bietet Selbstreparatur an", + "nl": "Biedt doe-het-zelfreparaties aan", + "it": "Offre riparazioni fai da te" + } + }, + { + "question": { + "en": "Offers DIY bike repair and provides tools", + "de": "Bietet Selbstreparatur an and stellt Werkzeug zur Verfügung", + "nl": "biedt doe-het-zelfreparaties aan en stelt gereedschap ter beschikking", + "it": "Offre riparazioni fai da te e fornisce strumenti" + }, + "osmTags": { + "or": [ + "service:bicycle:diy=yes", + "service:bicycle:diy=only" + ] + } + }, + { + "question": { + "en": "Doesn't offer DIY bike repair", + "de": "Bietet keine Selbstreparatur an", + "nl": "Biedt doe-het-zelfreparaties aan", + "it": "Non offre riparazioni fai da te" + }, + "osmTags":"service:bicycle:diy=no" + }, + { + "question": { + "en": "No information about DIY bike repair", + "de": "Keine Information über Selbstreparatur", + "nl": "Geen informatie over doe-het-zelfreparaties", + "it": "Nessuna informazione sulle riparazioni fai da te" + }, + "osmTags":"service:bicycle:diy=" + } + ] + } ] -} +} \ No newline at end of file From fbffc94c75a5e6b15b18b66739854fbcbbb8fd26 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 30 Apr 2023 23:17:26 +0200 Subject: [PATCH 2/5] Fix json --- assets/layers/bike_shop/bike_shop.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 363f591db..1b0bec612 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -823,9 +823,9 @@ } ], "filter": [ - { + "open_now" - }, + { "id": "sells_second-hand", "options": [ @@ -926,4 +926,4 @@ ] } ] -} \ No newline at end of file +} From ada1df3f2d8175d0fe4fe7476a68e9ff8d03197f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 30 Apr 2023 23:17:49 +0200 Subject: [PATCH 3/5] Fix json --- assets/layers/bike_shop/bike_shop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 1b0bec612..fe7c54c80 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -824,7 +824,7 @@ ], "filter": [ - "open_now" + "open_now", { "id": "sells_second-hand", From 11ddee04bff3f929bb77ed2c5743f7aa0342c007 Mon Sep 17 00:00:00 2001 From: brunnerpaul <63242083+brunnerpaul@users.noreply.github.com> Date: Mon, 1 May 2023 00:30:38 +0200 Subject: [PATCH 4/5] Simplified the filters - only giving the positive option, e.g. "Sells second hand bicycles" - deleted values for e.g. "Doesn't sell second hand bicycles" - deleted values for missing data --- assets/layers/bike_shop/bike_shop.json | 73 +++----------------------- 1 file changed, 6 insertions(+), 67 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index fe7c54c80..7c35a16c4 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -825,18 +825,10 @@ "filter": [ "open_now", - + { "id": "sells_second-hand", "options": [ - { - "question": { - "en": "Sells second hand bicycles", - "de": "Verkauft gebrauchte Fahrräder", - "nl": "Verkoopt twedehands fietsen", - "it": "Vende biciclette usate" - } - }, { "question": { "en": "Sells second hand bicycles", @@ -850,33 +842,6 @@ "service:bicycle:second_hand=only" ] } - }, - { - "question": { - "en": "Only sells second hand bicycles", - "de": "Verkauft nur gebrauchte Fahrräder", - "nl": "Verkoopt enkel twedehands fietsen", - "it": "Vende solo biciclette usate" - }, - "osmTags":"service:bicycle:second_hand=only" - }, - { - "question": { - "en": "Doesn't sell second hand bicycles", - "de": "Verkauft keine gebrauchten Fahrräder", - "nl": "Verkoopt geen twedehands fietsen", - "it": "Non vende biciclette usate" - }, - "osmTags":"service:bicycle:second_hand=no" - }, - { - "question": { - "en": "No information about used bicycles yet", - "de": "Keine Information über gebrauchte Fahrräder", - "nl": "Geen informatie over twedehands fietsen", - "it": "Nessuna informazione sulle biciclette usate" - }, - "osmTags": "service:bicycle:second_hand=" } ] }, @@ -891,37 +856,11 @@ "it": "Offre riparazioni fai da te" } }, - { - "question": { - "en": "Offers DIY bike repair and provides tools", - "de": "Bietet Selbstreparatur an and stellt Werkzeug zur Verfügung", - "nl": "biedt doe-het-zelfreparaties aan en stelt gereedschap ter beschikking", - "it": "Offre riparazioni fai da te e fornisce strumenti" - }, - "osmTags": { - "or": [ - "service:bicycle:diy=yes", - "service:bicycle:diy=only" - ] - } - }, - { - "question": { - "en": "Doesn't offer DIY bike repair", - "de": "Bietet keine Selbstreparatur an", - "nl": "Biedt doe-het-zelfreparaties aan", - "it": "Non offre riparazioni fai da te" - }, - "osmTags":"service:bicycle:diy=no" - }, - { - "question": { - "en": "No information about DIY bike repair", - "de": "Keine Information über Selbstreparatur", - "nl": "Geen informatie over doe-het-zelfreparaties", - "it": "Nessuna informazione sulle riparazioni fai da te" - }, - "osmTags":"service:bicycle:diy=" + "osmTags": { + "or": [ + "service:bicycle:diy=yes", + "service:bicycle:diy=only" + ] } ] } From 5845b64a9728b03236d011593238dc1ec9db483f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 1 May 2023 10:05:27 +0200 Subject: [PATCH 5/5] Fix json --- assets/layers/bike_shop/bike_shop.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 7c35a16c4..8352eba45 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -823,9 +823,7 @@ } ], "filter": [ - - "open_now", - + "open_now", { "id": "sells_second-hand", "options": [ @@ -854,13 +852,13 @@ "de": "Bietet Selbstreparatur an", "nl": "Biedt doe-het-zelfreparaties aan", "it": "Offre riparazioni fai da te" + }, + "osmTags": { + "or": [ + "service:bicycle:diy=yes", + "service:bicycle:diy=only" + ] } - }, - "osmTags": { - "or": [ - "service:bicycle:diy=yes", - "service:bicycle:diy=only" - ] } ] }