From 360172dc912d45ff6e05b5592323eeeac305d6f0 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 29 Jan 2023 13:03:29 +0100 Subject: [PATCH 01/18] Remove amenity=bicycle_rental form bike_shop --- assets/layers/bike_shop/bike_shop.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index fbbf0d20b..dc5f7f8f9 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -21,13 +21,6 @@ "#": "We select all bicycle shops, sport shops (but we try to weed out non-bicycle related shops), and any shop with a bicycle related tag", "or": [ "shop=bicycle", - { - "#": "A bicycle rental with a network is something such as villo, bluebike, ... We don't want them", - "and": [ - "amenity=bicycle_rental", - "network=" - ] - }, { "#": "if sport is defined and is not bicycle, it is not matched; if bicycle retail/repair is marked as 'no', it is not shown to too.", "##": "There will be a few false-positives with this. They will get filtered out by people marking both 'not selling bikes' and 'not repairing bikes'. Furthermore, the OSMers will add a sports-subcategory on it", From a37b2810c2cab506ee522e5c817de5e6cdc0ce56 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 29 Jan 2023 14:12:54 +0100 Subject: [PATCH 02/18] Add access to recycling, image/type to wastedisposal --- assets/layers/recycling/recycling.json | 60 +++++++++++++++++++ .../layers/waste_disposal/waste_disposal.json | 25 ++++++++ 2 files changed, 85 insertions(+) diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 52dfe0fca..9edb6abb7 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -1041,6 +1041,44 @@ "it": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?" } } + }, + { + "id": "access", + "question": { + "en": "Who can use this recycling facility?", + "nl": "Wie kan deze recyclingfaciliteit gebruiken?" + }, + "mappings": [ + { + "if": "access=yes", + "then": { + "en": "Everyone can use this recycling facility", + "nl": "Iedereen mag deze recyclingfaciliteit gebruiken" + } + }, + { + "if": "access=residents", + "then": { + "en": "Only residents can use this recycling facility", + "nl": "Enkel bewoners kunnen deze recyclingfaciliteit gebruiken" + } + }, + { + "if": "access=private", + "then": { + "en": "This recycling facility is only for private use", + "nl": "Deze recyclingfaciliteit is alleen voor privégebruik" + } + } + ], + "freeform": { + "key": "access", + "type": "string" + }, + "render": { + "en": "This recycling facility can be used by {access}", + "nl": "Deze recyclingfaciliteit kan gebruikt worden door {access}" + } } ], "filter": [ @@ -1250,6 +1288,28 @@ "osmTags": "recycling:waste=yes" } ] + }, + { + "#": "ignore-possible-duplicate", + "id": "public-access", + "options": [ + { + "question": { + "en": "Only public access", + "nl": "Enkel publiek toegankelijke afvalcontainers", + "de": "Nur öffentliche Mülltonnen", + "it": "Solo accesso pubblico", + "id": "Hanya akses publik", + "da": "Kun offentlig adgang" + }, + "osmTags": { + "or": [ + "access=yes", + "access=" + ] + } + } + ] } ], "deletion": { diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index 030776ea6..c3009f5d8 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -64,6 +64,31 @@ } ], "tagRenderings": [ + "images", + { + "id": "type", + "description": "Mapping allowing to change between waste_disposal and recycling", + "question": { + "en": "What kind of waste disposal bin is this?" + }, + "mappings": [ + { + "if": "amenity=waste_disposal", + "then": { + "en": "This is a medium to large bin for disposal of (household) waste" + } + }, + { + "if": "amenity=recycling", + "then": { + "en": "This is actually a recycling container" + }, + "addExtraTags": [ + "recycling_type=container" + ] + } + ] + }, { "id": "access", "render": { From b5c0607724778b36fd5f9c6d95696803ae83fd5d Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 29 Jan 2023 15:13:32 +0100 Subject: [PATCH 03/18] Add parking ticket machines and note denominations --- .../parking_ticket_machine/license_info.json | 12 ++ .../parking_ticket_machine.json | 79 ++++++++ .../parking_tickets.svg | 3 + .../layers/ticket_machine/ticket_machine.json | 3 +- assets/tagRenderings/100euro.svg | 174 +++++++++++++++++ assets/tagRenderings/10euro.svg | 172 +++++++++++++++++ assets/tagRenderings/200euro.svg | 181 ++++++++++++++++++ assets/tagRenderings/20euro.svg | 175 +++++++++++++++++ assets/tagRenderings/500euro.svg | 169 ++++++++++++++++ assets/tagRenderings/50euro.svg | 172 +++++++++++++++++ assets/tagRenderings/5euro.svg | 93 +++++++++ assets/tagRenderings/license_info.json | 77 ++++++++ assets/tagRenderings/questions.json | 99 ++++++++++ assets/themes/parkings/parkings.json | 3 +- 14 files changed, 1410 insertions(+), 2 deletions(-) create mode 100644 assets/layers/parking_ticket_machine/license_info.json create mode 100644 assets/layers/parking_ticket_machine/parking_ticket_machine.json create mode 100644 assets/layers/parking_ticket_machine/parking_tickets.svg create mode 100644 assets/tagRenderings/100euro.svg create mode 100644 assets/tagRenderings/10euro.svg create mode 100644 assets/tagRenderings/200euro.svg create mode 100644 assets/tagRenderings/20euro.svg create mode 100644 assets/tagRenderings/500euro.svg create mode 100644 assets/tagRenderings/50euro.svg create mode 100644 assets/tagRenderings/5euro.svg diff --git a/assets/layers/parking_ticket_machine/license_info.json b/assets/layers/parking_ticket_machine/license_info.json new file mode 100644 index 000000000..42501091c --- /dev/null +++ b/assets/layers/parking_ticket_machine/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "parking_tickets.svg", + "license": "CC0", + "authors": [ + "Jérémy Ragusa" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/parking_tickets.svg" + ] + } +] \ No newline at end of file diff --git a/assets/layers/parking_ticket_machine/parking_ticket_machine.json b/assets/layers/parking_ticket_machine/parking_ticket_machine.json new file mode 100644 index 000000000..e3f140368 --- /dev/null +++ b/assets/layers/parking_ticket_machine/parking_ticket_machine.json @@ -0,0 +1,79 @@ +{ + "id": "parking_ticket_machine", + "name": { + "en": "Parking Ticket Machines", + "nl": "Parkeerkaartautomaten" + }, + "description": { + "en": "Layer with parking ticket machines to pay for parking.", + "nl": "Laag met parkeerkaartautomaten om voor parkeren te betalen." + }, + "title": { + "render": { + "en": "Parking Ticket Machine", + "nl": "Parkeerkaartautomaat" + } + }, + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending=parking_tickets" + ] + } + }, + "minzoom": 16, + "presets": [ + { + "tags": [ + "amenity=vending_machine", + "vending=parking_tickets" + ], + "title": { + "en": "a parking ticket machine", + "nl": "een parkeerkaartautomaat" + } + } + ], + "tagRenderings": [ + "images", + "payment-options-split", + "denominations-coins", + "denominations-notes", + { + "id": "ref", + "question": { + "en": "What is the reference number of this parking ticket machine?", + "nl": "Wat is het referentienummer van deze parkeerkaartautomaat?" + }, + "freeform": { + "key": "ref", + "type": "string", + "placeholder": { + "en": "Reference number", + "nl": "Referentienummer" + } + }, + "render": { + "en": "This parking ticket machine has the reference number {ref}", + "nl": "Deze parkeerkaartautomaat heeft het referentienummer {ref}" + }, + "mappings": [ + { + "if": "noref=yes", + "then": { + "en": "This parking ticket machine has no reference number", + "nl": "Deze parkeerkaartautomaat heeft geen referentienummer" + } + } + ] + } + ], + "mapRendering": [ + { + "location": ["point", "centroid"], + "icon": "square:white;./assets/layers/parking_ticket_machine/parking_tickets.svg", + "iconSize": "20,20,center" + } + ] +} \ No newline at end of file diff --git a/assets/layers/parking_ticket_machine/parking_tickets.svg b/assets/layers/parking_ticket_machine/parking_tickets.svg new file mode 100644 index 000000000..8e7a6f5cd --- /dev/null +++ b/assets/layers/parking_ticket_machine/parking_tickets.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index 7c84231d3..541fd6213 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -66,7 +66,8 @@ ] }, "payment-options-split", - "denominations-coins" + "denominations-coins", + "denominations-notes" ], "presets": [ { diff --git a/assets/tagRenderings/100euro.svg b/assets/tagRenderings/100euro.svg new file mode 100644 index 000000000..1a4ce26b0 --- /dev/null +++ b/assets/tagRenderings/100euro.svg @@ -0,0 +1,174 @@ + + + + simple 100 euro + + + + + + + + + + + + + + + + image/svg+xml + + simple 100 euro + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +