From c8475068d01016213efec903fd59e07795cb0a34 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 12 Sep 2022 10:32:19 +0200 Subject: [PATCH 01/30] Allow disabling presets when re-using layers --- Models/ThemeConfig/LayerConfig.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts index 389a7854f..5b1e2d44c 100644 --- a/Models/ThemeConfig/LayerConfig.ts +++ b/Models/ThemeConfig/LayerConfig.ts @@ -215,6 +215,7 @@ export default class LayerConfig extends WithContextLoader { this.minzoomVisible = json.minzoomVisible ?? this.minzoom this.shownByDefault = json.shownByDefault ?? true this.forceLoad = json.forceLoad ?? false + if (json.presets === null) json.presets = undefined if (json.presets !== undefined && json.presets?.map === undefined) { throw "Presets should be a list of items (at " + context + ")" } From cf91e4fe54108aad379c9738ae4f3f5f17113d17 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 12 Sep 2022 10:33:52 +0200 Subject: [PATCH 02/30] Basic station map --- .../railway_platforms/railway_platforms.json | 69 +++++ assets/themes/stations/license_info.json | 22 ++ .../stations/public_transport_tickets.svg | 3 + assets/themes/stations/rail-light-15.svg | 12 + assets/themes/stations/stations.json | 264 ++++++++++++++++++ 5 files changed, 370 insertions(+) create mode 100644 assets/layers/railway_platforms/railway_platforms.json create mode 100644 assets/themes/stations/license_info.json create mode 100644 assets/themes/stations/public_transport_tickets.svg create mode 100644 assets/themes/stations/rail-light-15.svg create mode 100644 assets/themes/stations/stations.json diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json new file mode 100644 index 000000000..0b09a6f7f --- /dev/null +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -0,0 +1,69 @@ +{ + "id": "railway_platforms", + "name": { + "en": "Railway Platforms" + }, + "description": { + "en": "Find every platform in the station, and the train routes that use them." + }, + "title": { + "render": { + "en": "Platform" + }, + "mappings": [ + { + "if": "ref~*", + "then": { + "en": "Platform {ref}" + } + } + ] + }, + "source": { + "osmTags": { + "or": [ + "railway=platform" + ] + } + }, + "minzoom": 18, + "tagRenderings": [ + { + "id": "ref", + "question": { + "en": "What is the number for this platform?" + }, + "freeform": { + "key": "ref", + "type": "string", + "placeholder": { + "en": "Platform number" + } + }, + "render": { + "en": "Platform {ref}" + } + }, + "level" + ], + "mapRendering": [ + { + "color": "gray" + }, + { + "icon": "./assets/svg/bug.svg", + "location": [ + "point", + "centroid" + ], + "label": { + "mappings": [ + { + "if": "ref~*", + "then": "
{ref}
" + } + ] + } + } + ] +} diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json new file mode 100644 index 000000000..19fdb4521 --- /dev/null +++ b/assets/themes/stations/license_info.json @@ -0,0 +1,22 @@ +[ + { + "path": "public_transport_tickets.svg", + "license": "CC0", + "authors": [ + "Jérémy Ragusa" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/public_transport_tickets.svg" + ] + }, + { + "path": "rail-light-15.svg", + "license": "CC0", + "authors": [ + "Maki" + ], + "sources": [ + "https://labs.mapbox.com/maki-icons/" + ] + } +] \ No newline at end of file diff --git a/assets/themes/stations/public_transport_tickets.svg b/assets/themes/stations/public_transport_tickets.svg new file mode 100644 index 000000000..132830c22 --- /dev/null +++ b/assets/themes/stations/public_transport_tickets.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/themes/stations/rail-light-15.svg b/assets/themes/stations/rail-light-15.svg new file mode 100644 index 000000000..6a67b1935 --- /dev/null +++ b/assets/themes/stations/rail-light-15.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json new file mode 100644 index 000000000..473724f87 --- /dev/null +++ b/assets/themes/stations/stations.json @@ -0,0 +1,264 @@ +{ + "id": "stations", + "title": { + "en": "Train Stations" + }, + "description": { + "en": "View, edit and add details to a train station" + }, + "icon": "./assets/themes/stations/rail-light-15.svg", + "startLat": 0, + "startLon": 0, + "startZoom": 0, + "hideFromOverview": true, + "defaultBackgroundId": "CartoDB.Positron", + "layers": [ + { + "builtin": "indoors", + "override": { + "minzoom": 19, + "passAllFeatures": true, + "mapRendering": [ + { + "label": { + "render": null + }, + "iconSize": "0,0,bottom" + } + ] + } + }, + { + "builtin": [ + "entrance", + "elevator", + "bench", + "toilet", + "waste_basket" + ], + "override": { + "minzoom": 19 + } + }, + { + "builtin": "pedestrian_path", + "override": { + "mapRendering": [ + {}, + { + "color": { + "render": "#b33", + "mappings": [ + { + "if": "highway=steps", + "then": "gray" + } + ] + }, + "width": { + "render": 4, + "mappings": [ + { + "if": "highway=steps", + "then": 10 + } + ] + }, + "dashArray": { + "render": "12 6", + "mappings": [ + { + "if": "highway=steps", + "then": "2 2" + } + ] + } + } + ], + "minzoom": 19 + } + }, + { + "id": "train_station", + "minzoom": 12, + "minzoomVisible": 17, + "source": { + "osmTags": { + "or": [ + "railway=station", + "railway=halt" + ] + } + }, + "mapRendering": [ + { + "icon": "./assets/themes/stations/rail-light-15.svg", + "location": [ + "point", + "centroid" + ], + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
" + } + ] + } + }, + { + "color": "green" + } + ] + }, + { + "builtin": "shops", + "override": { + "source": { + "osmTags": { + "and": [ + "shop~*", + "indoor=room" + ] + } + }, + "presets": null, + "minzoom": 19 + } + }, + "railway_platforms", + { + "id": "ticket_machine", + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending=public_transport_tickets" + ] + } + }, + "title": { + "render": { + "en": "Ticket Machine" + } + }, + "tagRenderings": [ + "images", + "level", + { + "id": "operator", + "question": { + "en": "Who is the operator of this ticket machine?" + }, + "render": { + "en": "This ticket machine is operated by {operator}" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Name of the operator" + } + } + } + ], + "presets": [ + { + "tags": ["amenity=vending_machine", "vending=public_transport_tickets"], + "title": { + "en": "a ticket machine" + } + } + ], + "mapRendering": [ + { + "icon": "circle:white;./assets/themes/stations/public_transport_tickets.svg", + "iconSize": "20,20,center", + "location": [ + "point", + "centroid" + ] + } + ] + }, + { + "id": "departures_board", + "name": { + "en": "Departures boards" + }, + "description": { + "en": "Displays showing the trains that will leave from this station" + }, + "title": { + "render": { + "en": "Departures board" + } + }, + "minzoom": 19, + "source": { + "osmTags": { + "and": [ + "departures_board~*", + "departures_board!=no", + "public_transport=" + ] + } + }, + "tagRenderings": [ + { + "id": "type", + "question": { + "en": "What kind of departures board is this?" + }, + "mappings": [ + { + "if": "departures_board=yes", + "then": { + "en": "This is a departures board of an unknown type" + } + }, + { + "if": "departures_board=realtime", + "then": { + "en": "This is an electronic board, showing the next departures in realtime" + } + }, + { + "if": "departures_board=timetable", + "then": { + "en": "This is a paper timetable" + } + }, + { + "if": "departures_board=delay", + "then": { + "en": "There is a sign showing the frequency of the trains" + } + } + ] + }, + "level" + ], + "presets": [ + { + "tags": ["departures_board=yes"], + "title": { + "en": "a departures board" + }, + "description": { + "en": "Add a board showing departures, either electronic or paper" + } + } + ], + "mapRendering": [ + { + "icon": "./assets/svg/bug.svg", + "location": [ + "point", + "centroid" + ] + } + ] + } + ] +} From 986966b06895d3b1458a1504af71a7242566516b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 12 Sep 2022 10:44:07 +0200 Subject: [PATCH 03/30] Fix pedestrian layer --- assets/layers/pedestrian_path/pedestrian_path.json | 14 ++++++++++---- .../railway_platforms/railway_platforms.json | 12 ++++++------ assets/themes/stations/stations.json | 11 ++++++++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index 011acd546..2eef21bf5 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -31,9 +31,15 @@ ] }, { - "color": "#b33", - "width": 4, - "dashArray": "12 6" + "color": { + "render": "#b33" + }, + "width": { + "render": 4 + }, + "dashArray": { + "render": "12 6" + } } ] -} \ No newline at end of file +} diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index 0b09a6f7f..6a3423737 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -58,12 +58,12 @@ ], "label": { "mappings": [ - { - "if": "ref~*", - "then": "
{ref}
" - } - ] + { + "if": "ref~*", + "then": "
{ref}
" + } + ] } } ] -} +} \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 473724f87..b702213a5 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -164,7 +164,10 @@ ], "presets": [ { - "tags": ["amenity=vending_machine", "vending=public_transport_tickets"], + "tags": [ + "amenity=vending_machine", + "vending=public_transport_tickets" + ], "title": { "en": "a ticket machine" } @@ -241,7 +244,9 @@ ], "presets": [ { - "tags": ["departures_board=yes"], + "tags": [ + "departures_board=yes" + ], "title": { "en": "a departures board" }, @@ -261,4 +266,4 @@ ] } ] -} +} \ No newline at end of file From 189248980e2d8e0cb2f9d2a202a4c30c8333cc30 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 23 Oct 2022 20:24:54 +0200 Subject: [PATCH 04/30] Add icons, fix some renderings --- assets/layers/food/food.json | 2 +- .../railway_platforms/railway_platforms.json | 4 +- .../mapcomplete-changes.json | 4 + assets/themes/stations/departures_board.svg | 12 +++ assets/themes/stations/license_info.json | 8 ++ assets/themes/stations/stations.json | 97 ++++++++++++++----- 6 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 assets/themes/stations/departures_board.svg diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 124e64171..d08302f59 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -936,4 +936,4 @@ "es": "Una capa que muestra restaurantes y facilidades de comida rápida", "fr": "Un claque montrant les restaurants et les endroits de nourriture rapide (avec un rendu spécial pour les friteries)" } -} \ No newline at end of file +} diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index 6a3423737..f4ccf4a28 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -51,7 +51,7 @@ "color": "gray" }, { - "icon": "./assets/svg/bug.svg", + "icon": "./assets/themes/stations/rail-light-15.svg", "location": [ "point", "centroid" @@ -66,4 +66,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 161d3232d..9f197f097 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -354,6 +354,10 @@ "if": "theme=sports", "then": "./assets/themes/sports/sport.svg" }, + { + "if": "theme=stations", + "then": "./assets/themes/stations/rail-light-15.svg" + }, { "if": "theme=street_lighting", "then": "./assets/layers/street_lamps/street_lamp.svg" diff --git a/assets/themes/stations/departures_board.svg b/assets/themes/stations/departures_board.svg new file mode 100644 index 000000000..b5b853847 --- /dev/null +++ b/assets/themes/stations/departures_board.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json index 19fdb4521..c8f93e1b1 100644 --- a/assets/themes/stations/license_info.json +++ b/assets/themes/stations/license_info.json @@ -1,4 +1,12 @@ [ + { + "path": "departures_board.svg", + "license": "CC0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, { "path": "public_transport_tickets.svg", "license": "CC0", diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index b702213a5..1c78d2857 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -19,27 +19,18 @@ "minzoom": 19, "passAllFeatures": true, "mapRendering": [ + {}, + {}, { "label": { - "render": null + "render": null, + "mappings": null }, "iconSize": "0,0,bottom" } ] } }, - { - "builtin": [ - "entrance", - "elevator", - "bench", - "toilet", - "waste_basket" - ], - "override": { - "minzoom": 19 - } - }, { "builtin": "pedestrian_path", "override": { @@ -114,21 +105,72 @@ { "builtin": "shops", "override": { - "source": { - "osmTags": { - "and": [ - "shop~*", - "indoor=room" - ] - } + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] }, "presets": null, "minzoom": 19 } }, + { + "builtin": [ + "food", + "cafe_pub" + ], + "override": { + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] + }, + "presets": null, + "minzoom": 19, + "mapRendering+": [ + { + "color": { + "render": "#00f" + }, + "width": { + "render": "8" + } + } + ] + } + }, + { + "builtin": "toilet", + "override": { + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] + }, + "mapRendering+": [ + { + "color": { + "render": "yellow" + }, + "width": { + "render": "8" + } + } + ] + } + }, "railway_platforms", { "id": "ticket_machine", + "name": { + "en": "Ticket Machines" + }, + "description": { + "en": "Find ticket machines for public transport tickets" + }, "source": { "osmTags": { "and": [ @@ -184,6 +226,17 @@ } ] }, + { + "builtin": [ + "entrance", + "elevator", + "bench", + "waste_basket" + ], + "override": { + "minzoom": 19 + } + }, { "id": "departures_board", "name": { @@ -257,7 +310,7 @@ ], "mapRendering": [ { - "icon": "./assets/svg/bug.svg", + "icon": "./assets/themes/stations/departures_board.svg", "location": [ "point", "centroid" @@ -266,4 +319,4 @@ ] } ] -} \ No newline at end of file +} From 68acea99efb60a0d006d0ddcd9aedb284574571e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 23 Oct 2022 20:36:22 +0200 Subject: [PATCH 05/30] Update icon --- .../railway_platforms/railway_platforms.json | 2 +- .../mapcomplete-changes.json | 4 +- assets/themes/stations/license_info.json | 4 +- assets/themes/stations/rail-light-15.svg | 12 ----- assets/themes/stations/rail-light.svg | 47 +++++++++++++++++++ assets/themes/stations/stations.json | 4 +- 6 files changed, 54 insertions(+), 19 deletions(-) delete mode 100644 assets/themes/stations/rail-light-15.svg create mode 100644 assets/themes/stations/rail-light.svg diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index f4ccf4a28..7b5700ce7 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -51,7 +51,7 @@ "color": "gray" }, { - "icon": "./assets/themes/stations/rail-light-15.svg", + "icon": "./assets/themes/stations/rail-light.svg", "location": [ "point", "centroid" diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 9f197f097..4e7925e24 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -356,7 +356,7 @@ }, { "if": "theme=stations", - "then": "./assets/themes/stations/rail-light-15.svg" + "then": "./assets/themes/stations/rail-light.svg" }, { "if": "theme=street_lighting", @@ -569,4 +569,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json index c8f93e1b1..d38ffb6ea 100644 --- a/assets/themes/stations/license_info.json +++ b/assets/themes/stations/license_info.json @@ -18,7 +18,7 @@ ] }, { - "path": "rail-light-15.svg", + "path": "rail-light.svg", "license": "CC0", "authors": [ "Maki" @@ -27,4 +27,4 @@ "https://labs.mapbox.com/maki-icons/" ] } -] \ No newline at end of file +] diff --git a/assets/themes/stations/rail-light-15.svg b/assets/themes/stations/rail-light-15.svg deleted file mode 100644 index 6a67b1935..000000000 --- a/assets/themes/stations/rail-light-15.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/assets/themes/stations/rail-light.svg b/assets/themes/stations/rail-light.svg new file mode 100644 index 000000000..1548d9909 --- /dev/null +++ b/assets/themes/stations/rail-light.svg @@ -0,0 +1,47 @@ + +image/svg+xml + + diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 1c78d2857..37fcdbdd0 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -6,7 +6,7 @@ "description": { "en": "View, edit and add details to a train station" }, - "icon": "./assets/themes/stations/rail-light-15.svg", + "icon": "./assets/themes/stations/rail-light.svg", "startLat": 0, "startLon": 0, "startZoom": 0, @@ -83,7 +83,7 @@ }, "mapRendering": [ { - "icon": "./assets/themes/stations/rail-light-15.svg", + "icon": "./assets/themes/stations/rail-light.svg", "location": [ "point", "centroid" From c68801c9eb9d12298db7c83c1b7b5c8bf3ce5b91 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 23 Oct 2022 20:52:55 +0200 Subject: [PATCH 06/30] Change some minzooms --- assets/themes/stations/stations.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 37fcdbdd0..cb91f9350 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -150,6 +150,8 @@ "indoor=area" ] }, + "presets": null, + "minzoom": 19, "mapRendering+": [ { "color": { @@ -179,6 +181,7 @@ ] } }, + "minzoom": 19, "title": { "render": { "en": "Ticket Machine" From 89b90ab8fb7f991f5648550831a7f1c21daa0749 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 23 Oct 2022 21:12:40 +0200 Subject: [PATCH 07/30] Added bike parking to stations theme --- assets/layers/bike_parking/bike_parking.json | 4 ++-- assets/themes/mapcomplete-changes/mapcomplete-changes.json | 2 +- assets/themes/stations/license_info.json | 2 +- assets/themes/stations/stations.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index 16a02fa15..cc422b14c 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -634,7 +634,7 @@ }, "allowMove": { "enableRelocation": false, - "enableImproveAccuraccy": true + "enableImproveAccuracy": true }, "mapRendering": [ { @@ -660,4 +660,4 @@ "da": "Et lag, der viser, hvor man kan parkere sin cykel", "fr": "Une couche montrant où stationner son vélo" } -} \ No newline at end of file +} diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 4e7925e24..501ba62f4 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -569,4 +569,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json index d38ffb6ea..df149640c 100644 --- a/assets/themes/stations/license_info.json +++ b/assets/themes/stations/license_info.json @@ -27,4 +27,4 @@ "https://labs.mapbox.com/maki-icons/" ] } -] +] \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index cb91f9350..5d7a62e71 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -103,7 +103,7 @@ ] }, { - "builtin": "shops", + "builtin": ["shops", "bike_parking"], "override": { "isShown": { "or": [ From 244a7225192a82a2b08ae1bd729478f7982dba31 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 29 Oct 2022 22:06:17 +0200 Subject: [PATCH 08/30] Add images to stairs, add to stations --- assets/layers/stairs/stairs.json | 5 ++-- assets/themes/stations/stations.json | 40 ++++++---------------------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 4695a0334..cf426a953 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -27,6 +27,7 @@ "osmTags": "highway=steps" }, "tagRenderings": [ + "images", { "id": "handrail", "question": { @@ -126,7 +127,7 @@ { "color": "gray", "width": 10, - "dashArray": "2 2" + "dashArray": "6 12" } ] -} \ No newline at end of file +} diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 5d7a62e71..faff08260 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -34,38 +34,14 @@ { "builtin": "pedestrian_path", "override": { - "mapRendering": [ - {}, - { - "color": { - "render": "#b33", - "mappings": [ - { - "if": "highway=steps", - "then": "gray" - } - ] - }, - "width": { - "render": 4, - "mappings": [ - { - "if": "highway=steps", - "then": 10 - } - ] - }, - "dashArray": { - "render": "12 6", - "mappings": [ - { - "if": "highway=steps", - "then": "2 2" - } - ] - } - } - ], + "title": null, + "name": null, + "mapRendering": null + } + }, + { + "builtin": "stairs", + "override": { "minzoom": 19 } }, From bc2c41e348970dec32d2ea8a9453b7de9d975867 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 29 Oct 2022 22:54:03 +0200 Subject: [PATCH 09/30] Fix stair rendering --- assets/layers/pedestrian_path/pedestrian_path.json | 12 +++--------- assets/themes/stations/stations.json | 12 ++++++++++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index 2eef21bf5..ac1185820 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -31,15 +31,9 @@ ] }, { - "color": { - "render": "#b33" - }, - "width": { - "render": 4 - }, - "dashArray": { - "render": "12 6" - } + "color": "#b33", + "width": 4, + "dashArray": "12 6" } ] } diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index faff08260..2b7985b5d 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -36,7 +36,12 @@ "override": { "title": null, "name": null, - "mapRendering": null + "mapRendering": [ + {}, + { + "width": 0 + } + ] } }, { @@ -79,7 +84,10 @@ ] }, { - "builtin": ["shops", "bike_parking"], + "builtin": [ + "shops", + "bike_parking" + ], "override": { "isShown": { "or": [ From 0ab2f658d57be69d3991781e0161cc98628397f3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 19:30:54 +0100 Subject: [PATCH 10/30] Fix stair rendering (again) --- assets/themes/stations/stations.json | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 2b7985b5d..c25f215f3 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -31,23 +31,18 @@ ] } }, + { + "builtin": "stairs", + "override": { + "minzoom": 19 + } + }, { "builtin": "pedestrian_path", "override": { "title": null, "name": null, - "mapRendering": [ - {}, - { - "width": 0 - } - ] - } - }, - { - "builtin": "stairs", - "override": { - "minzoom": 19 + "mapRendering": null } }, { From ac7a814159be329c5c6a11709ead3209cadef8e4 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 19:45:31 +0100 Subject: [PATCH 11/30] Add level to stairs --- assets/layers/stairs/stairs.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 2fe8ad1b5..13f0ff84d 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -28,6 +28,19 @@ }, "tagRenderings": [ "images", + { + "builtin": "multilevels", + "override": { + "question": { + "en": "Between which levels are these stairs?", + "nl": "Tussen welke verdiepingen loopt deze trap?" + }, + "render": { + "en": "These stairs are between the levels {level}", + "nl": "Deze trap loopt tussen de verdiepingen {level}" + } + } + }, { "id": "handrail", "question": { @@ -51,7 +64,6 @@ } ] }, - { "id": "tactile_writing", "condition": "handrail=yes", From 5b4f311b22e527b154aefeefecca431894ab7961 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 21:31:04 +0100 Subject: [PATCH 12/30] Change keys --- assets/layers/elevator/elevator.json | 2 +- assets/layers/stairs/stairs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 76997bc13..268003c8d 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -140,7 +140,7 @@ "render": { "special": { "type": "language_chooser", - "key": "tactile_writing:braille:language", + "key": "tactile_writing:braille", "question": { "en": "In which languages does this elevator have tactile writing (braille)?" diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 13f0ff84d..a66c803ef 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -91,7 +91,7 @@ "render": { "special": { "type": "language_chooser", - "key": "tactile_writing:braille:language", + "key": "tactile_writing:braille", "question": { "en": "In which languages is there tactile writing (braille) for navigation? " }, From 75dcca69f0194cc82472710fdbd1ca691dd4dd73 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 10 Nov 2022 12:45:58 +0100 Subject: [PATCH 13/30] Added ticket validators --- assets/themes/stations/stations.json | 80 ++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index c25f215f3..93d516fd2 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -184,7 +184,8 @@ "en": "Name of the operator" } } - } + }, + "payment-options" ], "presets": [ { @@ -199,7 +200,80 @@ ], "mapRendering": [ { - "icon": "circle:white;./assets/themes/stations/public_transport_tickets.svg", + "icon": "circle:blue;./assets/themes/stations/public_transport_tickets.svg", + "iconSize": "20,20,center", + "location": [ + "point", + "centroid" + ] + } + ] + }, + { + "id": "ticket_validator", + "name": { + "en": "Ticket Validators" + }, + "description": { + "en": "Find ticket validators to validate public transport tickets" + }, + "source": { + "osmTags": "amenity=ticket_validator" + }, + "minzoom": 19, + "title": { + "render": { + "en": "Ticket Validator" + } + }, + "tagRenderings": [ + "images", + "level", + { + "id": "operator", + "question": { + "en": "Who is the operator of this ticket validator?" + }, + "render": { + "en": "This ticket validator is operated by {operator}" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Name of the operator" + } + } + }, + { + "builtin": "payment-options", + "override": { + "mappings+": [ + { + "if": "payment:OV-Chipkaart=yes", + "ifnot": "payment:OV-Chipkaart=no", + "then": { + "en": "This ticket validator accepts OV-Chipkaart" + }, + "hideInAnswer": "_country!=nl" + } + ] + } + } + ], + "presets": [ + { + "tags": [ + "amenity=ticket_validator" + ], + "title": { + "en": "a ticket validator" + } + } + ], + "mapRendering": [ + { + "icon": "circle:green;./assets/themes/stations/public_transport_tickets.svg", "iconSize": "20,20,center", "location": [ "point", @@ -301,4 +375,4 @@ ] } ] -} +} \ No newline at end of file From 956b6bbdfb9f2ed21097aa6518be275a3aae267e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 10 Nov 2022 13:20:44 +0100 Subject: [PATCH 14/30] Remove translations --- langs/themes/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/en.json b/langs/themes/en.json index 419927176..ccd4ceb2c 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1088,7 +1088,7 @@ "shortDescription": "Map showing sport facilities.", "title": "Sports" }, - "street_lighting": { + "street_lighting": { "description": "On this map you can find everything about street lighting", "layers": { "1": { From 983475afb0bfaba6f313538bc99857859414b17a Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 11 Nov 2022 22:38:10 +0100 Subject: [PATCH 15/30] Update translations, fornat --- assets/layers/bike_parking/bike_parking.json | 2 +- assets/layers/elevator/elevator.json | 28 +++--- assets/layers/food/food.json | 2 +- .../pedestrian_path/pedestrian_path.json | 2 +- .../railway_platforms/railway_platforms.json | 2 +- assets/layers/stairs/stairs.json | 2 +- langs/themes/en.json | 91 ++++++++++++++++++- 7 files changed, 109 insertions(+), 20 deletions(-) diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index cc422b14c..f18fb2071 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -660,4 +660,4 @@ "da": "Et lag, der viser, hvor man kan parkere sin cykel", "fr": "Une couche montrant où stationner son vélo" } -} +} \ No newline at end of file diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 268003c8d..abf6c50cc 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -138,21 +138,21 @@ { "id": "tactile_writing_language", "render": { - "special": { - "type": "language_chooser", - "key": "tactile_writing:braille", - - "question": { - "en": "In which languages does this elevator have tactile writing (braille)?" - }, - "render_list_item": { - "en": "This elevator has tactile writing in {language():font-bold}" - }, - "render_single_language": { - "en": "This elevator has tactile writing in {language():font-bold}" + "special": { + "type": "language_chooser", + "key": "tactile_writing:braille", + "question": { + "en": "In which languages does this elevator have tactile writing (braille)?" + }, + "render_list_item": { + "en": "This elevator has tactile writing in {language():font-bold}" + }, + "render_single_language": { + "en": "This elevator has tactile writing in {language():font-bold}" + } } } - }} + } ], "mapRendering": [ { @@ -228,4 +228,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index d08302f59..124e64171 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -936,4 +936,4 @@ "es": "Una capa que muestra restaurantes y facilidades de comida rápida", "fr": "Un claque montrant les restaurants et les endroits de nourriture rapide (avec un rendu spécial pour les friteries)" } -} +} \ No newline at end of file diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index ac1185820..011acd546 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -36,4 +36,4 @@ "dashArray": "12 6" } ] -} +} \ No newline at end of file diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json index 7b5700ce7..e0d6fad20 100644 --- a/assets/layers/railway_platforms/railway_platforms.json +++ b/assets/layers/railway_platforms/railway_platforms.json @@ -66,4 +66,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index a66c803ef..96c8819e4 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -183,4 +183,4 @@ "dashArray": "6 12" } ] -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index ccd4ceb2c..7567790d7 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1088,7 +1088,96 @@ "shortDescription": "Map showing sport facilities.", "title": "Sports" }, - "street_lighting": { + "stations": { + "description": "View, edit and add details to a train station", + "layers": { + "8": { + "description": "Find ticket machines for public transport tickets", + "name": "Ticket Machines", + "presets": { + "0": { + "title": "a ticket machine" + } + }, + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Name of the operator" + }, + "question": "Who is the operator of this ticket machine?", + "render": "This ticket machine is operated by {operator}" + } + }, + "title": { + "render": "Ticket Machine" + } + }, + "9": { + "description": "Find ticket validators to validate public transport tickets", + "name": "Ticket Validators", + "presets": { + "0": { + "title": "a ticket validator" + } + }, + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Name of the operator" + }, + "question": "Who is the operator of this ticket validator?", + "render": "This ticket validator is operated by {operator}" + }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "This ticket validator accepts OV-Chipkaart" + } + } + } + } + }, + "title": { + "render": "Ticket Validator" + } + }, + "11": { + "description": "Displays showing the trains that will leave from this station", + "name": "Departures boards", + "presets": { + "0": { + "description": "Add a board showing departures, either electronic or paper", + "title": "a departures board" + } + }, + "tagRenderings": { + "type": { + "mappings": { + "0": { + "then": "This is a departures board of an unknown type" + }, + "1": { + "then": "This is an electronic board, showing the next departures in realtime" + }, + "2": { + "then": "This is a paper timetable" + }, + "3": { + "then": "There is a sign showing the frequency of the trains" + } + }, + "question": "What kind of departures board is this?" + } + }, + "title": { + "render": "Departures board" + } + } + }, + "title": "Train Stations" + }, + "street_lighting": { "description": "On this map you can find everything about street lighting", "layers": { "1": { From c1599369b4e1fc8ad8cbb104026a2a2afba949f5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 11 Nov 2022 23:40:16 +0100 Subject: [PATCH 16/30] Split out layers --- .../layers/ticket_machine/ticket_machine.json | 65 ++++++++ .../ticket_validator/ticket_validator.json | 73 +++++++++ assets/themes/stations/stations.json | 140 +----------------- langs/themes/en.json | 51 ------- 4 files changed, 140 insertions(+), 189 deletions(-) create mode 100644 assets/layers/ticket_machine/ticket_machine.json create mode 100644 assets/layers/ticket_validator/ticket_validator.json diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json new file mode 100644 index 000000000..56a36206c --- /dev/null +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -0,0 +1,65 @@ +{ + "id": "ticket_machine", + "name": { + "en": "Ticket Machines" + }, + "description": { + "en": "Find ticket machines for public transport tickets" + }, + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending=public_transport_tickets" + ] + } + }, + "minzoom": 19, + "title": { + "render": { + "en": "Ticket Machine" + } + }, + "tagRenderings": [ + "images", + "level", + { + "id": "operator", + "question": { + "en": "Who is the operator of this ticket machine?" + }, + "render": { + "en": "This ticket machine is operated by {operator}" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Name of the operator" + } + } + }, + "payment-options" + ], + "presets": [ + { + "tags": [ + "amenity=vending_machine", + "vending=public_transport_tickets" + ], + "title": { + "en": "a ticket machine" + } + } + ], + "mapRendering": [ + { + "icon": "circle:blue;./assets/themes/stations/public_transport_tickets.svg", + "iconSize": "20,20,center", + "location": [ + "point", + "centroid" + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json new file mode 100644 index 000000000..4f057b072 --- /dev/null +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -0,0 +1,73 @@ +{ + "id": "ticket_validator", + "name": { + "en": "Ticket Validators" + }, + "description": { + "en": "Find ticket validators to validate public transport tickets" + }, + "source": { + "osmTags": "amenity=ticket_validator" + }, + "minzoom": 19, + "title": { + "render": { + "en": "Ticket Validator" + } + }, + "tagRenderings": [ + "images", + "level", + { + "id": "validator-operator", + "question": { + "en": "Who is the operator of this ticket validator?" + }, + "render": { + "en": "This ticket validator is operated by {operator}" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Name of the operator" + } + } + }, + { + "builtin": "payment-options", + "override": { + "mappings+": [ + { + "if": "payment:OV-Chipkaart=yes", + "ifnot": "payment:OV-Chipkaart=no", + "then": { + "en": "This ticket validator accepts OV-Chipkaart" + }, + "hideInAnswer": "_country!=nl" + } + ] + } + } + ], + "presets": [ + { + "tags": [ + "amenity=ticket_validator" + ], + "title": { + "en": "a ticket validator" + } + } + ], + "mapRendering": [ + { + "icon": "circle:green;./assets/themes/stations/public_transport_tickets.svg", + "iconSize": "20,20,center", + "location": [ + "point", + "centroid" + ] + } + ] +} \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 93d516fd2..0598be96c 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -144,144 +144,8 @@ } }, "railway_platforms", - { - "id": "ticket_machine", - "name": { - "en": "Ticket Machines" - }, - "description": { - "en": "Find ticket machines for public transport tickets" - }, - "source": { - "osmTags": { - "and": [ - "amenity=vending_machine", - "vending=public_transport_tickets" - ] - } - }, - "minzoom": 19, - "title": { - "render": { - "en": "Ticket Machine" - } - }, - "tagRenderings": [ - "images", - "level", - { - "id": "operator", - "question": { - "en": "Who is the operator of this ticket machine?" - }, - "render": { - "en": "This ticket machine is operated by {operator}" - }, - "freeform": { - "key": "operator", - "type": "string", - "placeholder": { - "en": "Name of the operator" - } - } - }, - "payment-options" - ], - "presets": [ - { - "tags": [ - "amenity=vending_machine", - "vending=public_transport_tickets" - ], - "title": { - "en": "a ticket machine" - } - } - ], - "mapRendering": [ - { - "icon": "circle:blue;./assets/themes/stations/public_transport_tickets.svg", - "iconSize": "20,20,center", - "location": [ - "point", - "centroid" - ] - } - ] - }, - { - "id": "ticket_validator", - "name": { - "en": "Ticket Validators" - }, - "description": { - "en": "Find ticket validators to validate public transport tickets" - }, - "source": { - "osmTags": "amenity=ticket_validator" - }, - "minzoom": 19, - "title": { - "render": { - "en": "Ticket Validator" - } - }, - "tagRenderings": [ - "images", - "level", - { - "id": "operator", - "question": { - "en": "Who is the operator of this ticket validator?" - }, - "render": { - "en": "This ticket validator is operated by {operator}" - }, - "freeform": { - "key": "operator", - "type": "string", - "placeholder": { - "en": "Name of the operator" - } - } - }, - { - "builtin": "payment-options", - "override": { - "mappings+": [ - { - "if": "payment:OV-Chipkaart=yes", - "ifnot": "payment:OV-Chipkaart=no", - "then": { - "en": "This ticket validator accepts OV-Chipkaart" - }, - "hideInAnswer": "_country!=nl" - } - ] - } - } - ], - "presets": [ - { - "tags": [ - "amenity=ticket_validator" - ], - "title": { - "en": "a ticket validator" - } - } - ], - "mapRendering": [ - { - "icon": "circle:green;./assets/themes/stations/public_transport_tickets.svg", - "iconSize": "20,20,center", - "location": [ - "point", - "centroid" - ] - } - ] - }, + "ticket_machine", + "ticket_validator", { "builtin": [ "entrance", diff --git a/langs/themes/en.json b/langs/themes/en.json index 7567790d7..98667debc 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1091,57 +1091,6 @@ "stations": { "description": "View, edit and add details to a train station", "layers": { - "8": { - "description": "Find ticket machines for public transport tickets", - "name": "Ticket Machines", - "presets": { - "0": { - "title": "a ticket machine" - } - }, - "tagRenderings": { - "operator": { - "freeform": { - "placeholder": "Name of the operator" - }, - "question": "Who is the operator of this ticket machine?", - "render": "This ticket machine is operated by {operator}" - } - }, - "title": { - "render": "Ticket Machine" - } - }, - "9": { - "description": "Find ticket validators to validate public transport tickets", - "name": "Ticket Validators", - "presets": { - "0": { - "title": "a ticket validator" - } - }, - "tagRenderings": { - "operator": { - "freeform": { - "placeholder": "Name of the operator" - }, - "question": "Who is the operator of this ticket validator?", - "render": "This ticket validator is operated by {operator}" - }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "This ticket validator accepts OV-Chipkaart" - } - } - } - } - }, - "title": { - "render": "Ticket Validator" - } - }, "11": { "description": "Displays showing the trains that will leave from this station", "name": "Departures boards", From b12aa47bf35910d6523ef449c82961223587a95c Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 12 Nov 2022 00:02:38 +0100 Subject: [PATCH 17/30] Change icons --- assets/layers/ticket_machine/ticket_machine.json | 2 +- assets/layers/ticket_validator/ticket_validator.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index 56a36206c..e455f181d 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -54,7 +54,7 @@ ], "mapRendering": [ { - "icon": "circle:blue;./assets/themes/stations/public_transport_tickets.svg", + "icon": "square:lightblue;./assets/themes/stations/public_transport_tickets.svg", "iconSize": "20,20,center", "location": [ "point", diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index 4f057b072..5c048536d 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -62,7 +62,7 @@ ], "mapRendering": [ { - "icon": "circle:green;./assets/themes/stations/public_transport_tickets.svg", + "icon": "square:green;./assets/themes/stations/public_transport_tickets.svg", "iconSize": "20,20,center", "location": [ "point", From d2a54a5d39724b50ddd862b016e521074686c4f3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 12 Nov 2022 00:08:39 +0100 Subject: [PATCH 18/30] Add more ticket validator questions --- .../ticket_validator/ticket_validator.json | 23 +++ langs/layers/en.json | 143 ++++++++++++++++-- 2 files changed, 150 insertions(+), 16 deletions(-) diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index 5c048536d..3c6312db0 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -18,6 +18,21 @@ "tagRenderings": [ "images", "level", + { + "id": "barrier", + "condition": "barrier~*", + "render": { + "en": "This ticket validator is part of a barrier of type {barrier}" + }, + "mappings": [ + { + "if": "barrier=gate", + "then": { + "en": "This ticket validator is part of a gate" + } + } + ] + }, { "id": "validator-operator", "question": { @@ -45,6 +60,14 @@ "en": "This ticket validator accepts OV-Chipkaart" }, "hideInAnswer": "_country!=nl" + }, + { + "if": "payment:ov-chipkaart=yes", + "ifnot": "payment:ov-chipkaart=no", + "then": { + "en": "This ticket validator accepts OV-Chipkaart" + }, + "hideInAnswer": true } ] } diff --git a/langs/layers/en.json b/langs/layers/en.json index d4f2582d4..6c9bb9b14 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3470,9 +3470,13 @@ }, "question": "Does this elevator work?" }, - "wikidata.tactile_writing-braille": { - "override": { - "question": "In which languages does this elevator have tactile writing (braille)?" + "tactile_writing_language": { + "render": { + "special": { + "question": "In which languages does this elevator have tactile writing (braille)?", + "render_list_item": "This elevator has tactile writing in {language():font-bold}", + "render_single_language": "This elevator has tactile writing in {language():font-bold}" + } } } }, @@ -6002,6 +6006,27 @@ "render": "Bookcase" } }, + "railway_platforms": { + "description": "Find every platform in the station, and the train routes that use them.", + "name": "Railway Platforms", + "tagRenderings": { + "ref": { + "freeform": { + "placeholder": "Platform number" + }, + "question": "What is the number for this platform?", + "render": "Platform {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Platform {ref}" + } + }, + "render": "Platform" + } + }, "rainbow_crossings": { "description": "A layer showing pedestrian crossings with rainbow paintings", "name": "Crossings with rainbow paintings", @@ -6321,6 +6346,16 @@ }, "question": "Which genders can enroll at this school?" }, + "school-language": { + "render": { + "special": { + "no_known_languages": "The main language of this school is unknown", + "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
", + "render_all": "The following languages are used in this school:{list()}", + "render_single_language": "{language():font-bold} is the main language of this school" + } + } + }, "school-name": { "question": "What is the name of this school?", "render": "This school is named {name}" @@ -6357,16 +6392,6 @@ }, "question": "Does this school target students with a special need? Which structural facilities does this school have?
Ad-hoc ", "render": "This school has facilities for students with {school:for}" - }, - "wikidata.school-language": { - "override": { - "+mappings": { - "0": { - "then": "The main language of this school is unknown" - } - }, - "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
" - } } }, "title": { @@ -6735,6 +6760,9 @@ }, "1": { "then": "This is not an escalator" + }, + "2": { + "then": "This is not an escalator" } } }, @@ -6749,6 +6777,12 @@ }, "question": "Does this stair have a handrail?" }, + "multilevels": { + "override": { + "question": "Between which levels are these stairs?", + "render": "These stairs are between the levels {level}" + } + }, "ramp": { "mappings": { "0": { @@ -6769,9 +6803,24 @@ }, "question": "Is there a ramp at these stairs?" }, - "wikidata.tactile_writing-braille": { - "override": { - "question": "In which languages is there tactile writing (braille) for navigation? " + "tactile_writing": { + "mappings": { + "0": { + "then": "There is tactile writing on the handrail" + }, + "1": { + "then": "There is no tactile writing on the handrail" + } + }, + "question": "Do these stairs have tactile writing on the handrail?" + }, + "tactile_writing_language": { + "render": { + "special": { + "question": "In which languages is there tactile writing (braille) for navigation? ", + "render_list_item": "These stairs have tactile writing in {language():font-bold}", + "render_single_language": "These stairs have tactile writing in {language():font-bold}" + } } } }, @@ -7103,6 +7152,68 @@ } } }, + "ticket_machine": { + "description": "Find ticket machines for public transport tickets", + "name": "Ticket Machines", + "presets": { + "0": { + "title": "a ticket machine" + } + }, + "tagRenderings": { + "operator": { + "freeform": { + "placeholder": "Name of the operator" + }, + "question": "Who is the operator of this ticket machine?", + "render": "This ticket machine is operated by {operator}" + } + }, + "title": { + "render": "Ticket Machine" + } + }, + "ticket_validator": { + "description": "Find ticket validators to validate public transport tickets", + "name": "Ticket Validators", + "presets": { + "0": { + "title": "a ticket validator" + } + }, + "tagRenderings": { + "barrier": { + "mappings": { + "0": { + "then": "This ticket validator is part of a gate" + } + }, + "render": "This ticket validator is part of a barrier of type {barrier}" + }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "This ticket validator accepts OV-Chipkaart" + }, + "1": { + "then": "This ticket validator accepts OV-Chipkaart" + } + } + } + }, + "validator-operator": { + "freeform": { + "placeholder": "Name of the operator" + }, + "question": "Who is the operator of this ticket validator?", + "render": "This ticket validator is operated by {operator}" + } + }, + "title": { + "render": "Ticket Validator" + } + }, "toilet": { "description": "A layer showing (public) toilets", "filter": { From 773147ad3d0862a6de106f038eafca6a8a68551c Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 15 Nov 2022 13:53:39 +0100 Subject: [PATCH 19/30] Update translations --- .../mapcomplete-changes.json | 72 +++++++++++++------ langs/layers/nl.json | 6 ++ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 6cf5e9e8a..520637e90 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,16 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete vorgenommene Änderungen" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Shows changes made by MapComplete", + "de": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +23,10 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "ca": "Centres del conjunt de canvis", + "de": "Zentrum der Änderungssätze", + "pa_PK": "تبدیلیاں دے کیندر" }, "minzoom": 0, "source": { @@ -31,41 +37,48 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Shows all MapComplete changes", + "de": "Zeigt alle MapComplete-Änderungen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "What contributor did make this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung vorgenommen von {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}" } }, { @@ -74,19 +87,23 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Benutzergebietsschema ist {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change with with {host}", + "de": "Geändert über {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?" }, "freeform": { "key": "host" @@ -431,7 +448,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Themename contains {search}", + "ca": "El nom de la petició conté {search}", + "de": "Themename enthält {search}" } } ] @@ -447,7 +466,8 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt vom Mitwirkenden {search}" } } ] @@ -463,7 +483,8 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht von Mitwirkendem {search}" } } ] @@ -480,7 +501,8 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}" } } ] @@ -497,7 +519,8 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}" } } ] @@ -513,7 +536,8 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}" } } ] @@ -529,7 +553,8 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit host {search}" } } ] @@ -544,7 +569,8 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Weitere Statistiken finden Sie unter hier" } }, { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 2f06bd76b..c5b16e0ea 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6391,6 +6391,12 @@ }, "question": "Heeft deze trap een leuning?" }, + "multilevels": { + "override": { + "question": "Tussen welke verdiepingen loopt deze trap?", + "render": "Deze trap loopt tussen de verdiepingen {level}" + } + }, "ramp": { "mappings": { "0": { From 53fe70a6770f51fe844cb1245c4e0f8a1b58f1e7 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 25 Nov 2022 23:18:12 +0100 Subject: [PATCH 20/30] Add ATMs --- assets/layers/atm/atm.json | 96 ++++++++++++++++++++++++++++ assets/layers/atm/atm.svg | 3 + assets/layers/atm/license_info.json | 13 ++++ assets/themes/stations/stations.json | 9 ++- 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 assets/layers/atm/atm.json create mode 100644 assets/layers/atm/atm.svg create mode 100644 assets/layers/atm/license_info.json diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json new file mode 100644 index 000000000..a8242be24 --- /dev/null +++ b/assets/layers/atm/atm.json @@ -0,0 +1,96 @@ +{ + "id": "atm", + "name": { + "en": "ATMs" + }, + "description": { + "en": "ATMS to withdraw money" + }, + "title": { + "render": { + "en": "ATM" + }, + "mappings": [ + { + "if": "brand~*", + "then": { + "en": "{brand} ATM" + } + } + ] + }, + "source": { + "osmTags": "amenity=atm" + }, + "minzoom": 13, + "presets": [ + { + "tags": [ + "amenity=atm" + ], + "title": { + "en": "an ATM" + } + } + ], + "tagRenderings": [ + { + "id": "name", + "question": { + "en": "What is the name of this ATM?" + }, + "freeform": { + "key": "name", + "type": "string", + "placeholder": { + "en": "Name of the ATM" + } + }, + "render": { + "en": "The name of this ATM is {name}" + } + }, + { + "id": "brand", + "question": { + "en": "What brand is this ATM?" + }, + "freeform": { + "key": "brand", + "type": "string", + "placeholder": { + "en": "Brand name" + } + }, + "render": { + "en": "The brand of this ATM is {brand}" + } + }, + { + "id": "operator", + "question": { + "en": "What company operates this ATM?" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Operator" + } + }, + "render": { + "en": "The ATM is operated by {operator}" + } + }, + "opening_hours" + ], + "mapRendering": [ + { + "icon": "circle:white;./assets/layers/atm/atm.svg", + "location": [ + "point", + "centroid" + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/atm/atm.svg b/assets/layers/atm/atm.svg new file mode 100644 index 000000000..dd010da8b --- /dev/null +++ b/assets/layers/atm/atm.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/layers/atm/license_info.json b/assets/layers/atm/license_info.json new file mode 100644 index 000000000..0bc2bb07b --- /dev/null +++ b/assets/layers/atm/license_info.json @@ -0,0 +1,13 @@ +[ + { + "path": "atm.svg", + "license": "", + "authors": [ + "Michael Glanznig", + "Andy Allan" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/atm.svg" + ] + } +] \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 0598be96c..5e4bdce67 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -57,6 +57,12 @@ ] } }, + "name": { + "en": "Train Stations" + }, + "description": { + "en": "Layer showing train stations" + }, "mapRendering": [ { "icon": "./assets/themes/stations/rail-light.svg", @@ -151,7 +157,8 @@ "entrance", "elevator", "bench", - "waste_basket" + "waste_basket", + "atm" ], "override": { "minzoom": 19 From 31e8d13113fc3f7297712f01953f0b488feff6c4 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 26 Nov 2022 15:19:37 +0100 Subject: [PATCH 21/30] Add bicycle rental --- assets/themes/stations/stations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 5e4bdce67..abc4dd96a 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -87,7 +87,8 @@ { "builtin": [ "shops", - "bike_parking" + "bike_parking", + "bicycle_rental" ], "override": { "isShown": { From cb2c60a9792a944cb1a3f21dc2d083160ad3082f Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 26 Nov 2022 15:22:14 +0100 Subject: [PATCH 22/30] Add license --- assets/layers/atm/license_info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/atm/license_info.json b/assets/layers/atm/license_info.json index 0bc2bb07b..91ffee8e6 100644 --- a/assets/layers/atm/license_info.json +++ b/assets/layers/atm/license_info.json @@ -1,7 +1,7 @@ [ { "path": "atm.svg", - "license": "", + "license": "CC0", "authors": [ "Michael Glanznig", "Andy Allan" From 057e636a75ebe37aa713ffafec63e8a451117a9e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 28 Nov 2022 12:19:27 +0100 Subject: [PATCH 23/30] Change icons --- assets/themes/stations/bench.svg | 3 ++ assets/themes/stations/bicycle_parking.svg | 3 ++ assets/themes/stations/license_info.json | 31 +++++++++++++ assets/themes/stations/rental_bicycle.svg | 3 ++ assets/themes/stations/stations.json | 52 ++++++++++++++++++++-- 5 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 assets/themes/stations/bench.svg create mode 100644 assets/themes/stations/bicycle_parking.svg create mode 100644 assets/themes/stations/rental_bicycle.svg diff --git a/assets/themes/stations/bench.svg b/assets/themes/stations/bench.svg new file mode 100644 index 000000000..d1d8c8b14 --- /dev/null +++ b/assets/themes/stations/bench.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/themes/stations/bicycle_parking.svg b/assets/themes/stations/bicycle_parking.svg new file mode 100644 index 000000000..ebec627bd --- /dev/null +++ b/assets/themes/stations/bicycle_parking.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json index df149640c..13b0032bb 100644 --- a/assets/themes/stations/license_info.json +++ b/assets/themes/stations/license_info.json @@ -1,4 +1,24 @@ [ + { + "path": "bench.svg", + "license": "CC0", + "authors": [ + "Matthijs Melissen" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/bench.svg" + ] + }, + { + "path": "bicycle_parking.svg", + "license": "CC0", + "authors": [ + "Matthijs Melissen" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/bicycle_parking.svg" + ] + }, { "path": "departures_board.svg", "license": "CC0", @@ -26,5 +46,16 @@ "sources": [ "https://labs.mapbox.com/maki-icons/" ] + }, + { + "path": "rental_bicycle.svg", + "license": "CC0", + "authors": [ + "Michael Glanznig", + "Andy Allan" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/rental_bicycle.svg" + ] } ] \ No newline at end of file diff --git a/assets/themes/stations/rental_bicycle.svg b/assets/themes/stations/rental_bicycle.svg new file mode 100644 index 000000000..cf4397e1a --- /dev/null +++ b/assets/themes/stations/rental_bicycle.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index abc4dd96a..515d7711f 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -86,9 +86,7 @@ }, { "builtin": [ - "shops", - "bike_parking", - "bicycle_rental" + "shops" ], "override": { "isShown": { @@ -101,6 +99,42 @@ "minzoom": 19 } }, + { + "builtin": "bike_parking", + "override": { + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] + }, + "presets": null, + "minzoom": 19, + "mapRendering": [ + { + "icon": "circle:white;./assets/themes/stations/bicycle_parking.svg" + } + ] + } + }, + { + "builtin": "bicycle_rental", + "override": { + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] + }, + "presets": null, + "minzoom": 19, + "mapRendering": [ + { + "icon": "circle:white;./assets/themes/stations/rental_bicycle.svg" + } + ] + } + }, { "builtin": [ "food", @@ -157,7 +191,6 @@ "builtin": [ "entrance", "elevator", - "bench", "waste_basket", "atm" ], @@ -165,6 +198,17 @@ "minzoom": 19 } }, + { + "builtin": "bench", + "override": { + "minzoom": 19, + "mapRendering": [ + { + "icon": "./assets/themes/stations/bench.svg" + } + ] + } + }, { "id": "departures_board", "name": { From 7b993d7e553da470da1c973f68a52a63a1609bfb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 28 Nov 2022 14:28:07 +0100 Subject: [PATCH 24/30] Regenerate translations --- langs/layers/en.json | 40 ++++++++++++++++++++++++++++++++++++++++ langs/themes/en.json | 6 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/langs/layers/en.json b/langs/layers/en.json index e23467212..246de98f5 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -153,6 +153,46 @@ "render": "Artwork" } }, + "atm": { + "description": "ATMS to withdraw money", + "name": "ATMs", + "presets": { + "0": { + "title": "an ATM" + } + }, + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Brand name" + }, + "question": "What brand is this ATM?", + "render": "The brand of this ATM is {brand}" + }, + "name": { + "freeform": { + "placeholder": "Name of the ATM" + }, + "question": "What is the name of this ATM?", + "render": "The name of this ATM is {name}" + }, + "operator": { + "freeform": { + "placeholder": "Operator" + }, + "question": "What company operates this ATM?", + "render": "The ATM is operated by {operator}" + } + }, + "title": { + "mappings": { + "0": { + "then": "{brand} ATM" + } + }, + "render": "ATM" + } + }, "barrier": { "description": "Obstacles while cycling, such as bollards and cycle barriers", "name": "Barriers", diff --git a/langs/themes/en.json b/langs/themes/en.json index 98667debc..8926da3d9 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1091,7 +1091,11 @@ "stations": { "description": "View, edit and add details to a train station", "layers": { - "11": { + "3": { + "description": "Layer showing train stations", + "name": "Train Stations" + }, + "14": { "description": "Displays showing the trains that will leave from this station", "name": "Departures boards", "presets": { From ebe72da8ffa0f795fc581960faca42e2fac27812 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 3 Dec 2022 22:18:53 +0100 Subject: [PATCH 25/30] Add car rental --- assets/layers/car_rental/car_rental.json | 97 ++++++++++++++++++++++ assets/layers/car_rental/car_rental.svg | 8 ++ assets/layers/car_rental/license_info.json | 12 +++ assets/themes/stations/stations.json | 13 +++ langs/layers/en.json | 27 ++++++ langs/layers/nl.json | 27 ++++++ langs/themes/en.json | 2 +- 7 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 assets/layers/car_rental/car_rental.json create mode 100644 assets/layers/car_rental/car_rental.svg create mode 100644 assets/layers/car_rental/license_info.json diff --git a/assets/layers/car_rental/car_rental.json b/assets/layers/car_rental/car_rental.json new file mode 100644 index 000000000..18da66910 --- /dev/null +++ b/assets/layers/car_rental/car_rental.json @@ -0,0 +1,97 @@ +{ + "id": "car_rental", + "name": { + "en": "Car Rental", + "nl": "Autoverhuur" + }, + "source": { + "osmTags": "amenity=car_rental" + }, + "minzoom": 12, + "title": { + "render": { + "en": "Car Rental", + "nl": "Autoverhuur" + }, + "mappings": [ + { + "if": "name~*", + "then": "{name}" + } + ] + }, + "description": { + "en": "Places where you can rent a car", + "nl": "Plaatsen waar je een auto kunt huren" + }, + "tagRenderings": [ + "images", + { + "id": "name", + "freeform": { + "key": "name", + "type": "string", + "placeholder": { + "en": "Name of the car rental", + "nl": "Naam van de autoverhuur" + } + }, + "question": { + "en": "What is the name of this car rental?", + "nl": "Wat is de naam van deze autoverhuur?" + }, + "mappings": [ + { + "if": "noname=yes", + "then": { + "en": "This car rental has no name", + "nl": "Deze autoverhuur heeft geen naam" + } + } + ], + "render": { + "en": "This car rental is called {name}", + "nl": "Deze autoverhuur heet {name}" + } + }, + "website", + "email", + "phone", + "opening_hours" + ], + "presets": [ + { + "tags": [ + "amenity=car_rental" + ], + "title": { + "en": "a car rental", + "nl": "een autoverhuur" + }, + "description": { + "en": "A place where you can rent a car", + "nl": "Een plaats waar je een auto kunt huren" + } + } + ], + "mapRendering": [ + { + "icon": "circle:white;./assets/layers/car_rental/car_rental.svg", + "location": [ + "point", + "centroid" + ], + "label": "
{name}
" + }, + { + "color": "darkblue", + "width": 2 + } + ], + "allowMove": { + "enableImproveAccuracy": true + }, + "filter": [ + "open_now" + ] +} \ No newline at end of file diff --git a/assets/layers/car_rental/car_rental.svg b/assets/layers/car_rental/car_rental.svg new file mode 100644 index 000000000..19a148724 --- /dev/null +++ b/assets/layers/car_rental/car_rental.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/layers/car_rental/license_info.json b/assets/layers/car_rental/license_info.json new file mode 100644 index 000000000..31c8cda5e --- /dev/null +++ b/assets/layers/car_rental/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "car_rental.svg", + "license": "CC0", + "authors": [ + "American Institute of Graphic Arts" + ], + "sources": [ + "https://thenounproject.com/icon/car-rental-71/" + ] + } +] \ No newline at end of file diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 515d7711f..c51b09d25 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -135,6 +135,19 @@ ] } }, + { + "builtin": "car_rental", + "override": { + "isShown": { + "or": [ + "indoor=room", + "indoor=area" + ] + }, + "presets": null, + "minzoom": 19 + } + }, { "builtin": [ "food", diff --git a/langs/layers/en.json b/langs/layers/en.json index 18ac0e2dc..23d222a06 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1337,6 +1337,33 @@ "render": "Pub" } }, + "car_rental": { + "description": "Places where you can rent a car", + "name": "Car Rental", + "presets": { + "0": { + "description": "A place where you can rent a car", + "title": "a car rental" + } + }, + "tagRenderings": { + "name": { + "freeform": { + "placeholder": "Name of the car rental" + }, + "mappings": { + "0": { + "then": "This car rental has no name" + } + }, + "question": "What is the name of this car rental?", + "render": "This car rental is called {name}" + } + }, + "title": { + "render": "Car Rental" + } + }, "charging_station": { "description": "A charging station", "filter": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index e111be279..cd1ce33a1 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1306,6 +1306,33 @@ "render": "Café" } }, + "car_rental": { + "description": "Plaatsen waar je een auto kunt huren", + "name": "Autoverhuur", + "presets": { + "0": { + "description": "Een plaats waar je een auto kunt huren", + "title": "een autoverhuur" + } + }, + "tagRenderings": { + "name": { + "freeform": { + "placeholder": "Naam van de autoverhuur" + }, + "mappings": { + "0": { + "then": "Deze autoverhuur heeft geen naam" + } + }, + "question": "Wat is de naam van deze autoverhuur?", + "render": "Deze autoverhuur heet {name}" + } + }, + "title": { + "render": "Autoverhuur" + } + }, "charging_station": { "description": "Oplaadpunten", "filter": { diff --git a/langs/themes/en.json b/langs/themes/en.json index 8926da3d9..bda925a67 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1095,7 +1095,7 @@ "description": "Layer showing train stations", "name": "Train Stations" }, - "14": { + "15": { "description": "Displays showing the trains that will leave from this station", "name": "Departures boards", "presets": { From 0ce3e85df7857c8d275ca55f930a9bf2986de943 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 7 Dec 2022 17:49:40 +0100 Subject: [PATCH 26/30] Add more payment methods + coin denominations --- assets/layers/ticket_machine/10cent.svg | 59 +++++++ assets/layers/ticket_machine/1cent.svg | 57 +++++++ assets/layers/ticket_machine/1euro.svg | 46 ++++++ assets/layers/ticket_machine/20cent.svg | 59 +++++++ assets/layers/ticket_machine/2cent.svg | 55 +++++++ assets/layers/ticket_machine/2euro.svg | 46 ++++++ assets/layers/ticket_machine/50cent.svg | 59 +++++++ assets/layers/ticket_machine/5cent.svg | 55 +++++++ assets/layers/ticket_machine/coins.svg | 7 + .../layers/ticket_machine/license_info.json | 110 +++++++++++++ assets/layers/ticket_machine/notes.svg | 7 + .../layers/ticket_machine/ticket_machine.json | 153 +++++++++++++++++- 12 files changed, 711 insertions(+), 2 deletions(-) create mode 100644 assets/layers/ticket_machine/10cent.svg create mode 100644 assets/layers/ticket_machine/1cent.svg create mode 100644 assets/layers/ticket_machine/1euro.svg create mode 100644 assets/layers/ticket_machine/20cent.svg create mode 100644 assets/layers/ticket_machine/2cent.svg create mode 100644 assets/layers/ticket_machine/2euro.svg create mode 100644 assets/layers/ticket_machine/50cent.svg create mode 100644 assets/layers/ticket_machine/5cent.svg create mode 100644 assets/layers/ticket_machine/coins.svg create mode 100644 assets/layers/ticket_machine/license_info.json create mode 100644 assets/layers/ticket_machine/notes.svg diff --git a/assets/layers/ticket_machine/10cent.svg b/assets/layers/ticket_machine/10cent.svg new file mode 100644 index 000000000..539395abd --- /dev/null +++ b/assets/layers/ticket_machine/10cent.svg @@ -0,0 +1,59 @@ + + + + simple 10 euro cent + + + + + + image/svg+xml + + simple 10 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/1cent.svg b/assets/layers/ticket_machine/1cent.svg new file mode 100644 index 000000000..cbbe3f0cc --- /dev/null +++ b/assets/layers/ticket_machine/1cent.svg @@ -0,0 +1,57 @@ + + + + simple 1 euro cent + + + + + + image/svg+xml + + simple 1 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/1euro.svg b/assets/layers/ticket_machine/1euro.svg new file mode 100644 index 000000000..565cb8f18 --- /dev/null +++ b/assets/layers/ticket_machine/1euro.svg @@ -0,0 +1,46 @@ + + + + simple 1 euro + + + + + + image/svg+xml + + simple 1 euro + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/20cent.svg b/assets/layers/ticket_machine/20cent.svg new file mode 100644 index 000000000..6b92dfbd5 --- /dev/null +++ b/assets/layers/ticket_machine/20cent.svg @@ -0,0 +1,59 @@ + + + + simple 20 euro cent + + + + + + image/svg+xml + + simple 20 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/2cent.svg b/assets/layers/ticket_machine/2cent.svg new file mode 100644 index 000000000..f1cea0ccf --- /dev/null +++ b/assets/layers/ticket_machine/2cent.svg @@ -0,0 +1,55 @@ + + + + simple 2 euro cent + + + + + + image/svg+xml + + simple 2 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/2euro.svg b/assets/layers/ticket_machine/2euro.svg new file mode 100644 index 000000000..a9ed9de64 --- /dev/null +++ b/assets/layers/ticket_machine/2euro.svg @@ -0,0 +1,46 @@ + + + + simple 2 euro + + + + + + image/svg+xml + + simple 2 euro + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/50cent.svg b/assets/layers/ticket_machine/50cent.svg new file mode 100644 index 000000000..e31630c2a --- /dev/null +++ b/assets/layers/ticket_machine/50cent.svg @@ -0,0 +1,59 @@ + + + + simple 50 euro cent + + + + + + image/svg+xml + + simple 50 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/5cent.svg b/assets/layers/ticket_machine/5cent.svg new file mode 100644 index 000000000..28894a029 --- /dev/null +++ b/assets/layers/ticket_machine/5cent.svg @@ -0,0 +1,55 @@ + + + + simple 5 euro cent + + + + + + image/svg+xml + + simple 5 euro cent + + 2018-10-11 + + + Frank Tremmel + + + + + cent + money + teaching + school + education + simple + counting + + + simple money for worksheets + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/coins.svg b/assets/layers/ticket_machine/coins.svg new file mode 100644 index 000000000..4fe4c15a7 --- /dev/null +++ b/assets/layers/ticket_machine/coins.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/assets/layers/ticket_machine/license_info.json b/assets/layers/ticket_machine/license_info.json new file mode 100644 index 000000000..2f2d2a429 --- /dev/null +++ b/assets/layers/ticket_machine/license_info.json @@ -0,0 +1,110 @@ +[ + { + "path": "10cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311337/worksheet-10-cent-coloured" + ] + }, + { + "path": "1cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311334/worksheet-1-cent-coloured" + ] + }, + { + "path": "1euro.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311340/worksheet-1-euro-coloured" + ] + }, + { + "path": "20cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311338/worksheet-20-cent-coloured" + ] + }, + { + "path": "2cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311335/worksheet-2-cent-coloured" + ] + }, + { + "path": "2euro.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311341/worksheet-2-euro-coloured" + ] + }, + { + "path": "50cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311339/worksheet-50-cent-coloured" + ] + }, + { + "path": "5cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311336/worksheet-5-cent-coloured" + ] + }, + { + "path": "coins.svg", + "license": "CC-BY 3.0", + "authors": [ + "Online Web Fonts" + ], + "sources": [ + "https://www.onlinewebfonts.com/icon/464488" + ] + }, + { + "path": "notes.svg", + "license": "CC-BY 3.0", + "authors": [ + "Online Web Fonts" + ], + "sources": [ + "https://www.onlinewebfonts.com/icon/464507" + ] + } +] \ No newline at end of file diff --git a/assets/layers/ticket_machine/notes.svg b/assets/layers/ticket_machine/notes.svg new file mode 100644 index 000000000..79d25a433 --- /dev/null +++ b/assets/layers/ticket_machine/notes.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ 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 e455f181d..b60787e9f 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -37,9 +37,158 @@ "placeholder": { "en": "Name of the operator" } - } + }, + "mappings": [ + { + "if": "operator=Nederlandse Spoorwegen", + "then": { + "en": "Dutch Railways (NS)", + "nl": "Nederlandse Spoorwegen (NS)" + }, + "hideInAnswer": "_country!=nl" + } + ] }, - "payment-options" + { + "id": "payment-options", + "question": { + "en": "How can you pay for tickets at this ticket machine?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "payment:coins=yes", + "ifnot": "payment:coins=no", + "icon": "./assets/layers/ticket_machine/coins.svg", + "then": { + "en": "You can pay using coins" + } + }, + { + "if": "payment:notes=yes", + "ifnot": "payment:notes=no", + "icon": "./assets/layers/ticket_machine/notes.svg", + "then": { + "en": "You can pay using bank notes" + } + }, + { + "if": "payment:cash=yes", + "ifnot": "payment:cash=", + "icon": "./assets/tagRenderings/cash.svg", + "then": { + "en": "You can pay here using coins and bank notes" + }, + "hideInAnswer": true + }, + { + "if": "payment:debit_cards=yes", + "ifnot": "payment_debit_cards=no", + "icon": "./assets/tagRenderings/payment_card.svg", + "then": { + "en": "You can pay here using debit cards" + } + }, + { + "if": "payment:credit_cards=yes", + "ifnot": "payment:credit_cards=no", + "icon": "./assets/tagRenderings/payment_card.svg", + "then": { + "en": "You can pay here using credit cards" + } + }, + { + "if": "payment:cards=yes", + "ifnot": "payment:cards=", + "icon": "./assets/tagRenderings/payment_card.svg", + "then": { + "en": "You can pay here using cards" + }, + "hideInAnswer": true + } + ] + }, + { + "id": "denominations-coins", + "condition": { + "and": [ + { + "or": [ + "payment:coins=yes", + "payment:cash=yes" + ] + }, + { + "or": [ + "_country=nl", + "_country=be" + ] + } + ] + }, + "question": { + "en": "Whith what coins can you pay here?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "payment:coins:denomination=0.01 EUR", + "icon": "./assets/layers/ticket_machine/1cent.svg", + "then": { + "en": "1 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=0.02 EUR", + "icon": "./assets/layers/ticket_machine/2cent.svg", + "then": { + "en": "2 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=0.05 EUR", + "icon": "./assets/layers/ticket_machine/5cent.svg", + "then": { + "en": "5 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=0.10 EUR", + "icon": "./assets/layers/ticket_machine/10cent.svg", + "then": { + "en": "10 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=0.20 EUR", + "icon": "./assets/layers/ticket_machine/20cent.svg", + "then": { + "en": "20 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=0.50 EUR", + "icon": "./assets/layers/ticket_machine/50cent.svg", + "then": { + "en": "50 cent coins are accepted" + } + }, + { + "if": "payment:coins:denomination=1.00 EUR", + "icon": "./assets/layers/ticket_machine/1euro.svg", + "then": { + "en": "1 euro coins are accepted" + } + }, + { + "if": "payment:coins:denomination=2.00 EUR", + "icon": "./assets/layers/ticket_machine/2euro.svg", + "then": { + "en": "2 euro coins are accepted" + } + } + ] + } ], "presets": [ { From e897aaf1084e2c800df1a391a0c6386e64c0a0c9 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 7 Dec 2022 18:00:13 +0100 Subject: [PATCH 27/30] Correct country list --- .../layers/ticket_machine/ticket_machine.json | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index b60787e9f..74187b8eb 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -120,8 +120,26 @@ }, { "or": [ + "_country=at", + "_country=be", + "_country=cy", + "_country=de", + "_country=ee", + "_country=es", + "_country=fi", + "_country=fr", + "_country=gr", + "_country=hr", + "_country=ie", + "_country=it", + "_country=lt", + "_country=lu", + "_country=lv", + "_country=mt", "_country=nl", - "_country=be" + "_country=pt", + "_country=si", + "_country=sk" ] } ] From ae937484433156357454a7aff3f9a8671e062f60 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 7 Dec 2022 18:03:19 +0100 Subject: [PATCH 28/30] Add wikidata --- assets/layers/ticket_machine/ticket_machine.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index 74187b8eb..849ba0783 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -45,6 +45,9 @@ "en": "Dutch Railways (NS)", "nl": "Nederlandse Spoorwegen (NS)" }, + "addExtraTags": [ + "operator:wikidata=Q23076" + ], "hideInAnswer": "_country!=nl" } ] From d835b92c7cafd7309fa43ab360efc24f78823614 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 8 Dec 2022 11:31:58 +0100 Subject: [PATCH 29/30] Move questions, remove name question --- assets/layers/atm/atm.json | 10 -- .../layers/ticket_machine/license_info.json | 110 ------------ .../layers/ticket_machine/ticket_machine.json | 160 +----------------- .../10cent.svg | 0 .../1cent.svg | 0 .../1euro.svg | 0 .../20cent.svg | 0 .../2cent.svg | 0 .../2euro.svg | 0 .../50cent.svg | 0 .../5cent.svg | 0 .../coins.svg | 0 assets/tagRenderings/license_info.json | 108 ++++++++++++ .../notes.svg | 0 assets/tagRenderings/questions.json | 149 +++++++++++++++- langs/layers/en.json | 4 - 16 files changed, 258 insertions(+), 283 deletions(-) delete mode 100644 assets/layers/ticket_machine/license_info.json rename assets/{layers/ticket_machine => tagRenderings}/10cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/1cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/1euro.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/20cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/2cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/2euro.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/50cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/5cent.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/coins.svg (100%) rename assets/{layers/ticket_machine => tagRenderings}/notes.svg (100%) diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index a8242be24..67d449152 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -36,16 +36,6 @@ "tagRenderings": [ { "id": "name", - "question": { - "en": "What is the name of this ATM?" - }, - "freeform": { - "key": "name", - "type": "string", - "placeholder": { - "en": "Name of the ATM" - } - }, "render": { "en": "The name of this ATM is {name}" } diff --git a/assets/layers/ticket_machine/license_info.json b/assets/layers/ticket_machine/license_info.json deleted file mode 100644 index 2f2d2a429..000000000 --- a/assets/layers/ticket_machine/license_info.json +++ /dev/null @@ -1,110 +0,0 @@ -[ - { - "path": "10cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311337/worksheet-10-cent-coloured" - ] - }, - { - "path": "1cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311334/worksheet-1-cent-coloured" - ] - }, - { - "path": "1euro.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311340/worksheet-1-euro-coloured" - ] - }, - { - "path": "20cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311338/worksheet-20-cent-coloured" - ] - }, - { - "path": "2cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311335/worksheet-2-cent-coloured" - ] - }, - { - "path": "2euro.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311341/worksheet-2-euro-coloured" - ] - }, - { - "path": "50cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311339/worksheet-50-cent-coloured" - ] - }, - { - "path": "5cent.svg", - "license": "CC0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311336/worksheet-5-cent-coloured" - ] - }, - { - "path": "coins.svg", - "license": "CC-BY 3.0", - "authors": [ - "Online Web Fonts" - ], - "sources": [ - "https://www.onlinewebfonts.com/icon/464488" - ] - }, - { - "path": "notes.svg", - "license": "CC-BY 3.0", - "authors": [ - "Online Web Fonts" - ], - "sources": [ - "https://www.onlinewebfonts.com/icon/464507" - ] - } -] \ 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 849ba0783..673bd0625 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -52,164 +52,8 @@ } ] }, - { - "id": "payment-options", - "question": { - "en": "How can you pay for tickets at this ticket machine?" - }, - "multiAnswer": true, - "mappings": [ - { - "if": "payment:coins=yes", - "ifnot": "payment:coins=no", - "icon": "./assets/layers/ticket_machine/coins.svg", - "then": { - "en": "You can pay using coins" - } - }, - { - "if": "payment:notes=yes", - "ifnot": "payment:notes=no", - "icon": "./assets/layers/ticket_machine/notes.svg", - "then": { - "en": "You can pay using bank notes" - } - }, - { - "if": "payment:cash=yes", - "ifnot": "payment:cash=", - "icon": "./assets/tagRenderings/cash.svg", - "then": { - "en": "You can pay here using coins and bank notes" - }, - "hideInAnswer": true - }, - { - "if": "payment:debit_cards=yes", - "ifnot": "payment_debit_cards=no", - "icon": "./assets/tagRenderings/payment_card.svg", - "then": { - "en": "You can pay here using debit cards" - } - }, - { - "if": "payment:credit_cards=yes", - "ifnot": "payment:credit_cards=no", - "icon": "./assets/tagRenderings/payment_card.svg", - "then": { - "en": "You can pay here using credit cards" - } - }, - { - "if": "payment:cards=yes", - "ifnot": "payment:cards=", - "icon": "./assets/tagRenderings/payment_card.svg", - "then": { - "en": "You can pay here using cards" - }, - "hideInAnswer": true - } - ] - }, - { - "id": "denominations-coins", - "condition": { - "and": [ - { - "or": [ - "payment:coins=yes", - "payment:cash=yes" - ] - }, - { - "or": [ - "_country=at", - "_country=be", - "_country=cy", - "_country=de", - "_country=ee", - "_country=es", - "_country=fi", - "_country=fr", - "_country=gr", - "_country=hr", - "_country=ie", - "_country=it", - "_country=lt", - "_country=lu", - "_country=lv", - "_country=mt", - "_country=nl", - "_country=pt", - "_country=si", - "_country=sk" - ] - } - ] - }, - "question": { - "en": "Whith what coins can you pay here?" - }, - "multiAnswer": true, - "mappings": [ - { - "if": "payment:coins:denomination=0.01 EUR", - "icon": "./assets/layers/ticket_machine/1cent.svg", - "then": { - "en": "1 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=0.02 EUR", - "icon": "./assets/layers/ticket_machine/2cent.svg", - "then": { - "en": "2 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=0.05 EUR", - "icon": "./assets/layers/ticket_machine/5cent.svg", - "then": { - "en": "5 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=0.10 EUR", - "icon": "./assets/layers/ticket_machine/10cent.svg", - "then": { - "en": "10 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=0.20 EUR", - "icon": "./assets/layers/ticket_machine/20cent.svg", - "then": { - "en": "20 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=0.50 EUR", - "icon": "./assets/layers/ticket_machine/50cent.svg", - "then": { - "en": "50 cent coins are accepted" - } - }, - { - "if": "payment:coins:denomination=1.00 EUR", - "icon": "./assets/layers/ticket_machine/1euro.svg", - "then": { - "en": "1 euro coins are accepted" - } - }, - { - "if": "payment:coins:denomination=2.00 EUR", - "icon": "./assets/layers/ticket_machine/2euro.svg", - "then": { - "en": "2 euro coins are accepted" - } - } - ] - } + "payment-options-split", + "denominations-coins" ], "presets": [ { diff --git a/assets/layers/ticket_machine/10cent.svg b/assets/tagRenderings/10cent.svg similarity index 100% rename from assets/layers/ticket_machine/10cent.svg rename to assets/tagRenderings/10cent.svg diff --git a/assets/layers/ticket_machine/1cent.svg b/assets/tagRenderings/1cent.svg similarity index 100% rename from assets/layers/ticket_machine/1cent.svg rename to assets/tagRenderings/1cent.svg diff --git a/assets/layers/ticket_machine/1euro.svg b/assets/tagRenderings/1euro.svg similarity index 100% rename from assets/layers/ticket_machine/1euro.svg rename to assets/tagRenderings/1euro.svg diff --git a/assets/layers/ticket_machine/20cent.svg b/assets/tagRenderings/20cent.svg similarity index 100% rename from assets/layers/ticket_machine/20cent.svg rename to assets/tagRenderings/20cent.svg diff --git a/assets/layers/ticket_machine/2cent.svg b/assets/tagRenderings/2cent.svg similarity index 100% rename from assets/layers/ticket_machine/2cent.svg rename to assets/tagRenderings/2cent.svg diff --git a/assets/layers/ticket_machine/2euro.svg b/assets/tagRenderings/2euro.svg similarity index 100% rename from assets/layers/ticket_machine/2euro.svg rename to assets/tagRenderings/2euro.svg diff --git a/assets/layers/ticket_machine/50cent.svg b/assets/tagRenderings/50cent.svg similarity index 100% rename from assets/layers/ticket_machine/50cent.svg rename to assets/tagRenderings/50cent.svg diff --git a/assets/layers/ticket_machine/5cent.svg b/assets/tagRenderings/5cent.svg similarity index 100% rename from assets/layers/ticket_machine/5cent.svg rename to assets/tagRenderings/5cent.svg diff --git a/assets/layers/ticket_machine/coins.svg b/assets/tagRenderings/coins.svg similarity index 100% rename from assets/layers/ticket_machine/coins.svg rename to assets/tagRenderings/coins.svg diff --git a/assets/tagRenderings/license_info.json b/assets/tagRenderings/license_info.json index 1f92135a1..01abeaa68 100644 --- a/assets/tagRenderings/license_info.json +++ b/assets/tagRenderings/license_info.json @@ -1,4 +1,92 @@ [ + { + "path": "10cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311337/worksheet-10-cent-coloured" + ] + }, + { + "path": "1cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311334/worksheet-1-cent-coloured" + ] + }, + { + "path": "1euro.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311340/worksheet-1-euro-coloured" + ] + }, + { + "path": "20cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311338/worksheet-20-cent-coloured" + ] + }, + { + "path": "2cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311335/worksheet-2-cent-coloured" + ] + }, + { + "path": "2euro.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311341/worksheet-2-euro-coloured" + ] + }, + { + "path": "50cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311339/worksheet-50-cent-coloured" + ] + }, + { + "path": "5cent.svg", + "license": "CC0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311336/worksheet-5-cent-coloured" + ] + }, { "path": "audio_induction_loop.svg", "license": "CC-BY 4.0", @@ -29,6 +117,16 @@ "https://www.onlinewebfonts.com/icon/464494" ] }, + { + "path": "coins.svg", + "license": "CC-BY 3.0", + "authors": [ + "Online Web Fonts" + ], + "sources": [ + "https://www.onlinewebfonts.com/icon/464488" + ] + }, { "path": "nfc_card.svg", "license": "CC0", @@ -50,6 +148,16 @@ "https://www.aiga.org/content.cfm/symbol-signs" ] }, + { + "path": "notes.svg", + "license": "CC-BY 3.0", + "authors": [ + "Online Web Fonts" + ], + "sources": [ + "https://www.onlinewebfonts.com/icon/464507" + ] + }, { "path": "payment_card.svg", "license": "CC0", diff --git a/assets/layers/ticket_machine/notes.svg b/assets/tagRenderings/notes.svg similarity index 100% rename from assets/layers/ticket_machine/notes.svg rename to assets/tagRenderings/notes.svg diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 95a79226d..b73849dfd 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -895,6 +895,55 @@ } ] }, + "payment-options-split": { + "builtin": "payment-options", + "override": { + "mappings": [ + { + "hideInAnswer": true, + "ifnot": "payment:cash=" + }, + { + "hideInAnswer": true, + "ifnot": "payment:cards=" + } + ], + "mappings+": [ + { + "if": "payment:coins=yes", + "ifnot": "payment:coins=no", + "icon": "./assets/tagRenderings/coins.svg", + "then": { + "en": "Coins are accepted here" + } + }, + { + "if": "payment:notes=yes", + "ifnot": "payment:notes=no", + "icon": "./assets/tagRenderings/notes.svg", + "then": { + "en": "Bank notes are accepted here" + } + }, + { + "if": "payment:debit_cards=yes", + "ifnot": "payment_debit_cards=no", + "icon": "./assets/tagRenderings/payment_card.svg", + "then": { + "en": "Debit cards are accepted here" + } + }, + { + "if": "payment:credit_cards=yes", + "ifnot": "payment:credit_cards=no", + "icon": "./assets/tagRenderings/payment_card.svg", + "then": { + "en": "Credit cards are accepted here" + } + } + ] + } + }, "payment-options-advanced": { "builtin": "payment-options", "override": { @@ -949,6 +998,104 @@ ] } }, + "denominations-coins": { + "condition": { + "and": [ + { + "or": [ + "payment:coins=yes", + "payment:cash=yes" + ] + }, + { + "or": [ + "_country=at", + "_country=be", + "_country=cy", + "_country=de", + "_country=ee", + "_country=es", + "_country=fi", + "_country=fr", + "_country=gr", + "_country=hr", + "_country=ie", + "_country=it", + "_country=lt", + "_country=lu", + "_country=lv", + "_country=mt", + "_country=nl", + "_country=pt", + "_country=si", + "_country=sk" + ] + } + ] + }, + "question": { + "en": "Whith what coins can you pay here?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "payment:coins:denominations=0.01 EUR", + "icon": "./assets/tagRenderings/1cent.svg", + "then": { + "en": "1 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=0.02 EUR", + "icon": "./assets/tagRenderings/2cent.svg", + "then": { + "en": "2 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=0.05 EUR", + "icon": "./assets/tagRenderings/5cent.svg", + "then": { + "en": "5 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=0.10 EUR", + "icon": "./assets/tagRenderings/10cent.svg", + "then": { + "en": "10 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=0.20 EUR", + "icon": "./assets/tagRenderings/20cent.svg", + "then": { + "en": "20 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=0.50 EUR", + "icon": "./assets/tagRenderings/50cent.svg", + "then": { + "en": "50 cent coins are accepted" + } + }, + { + "if": "payment:coins:denominations=1.00 EUR", + "icon": "./assets/tagRenderings/1euro.svg", + "then": { + "en": "1 euro coins are accepted" + } + }, + { + "if": "payment:coins:denominations=2.00 EUR", + "icon": "./assets/tagRenderings/2euro.svg", + "then": { + "en": "2 euro coins are accepted" + } + } + ] + }, "last_edit": { "#": "Gives some metainfo about the last edit and who did edit it - rendering only", "condition": "_last_edit:contributor~*", @@ -1491,4 +1638,4 @@ "es": "El nombre de red es {internet_access:ssid}" } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 87a99da06..3a5ec4112 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -170,10 +170,6 @@ "render": "The brand of this ATM is {brand}" }, "name": { - "freeform": { - "placeholder": "Name of the ATM" - }, - "question": "What is the name of this ATM?", "render": "The name of this ATM is {name}" }, "operator": { From 7480f22d9d758416db06720c5f8932fe4c87893d Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 8 Dec 2022 12:01:03 +0100 Subject: [PATCH 30/30] Fix typo --- assets/tagRenderings/questions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index b73849dfd..6c987451d 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1081,14 +1081,14 @@ } }, { - "if": "payment:coins:denominations=1.00 EUR", + "if": "payment:coins:denominations=1 EUR", "icon": "./assets/tagRenderings/1euro.svg", "then": { "en": "1 euro coins are accepted" } }, { - "if": "payment:coins:denominations=2.00 EUR", + "if": "payment:coins:denominations=2 EUR", "icon": "./assets/tagRenderings/2euro.svg", "then": { "en": "2 euro coins are accepted" @@ -1638,4 +1638,4 @@ "es": "El nombre de red es {internet_access:ssid}" } } -} \ No newline at end of file +}