From 71e3560b27ddf7d638fc50f7908fb93ee98541ea Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 13 Jul 2022 13:00:47 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20=C3=A2=C2=82#951,=20fix=20#952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicycle_library/bicycle_library.json | 3 +- assets/themes/cyclofix/cyclofix.json | 33 +++++++++++++++++++ assets/themes/cyclofix/license_info.json | 10 ++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json index 0f3908bb5..db14d455a 100644 --- a/assets/layers/bicycle_library/bicycle_library.json +++ b/assets/layers/bicycle_library/bicycle_library.json @@ -323,5 +323,6 @@ "render": "1" } } - ] + ], + "deletion": true } \ No newline at end of file diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json index 3222af44e..09775e433 100644 --- a/assets/themes/cyclofix/cyclofix.json +++ b/assets/themes/cyclofix/cyclofix.json @@ -39,6 +39,39 @@ "socialImage": "./assets/themes/cyclofix/logo.svg", "layers": [ "bike_cafe", + { + "builtin": [ + "bicycle_rental" + ], + "override": { + "id": "charging_station_non_docking", + "minzoom": 14, + "=presets": [], + "source": { + "osmTags": { + "and+": [ + "bicycle_rental!=docking_station" + ] + } + } + } + }, + { + "#": "All bicycle rental at a high zoom level, to avoid duplicates", + "builtin": "bicycle_rental", + "override": { + "name": null, + "filter": { + "sameAs": "charging_station_non_docking" + }, + "minzoom": 18, + "mapRendering": [ + { + "icon": "pin:blue;./assets/themes/cyclofix/key.svg" + } + ] + } + }, "bike_shop", { "builtin": "bicycle_library", diff --git a/assets/themes/cyclofix/license_info.json b/assets/themes/cyclofix/license_info.json index 67e654303..a2d52d737 100644 --- a/assets/themes/cyclofix/license_info.json +++ b/assets/themes/cyclofix/license_info.json @@ -19,6 +19,16 @@ "https://fietsambassade.gent.be" ] }, + { + "path": "key.svg", + "license": "CC-BY-SA", + "authors": [ + "Stijn Wens" + ], + "sources": [ + "https://wens.be/free-antwerpenize-bicycle-font" + ] + }, { "path": "logo.svg", "license": "CC-BY-SA",