From 255347fc06147f8327cc66e8ea386f7641256207 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 13 Nov 2023 12:46:15 +0100 Subject: [PATCH] Fix more themes --- .../layers/named_streets/named_streets.json | 2 +- assets/layers/stairs/license_info.json | 10 ++ assets/layers/stairs/stairs.json | 17 +- assets/layers/stairs/stairs.svg | 1 + assets/layers/stairs/stairs.svg.license | 2 + .../layers/transit_routes/transit_routes.json | 2 +- .../walls_and_buildings.json | 2 +- assets/themes/bag/bag.json | 44 ++++- assets/themes/campersite/campersite.json | 63 +++++++- .../themes/cycle_highways/cycle_highways.json | 38 ++++- assets/themes/cyclenodes/cyclenodes.json | 3 +- assets/themes/cyclestreets/cyclestreets.json | 141 +++++++++++++++- assets/themes/fruit_trees/fruit_tree.svg | 9 -- .../themes/fruit_trees/fruit_tree.svg.license | 2 - assets/themes/fruit_trees/fruit_trees.json | 151 ------------------ assets/themes/fruit_trees/license_info.json | 12 -- 16 files changed, 303 insertions(+), 196 deletions(-) create mode 100644 assets/layers/stairs/stairs.svg create mode 100644 assets/layers/stairs/stairs.svg.license delete mode 100644 assets/themes/fruit_trees/fruit_tree.svg delete mode 100644 assets/themes/fruit_trees/fruit_tree.svg.license delete mode 100644 assets/themes/fruit_trees/fruit_trees.json delete mode 100644 assets/themes/fruit_trees/license_info.json diff --git a/assets/layers/named_streets/named_streets.json b/assets/layers/named_streets/named_streets.json index 9c2a3c1ba9..4041e8b55d 100644 --- a/assets/layers/named_streets/named_streets.json +++ b/assets/layers/named_streets/named_streets.json @@ -11,7 +11,7 @@ }, "minzoom": 18, "shownByDefault": false, - "pointRendering": [], + "pointRendering": null, "lineRendering": [ { "color": "#ccc", diff --git a/assets/layers/stairs/license_info.json b/assets/layers/stairs/license_info.json index 29eb5b169e..6e638d37d1 100644 --- a/assets/layers/stairs/license_info.json +++ b/assets/layers/stairs/license_info.json @@ -6,5 +6,15 @@ "Robin van der Linde" ], "sources": [] + }, + { + "path": "stairs.svg", + "license": "CC-BY SA 4.0", + "authors": [ + " \tFont Awesome" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Stairs-solid.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index cb7561a707..ea82ade00c 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -39,7 +39,22 @@ } ] }, - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": "./assets/layers/stairs/stairs.svg" + } + ], + "location": [ + "point" + ] + } + ], "lineRendering": [ { "color": "gray", diff --git a/assets/layers/stairs/stairs.svg b/assets/layers/stairs/stairs.svg new file mode 100644 index 0000000000..b2e700e413 --- /dev/null +++ b/assets/layers/stairs/stairs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/layers/stairs/stairs.svg.license b/assets/layers/stairs/stairs.svg.license new file mode 100644 index 0000000000..64535f1564 --- /dev/null +++ b/assets/layers/stairs/stairs.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY SA 4.0 \ No newline at end of file diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json index 45163fdb48..9efcb28216 100644 --- a/assets/layers/transit_routes/transit_routes.json +++ b/assets/layers/transit_routes/transit_routes.json @@ -63,7 +63,7 @@ }, "icons.defaults" ], - "pointRendering": [], + "pointRendering": null, "lineRendering": [ { "color": { diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 9745070f38..77251153fc 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -43,7 +43,7 @@ "cs": "Zeď nebo budova" } }, - "pointRendering": [], + "pointRendering": null, "lineRendering": [ { "color": "#fff", diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 158f122e09..7a94f8f3c4 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -101,9 +101,49 @@ "question": "What kind of building is this?" } ], - "pointRendering": [], + "pointRendering": null, "lineRendering": [ - {} + { + "width": { + "render": "2", + "mappings": [ + { + "if": "fixme~*", + "then": "5" + } + ] + }, + "color": { + "render": "#00c", + "mappings": [ + { + "if": "fixme~*", + "then": "#ff00ff" + }, + { + "if": "building=house", + "then": "#a00" + }, + { + "if": "building=shed", + "then": "#563e02" + }, + { + "if": { + "or": [ + "building=garage", + "building=garages" + ] + }, + "then": "#f9bfbb" + }, + { + "if": "building=yes", + "then": "#0774f2" + } + ] + } + } ] }, { diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index 48dc140c24..8ee63fe1c7 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -910,9 +910,42 @@ } } ], - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": { + "render": "./assets/themes/campersite/caravan.svg", + "mappings": [ + { + "if": { + "and": [ + "fee=no" + ] + }, + "then": "./assets/themes/campersite/caravan_green.svg" + } + ] + } + } + ], + "iconSize": "40,40", + "location": [ + "point", + "centroid" + ], + "anchor": "center" + } + ], "lineRendering": [ - {} + { + "color": "#00f", + "width": "8" + } ] }, { @@ -1510,9 +1543,29 @@ } } ], - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": "./assets/themes/campersite/sanitary_dump_station.svg" + } + ], + "iconSize": "32,32", + "location": [ + "point" + ], + "anchor": "center" + } + ], "lineRendering": [ - {} + { + "color": "#00f", + "width": "8" + } ] } ], @@ -1623,4 +1676,4 @@ ] }, "widenFactor": 1.5 -} \ No newline at end of file +} diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json index 121d408cea..2365eaade6 100644 --- a/assets/themes/cycle_highways/cycle_highways.json +++ b/assets/themes/cycle_highways/cycle_highways.json @@ -228,9 +228,41 @@ ] } ], - "pointRendering": [], + "pointRendering": null, "lineRendering": [ - {} + { + "color": { + "render": "#ff7392", + "mappings": [ + { + "if": "state=", + "then": "#00acfc" + }, + { + "if": "state=temporary", + "then": "#00acfc" + } + ] + }, + "width": "4", + "dashArray": { + "render": "", + "mappings": [ + { + "if": "state=temporary", + "then": "12 10" + }, + { + "if": "note:state=has_highway_no", + "then": "0 8" + }, + { + "if": "note:state=has_highway_under_construction", + "then": "12 10" + } + ] + } + } ] } ], @@ -242,4 +274,4 @@ "clustering": { "maxZoom": 1 } -} \ No newline at end of file +} diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json index 691de4369a..f487219578 100644 --- a/assets/themes/cyclenodes/cyclenodes.json +++ b/assets/themes/cyclenodes/cyclenodes.json @@ -114,7 +114,8 @@ "width": "4", "color": "#00a703" } - ] + ], + "pointRendering":null }, { "id": "node", diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index 39a242c90a..7b8ce2fc87 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -103,9 +103,74 @@ "tagRenderings": [ "images" ], - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": { + "render": "./assets/themes/cyclestreets/F111.svg", + "mappings": [ + { + "if": "traffic_sign=DE:244.1,1020-30", + "then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg" + }, + { + "if": "traffic_sign=DE:244.1,1022-12,1024-10", + "then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg" + }, + { + "if": "traffic_sign=DE:244.1,1022-12", + "then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg" + }, + { + "if": "traffic_sign=DE:244.1,1024-10", + "then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg" + }, + { + "if": "_country=de", + "then": "./assets/themes/cyclestreets/Zeichen_244.svg" + }, + { + "if": "_country=fi", + "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg" + } + ] + } + } + ], + "iconSize": { + "render": "40,40,center", + "mappings": [ + { + "if": { + "or": [ + "traffic_sign=DE:244.1,1020-30", + "traffic_sign=DE:244.1,1022-12,1024-10" + ] + }, + "then": "40,62,center" + }, + { + "if": { + "or": [ + "traffic_sign=DE:244.1,1022-12", + "traffic_sign=DE:244.1,1024-10" + ] + }, + "then": "40,70,center" + } + ] + }, + "location": [ + "projected_centerpoint" + ] + } + ], "lineRendering": [ - {} + { + "color": "#0000ff", + "width": "10" + } ] }, { @@ -193,9 +258,35 @@ "tagRenderings": [ "images" ], - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": { + "render": "./assets/themes/cyclestreets/F113.svg", + "mappings": [ + { + "if": "_country=de", + "then": "./assets/themes/cyclestreets/Zeichen_244a.svg" + }, + { + "if": "_country=fi", + "then": "./assets/themes/cyclestreets/Finland_road_sign_E29.svg" + } + ] + } + } + ], + "location": [ + "projected_centerpoint" + ] + } + ], "lineRendering": [ - {} + { + "color": "#09f9dd", + "width": "5" + } ] }, { @@ -273,9 +364,45 @@ "tagRenderings": [ "images" ], - "pointRendering": [], + "pointRendering": [ + { + "marker": [ + { + "icon": "./assets/svg/pencil.svg" + } + ], + "location": [ + "projected_centerpoint" + ] + } + ], "lineRendering": [ - {} + { + "color": { + "render": "#aaaaaa", + "mappings": [ + { + "then": "#0000ff", + "if": { + "or": [ + "cyclestreet=yes", + "bicycle_road=yes" + ] + } + }, + { + "then": "#09f9dd", + "if": { + "or": [ + "proposed:cyclestreet=yes", + "proposed:bicycle_road=yes" + ] + } + } + ] + }, + "width": "5" + } ] } ], @@ -646,4 +773,4 @@ "maxZoom": 12, "minNeededElements": 200 } -} \ No newline at end of file +} diff --git a/assets/themes/fruit_trees/fruit_tree.svg b/assets/themes/fruit_trees/fruit_tree.svg deleted file mode 100644 index e5cce675ec..0000000000 --- a/assets/themes/fruit_trees/fruit_tree.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/assets/themes/fruit_trees/fruit_tree.svg.license b/assets/themes/fruit_trees/fruit_tree.svg.license deleted file mode 100644 index 78591d2d19..0000000000 --- a/assets/themes/fruit_trees/fruit_tree.svg.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: The Noun Project -SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json deleted file mode 100644 index 53fe8a7ef8..0000000000 --- a/assets/themes/fruit_trees/fruit_trees.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "id": "fruit_trees", - "title": { - "nl": "Open Boomgaardenkaart" - }, - "description": { - "nl": "Op deze kaart vindt je boomgaarden en fruitbomen" - }, - "shortDescription": { - "nl": "Boomgaarden en fruitbomen" - }, - "icon": "./assets/themes/fruit_trees/fruit_tree.svg", - "hideFromOverview": true, - "layers": [ - { - "id": "orchards", - "name": { - "nl": "Boomgaarden" - }, - "minzoom": 12, - "source": { - "osmTags": { - "and": [ - "landuse=orchard" - ] - } - }, - "title": { - "render": { - "nl": "Boomgaard" - } - }, - "tagRenderings": [ - "images" - ], - "presets": [ - { - "tags": [ - "landuse=orchard", - "fixme=Added with mapcomplete - geometry still to draw" - ], - "title": { - "nl": "een boomgaard" - }, - "description": { - "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)" - } - } - ], - "pointRendering": [], - "lineRendering": [ - {} - ] - }, - { - "id": "fruitboom", - "name": { - "nl": "Boom" - }, - "minzoom": 12, - "source": { - "osmTags": { - "and": [ - "natural=tree" - ] - } - }, - "title": { - "render": { - "nl": "Boom" - } - }, - "description": { - "nl": "Een boom" - }, - "tagRenderings": [ - { - "render": { - "nl": "De soort is {species:nl}" - }, - "question": { - "nl": "Wat is de soort van deze boom (in het Nederlands)?" - }, - "freeform": { - "key": "species:nl" - }, - "id": "fruitboom-species:nl" - }, - { - "render": { - "nl": "Het ras (taxon) van deze boom is {taxon}" - }, - "question": { - "nl": "Wat is het taxon (ras) van deze boom?" - }, - "freeform": { - "key": "taxon" - }, - "condition": { - "and": [ - "species:nl~*" - ] - }, - "id": "fruitboom-taxon" - }, - { - "render": { - "nl": "Beschrijving: {description}" - }, - "question": { - "nl": "Welke beschrijving past bij deze boom?" - }, - "freeform": { - "key": "description" - }, - "id": "fruitboom-description" - }, - { - "render": { - "nl": "Referentienummer: {ref}" - }, - "question": { - "nl": "Is er een refernetienummer?" - }, - "freeform": { - "key": "ref" - }, - "id": "fruitboom-ref" - } - ], - "presets": [ - { - "tags": [ - "natural=tree" - ], - "title": { - "nl": "een boom" - }, - "description": { - "nl": "Voeg hier een boom toe" - } - } - ], - "pointRendering": [], - "lineRendering": [ - {} - ] - } - ], - "widenFactor": 2 -} \ No newline at end of file diff --git a/assets/themes/fruit_trees/license_info.json b/assets/themes/fruit_trees/license_info.json deleted file mode 100644 index 3a4a3a0a0d..0000000000 --- a/assets/themes/fruit_trees/license_info.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "path": "fruit_tree.svg", - "license": "CC0-1.0", - "authors": [ - "The Noun Project" - ], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/4/4e/Low_Hanging_Fruit_-_The_Noun_Project.svg" - ] - } -] \ No newline at end of file