From dff8f51a6aff2f4b20c00f55212491a060f28736 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Wed, 13 Jul 2022 13:13:08 +0200
Subject: [PATCH] Fix icons, rename same-as

---
 assets/themes/cyclofix/cyclofix.json          | 23 +++++++++--
 assets/themes/cyclofix/key.svg                | 40 +++++++++++++++++++
 .../toerisme_vlaanderen.json                  |  4 +-
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 assets/themes/cyclofix/key.svg

diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index 09775e433f..ce47e0a4de 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -44,9 +44,19 @@
         "bicycle_rental"
       ],
       "override": {
-        "id": "charging_station_non_docking",
+        "id": "bicycle_rental_non_docking",
         "minzoom": 14,
         "=presets": [],
+        "=mapRendering": [
+          {
+            "icon": "pin:#ba2792;./assets/themes/cyclofix/key.svg",
+            "iconSize": "40,40,bottom",
+            "location": [
+              "point",
+              "centroid"
+            ]
+          }
+        ],
         "source": {
           "osmTags": {
             "and+": [
@@ -62,12 +72,17 @@
       "override": {
         "name": null,
         "filter": {
-          "sameAs": "charging_station_non_docking"
+          "sameAs": "bicycle_rental_non_docking"
         },
         "minzoom": 18,
-        "mapRendering": [
+        "=mapRendering": [
           {
-            "icon": "pin:blue;./assets/themes/cyclofix/key.svg"
+            "icon": "pin:#ba2792;./assets/themes/cyclofix/key.svg",
+            "iconSize": "40,40,bottom",
+            "location": [
+              "point",
+              "centroid"
+            ]
           }
         ]
       }
diff --git a/assets/themes/cyclofix/key.svg b/assets/themes/cyclofix/key.svg
new file mode 100644
index 0000000000..bb4c55df7c
--- /dev/null
+++ b/assets/themes/cyclofix/key.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="key.svg"
+   width="700"
+   height="700"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="false"
+     inkscape:zoom="0.71100982"
+     inkscape:cx="377.63192"
+     inkscape:cy="257.38041"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     path-name="at"
+     unicode="@"
+     horiz-adv-x="781"
+     d="m 624.87034,232.70553 c 7.07188,7.07269 6.85147,12.10694 0.66125,18.2939 -6.18861,6.18861 -53.87293,54.13999 -53.87293,54.13999 l -31.15861,-31.96703 -32.48592,31.96703 -31.59866,-33.29361 -33.14723,33.29361 -31.82148,-31.96703 -44.19549,40.36627 -50.59645,0.012 c -21.88498,45.06826 -66.91541,71.13715 -115.58239,71.13715 -72.49023,0 -131.257572,-58.76718 -131.257572,-131.25758 0,-72.48941 58.767172,-131.25758 131.257572,-131.25758 47.23711,0 88.65144,24.95312 111.76923,62.40487 h 263.90236 c 0,0 41.0541,41.05567 48.12675,48.12759 z m -483.9061,56.97898 c 20.01942,0 36.25237,-16.23296 36.25237,-36.25237 0,-20.02189 -16.23295,-36.25154 -36.25237,-36.25154 -20.01942,0 -36.25236,16.22965 -36.25236,36.25154 0,20.02106 16.23294,36.25237 36.25236,36.25237 z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.823753" />
+</svg>
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 1746a59d65..3693711bb9 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -208,7 +208,7 @@
         "bicycle_rental"
       ],
       "override": {
-        "id": "charging_station_non_docking",
+        "id": "bicycle_rental_non_docking",
         "minzoom": 14,
         "source": {
           "osmTags": {
@@ -225,7 +225,7 @@
       "override": {
         "name": null,
         "filter": {
-          "sameAs": "charging_station_non_docking"
+          "sameAs": "bicycle_rental_non_docking"
         },
         "minzoom": 18
       }