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] 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 +}