From a4f2fa63a5d222287f718268d72d2b89f8489d41 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 8 May 2022 12:46:56 +0200 Subject: [PATCH] Move tree images to tree_node directory --- .../tree_node}/broadleaved.svg | 0 .../trees => layers/tree_node}/leafless.svg | 0 assets/layers/tree_node/license_info.json | 40 +++++++++++++++++++ .../tree_node}/needleleaved.svg | 0 assets/layers/tree_node/tree_node.json | 14 +++---- .../trees => layers/tree_node}/unknown.svg | 0 assets/svg/license_info.json | 8 ++++ assets/themes/trees/license_info.json | 40 ------------------- 8 files changed, 55 insertions(+), 47 deletions(-) rename assets/{themes/trees => layers/tree_node}/broadleaved.svg (100%) rename assets/{themes/trees => layers/tree_node}/leafless.svg (100%) rename assets/{themes/trees => layers/tree_node}/needleleaved.svg (100%) rename assets/{themes/trees => layers/tree_node}/unknown.svg (100%) diff --git a/assets/themes/trees/broadleaved.svg b/assets/layers/tree_node/broadleaved.svg similarity index 100% rename from assets/themes/trees/broadleaved.svg rename to assets/layers/tree_node/broadleaved.svg diff --git a/assets/themes/trees/leafless.svg b/assets/layers/tree_node/leafless.svg similarity index 100% rename from assets/themes/trees/leafless.svg rename to assets/layers/tree_node/leafless.svg diff --git a/assets/layers/tree_node/license_info.json b/assets/layers/tree_node/license_info.json index 13ebda753..f3dd17729 100644 --- a/assets/layers/tree_node/license_info.json +++ b/assets/layers/tree_node/license_info.json @@ -8,5 +8,45 @@ "sources": [ "https://commons.wikimedia.org/wiki/File:Onroerend_Erfgoed_logo_without_text.svg" ] + }, + { + "path": "broadleaved.svg", + "license": "CC BY-SA 4.0", + "authors": [ + "Midgard" + ], + "sources": [ + "https://www.openstreetmap.org/user/M!dgard" + ] + }, + { + "path": "leafless.svg", + "license": "CC BY-SA 4.0", + "authors": [ + "Midgard" + ], + "sources": [ + "https://www.openstreetmap.org/user/M!dgard" + ] + }, + { + "path": "needleleaved.svg", + "license": "CC BY-SA 4.0", + "authors": [ + "Midgard" + ], + "sources": [ + "https://www.openstreetmap.org/user/M!dgard" + ] + }, + { + "path": "unknown.svg", + "license": "CC BY-SA 4.0", + "authors": [ + "Midgard" + ], + "sources": [ + "https://www.openstreetmap.org/user/M!dgard" + ] } ] \ No newline at end of file diff --git a/assets/themes/trees/needleleaved.svg b/assets/layers/tree_node/needleleaved.svg similarity index 100% rename from assets/themes/trees/needleleaved.svg rename to assets/layers/tree_node/needleleaved.svg diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index f5a0feae9..d5b7687d0 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -130,7 +130,7 @@ "es": "Latifoliada" }, "icon": { - "path": "./assets/themes/trees/broadleaved.svg", + "path": "./assets/layers/tree_node/broadleaved.svg", "class": "small" } }, @@ -150,7 +150,7 @@ "es": "Hoja aguja" }, "icon": { - "path": "./assets/themes/trees/needleleaved.svg", + "path": "./assets/layers/tree_node/needleleaved.svg", "class": "small" } }, @@ -170,7 +170,7 @@ }, "hideInAnswer": true, "icon": { - "path": "./assets/themes/trees/leafless.svg", + "path": "./assets/layers/tree_node/leafless.svg", "class": "small" } } @@ -708,7 +708,7 @@ "mapRendering": [ { "icon": { - "render": "circle:#ffffff;./assets/themes/trees/unknown.svg", + "render": "circle:#ffffff;./assets/layers/tree_node/unknown.svg", "mappings": [ { "if": { @@ -716,7 +716,7 @@ "leaf_type=broadleaved" ] }, - "then": "circle:#ffffff;./assets/themes/trees/broadleaved.svg" + "then": "circle:#ffffff;./assets/layers/tree_node/broadleaved.svg" }, { "if": { @@ -724,7 +724,7 @@ "leaf_type=needleleaved" ] }, - "then": "circle:#ffffff;./assets/themes/trees/needleleaved.svg" + "then": "circle:#ffffff;./assets/layers/tree_node/needleleaved.svg" } ] }, @@ -743,4 +743,4 @@ "es": "Una capa que muestra árboles", "de": "Eine Ebene, die Bäume zeigt" } -} \ No newline at end of file +} diff --git a/assets/themes/trees/unknown.svg b/assets/layers/tree_node/unknown.svg similarity index 100% rename from assets/themes/trees/unknown.svg rename to assets/layers/tree_node/unknown.svg diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 530adea9a..a8b9bc84e 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -1113,6 +1113,14 @@ "https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt" ] }, + { + "path": "search_disable.svg", + "license": "CC0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "send_email.svg", "license": "CC0; trivial", diff --git a/assets/themes/trees/license_info.json b/assets/themes/trees/license_info.json index 6ad80c137..b31e62184 100644 --- a/assets/themes/trees/license_info.json +++ b/assets/themes/trees/license_info.json @@ -1,24 +1,4 @@ [ - { - "path": "broadleaved.svg", - "license": "CC BY-SA 4.0", - "authors": [ - "Midgard" - ], - "sources": [ - "https://www.openstreetmap.org/user/M!dgard" - ] - }, - { - "path": "leafless.svg", - "license": "CC BY-SA 4.0", - "authors": [ - "Midgard" - ], - "sources": [ - "https://www.openstreetmap.org/user/M!dgard" - ] - }, { "path": "logo.svg", "license": "CC BY-SA 4.0", @@ -28,25 +8,5 @@ "sources": [ "https://www.openstreetmap.org/user/M!dgard" ] - }, - { - "path": "needleleaved.svg", - "license": "CC BY-SA 4.0", - "authors": [ - "Midgard" - ], - "sources": [ - "https://www.openstreetmap.org/user/M!dgard" - ] - }, - { - "path": "unknown.svg", - "license": "CC BY-SA 4.0", - "authors": [ - "Midgard" - ], - "sources": [ - "https://www.openstreetmap.org/user/M!dgard" - ] } ] \ No newline at end of file