From 1cf71197f51646cfceb4b58267cf1bdd2223e12f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 1 Apr 2024 18:41:27 +0200 Subject: [PATCH] Themes: fix #1866 --- assets/layers/advertising/advertising.json | 26 +- .../layers/usersettings/question_multiple.svg | 7 + .../layers/usersettings/question_single.svg | 7 + assets/themes/advertising/license_info.json | 10 + .../poster_box_transit_shelter.svg | 291 ++++++++++++++++++ .../poster_box_transit_shelter.svg.license | 2 + 6 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 assets/layers/usersettings/question_multiple.svg create mode 100644 assets/layers/usersettings/question_single.svg create mode 100644 assets/themes/advertising/poster_box_transit_shelter.svg create mode 100644 assets/themes/advertising/poster_box_transit_shelter.svg.license diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json index 782f460bb..2b216f634 100644 --- a/assets/layers/advertising/advertising.json +++ b/assets/layers/advertising/advertising.json @@ -30,7 +30,10 @@ }, "source": { "osmTags": { - "and":["advertising~*", "advertising!=no"] + "and": [ + "advertising~*", + "advertising!=no" + ] } }, "minzoom": 15, @@ -312,6 +315,27 @@ }, "then": "./assets/themes/advertising/poster_box_no_support.svg" }, + { + "if": { + "and": [ + "advertising=poster_box", + { + "or": [ + "shelter=yes", + "amenity=shelter", + "building=shelter" + ] + }, + { + "or": [ + "public_transport=platform", + "highway=bus_stop" + ] + } + ] + }, + "then": "./assets/themes/advertising/poster_box_transit_shelter.svg" + }, { "if": "advertising=poster_box", "then": "./assets/themes/advertising/poster_box.svg" diff --git a/assets/layers/usersettings/question_multiple.svg b/assets/layers/usersettings/question_multiple.svg new file mode 100644 index 000000000..7515e0738 --- /dev/null +++ b/assets/layers/usersettings/question_multiple.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/layers/usersettings/question_single.svg b/assets/layers/usersettings/question_single.svg new file mode 100644 index 000000000..7515e0738 --- /dev/null +++ b/assets/layers/usersettings/question_single.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json index d62237edd..d07c92f74 100644 --- a/assets/themes/advertising/license_info.json +++ b/assets/themes/advertising/license_info.json @@ -354,6 +354,16 @@ "https://wiki.openstreetmap.org/wiki/File:Poster_box.svg" ] }, + { + "path": "poster_box_transit_shelter.svg", + "license": "CC-BY-SA-3.0", + "authors": [ + "Barnes38" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Poster_box_shelter.svg" + ] + }, { "path": "screen alcoi.jpg", "license": "CC-BY-4.0", diff --git a/assets/themes/advertising/poster_box_transit_shelter.svg b/assets/themes/advertising/poster_box_transit_shelter.svg new file mode 100644 index 000000000..d1d1f0fef --- /dev/null +++ b/assets/themes/advertising/poster_box_transit_shelter.svg @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/advertising/poster_box_transit_shelter.svg.license b/assets/themes/advertising/poster_box_transit_shelter.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/poster_box_transit_shelter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file