Refactoring: cleanup of last incorrect iconSize fields

pietervdvn · Jun 20, 2023 · f4b7e7e · f4b7e7e
1 parent 140c813
commit f4b7e7e
Show file tree

Hide file tree

Showing 12 changed files with 458 additions and 1,249 deletions.
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
@@ -65,7 +65,7 @@
     "en": "A charging station",
     "nl": "Oplaadpunten"
   },
-  "#":"no-question-hint-check",
+  "#": "no-question-hint-check",
   "tagRenderings": [
     "images",
     {
@@ -144,7 +144,7 @@
           }
         },
         {
-          "if":   "access=public",
+          "if": "access=public",
           "then": {
             "en": "Anyone can use this charging station (payment might be needed)",
             "nl": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)"
@@ -804,9 +804,6 @@
       "title": {
         "en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>",
         "nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
       }
     },
     {
@@ -818,9 +815,6 @@
       "title": {
         "en": "charging station for cars",
         "nl": "oplaadstation voor elektrische auto's"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
       }
     }
   ],

diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
@@ -245,7 +245,8 @@
           }
         ]
       },
-      "iconSize": "15,15, bottom"
+      "iconSize": "15,15",
+      "anchor": "bottom"
     }
   ]
 }
diff --git a/assets/layers/windturbine/windturbine.json b/assets/layers/windturbine/windturbine.json
@@ -374,7 +374,8 @@
           }
         ]
       },
-      "iconSize": "40, 40, bottom",
+      "iconSize": "40, 40",
+      "anchor": "bottom",
       "location": [
         "point",
         "centroid"

diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
@@ -54,7 +54,8 @@
         "=mapRendering": [
           {
             "icon": "pin:#ba2792;./assets/themes/cyclofix/key.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "location": [
               "point",
               "centroid"
@@ -82,7 +83,8 @@
         "=mapRendering": [
           {
             "icon": "pin:#ba2792;./assets/themes/cyclofix/key.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "location": [
               "point",
               "centroid"
@@ -133,4 +135,4 @@
       }
     }
   ]
-}
+}
diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
@@ -766,7 +766,7 @@
             "icon": {
               "render": "./assets/svg/robot.svg"
             },
-            "iconSize": "15,15,center"
+            "iconSize": "15,15"
           }
         ]
       }
@@ -777,4 +777,4 @@
   "overpassMaxZoom": 15,
   "osmApiTileSize": 17,
   "credits": "Pieter Vander Vennet"
-}
+}
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -579,7 +579,8 @@
               "point"
             ],
             "icon": "statistics:black",
-            "iconSize": "30,30,center"
+            "iconSize": "30,30",
+            "anchor": "center"
           }
         ]
       }

diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json
@@ -114,7 +114,8 @@
           "icon": {
             "render": "teardrop:#00cc00"
           },
-          "iconSize": "30,30,center"
+          "iconSize": "30,30",
+          "anchor": "center"
         }
       ],
       "filter": [
@@ -276,7 +277,8 @@
               "point"
             ],
             "icon": "statistics:black",
-            "iconSize": "30,30,center"
+            "iconSize": "30,30",
+            "anchor": "center"
           }
         ]
       }

diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
@@ -61,7 +61,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/cafe.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "label": null
           }
         ]
@@ -73,8 +74,7 @@
         "minzoom": 19,
         "mapRendering": [
           {
-            "icon": "circle:white;./assets/themes/onwheels/entrance.svg",
-            "iconSize": "40,40,center"
+            "icon": "circle:white;./assets/themes/onwheels/entrance.svg"
           }
         ],
         "syncSelection": "theme-only",
@@ -120,7 +120,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/restaurant.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "label": null
           }
         ]
@@ -205,8 +206,9 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/parking.svg",
+            "anchor": "bottom",
             "iconSize": {
-              "render": "20,20,bottom",
+              "render": "20,20",
               "mappings": [
                 {
                   "if": {
@@ -215,7 +217,7 @@
                       "capacity:disabled=yes"
                     ]
                   },
-                  "then": "40,40,bottom"
+                  "then": "40,40"
                 }
               ]
             }
@@ -237,7 +239,8 @@
             "icon": {
               "mappings": null
             },
-            "iconSize": "30,30,center",
+            "iconSize": "40,40",
+            "anchor": "center",
             "iconBadges": [
               {
                 "if": "parking_space=disabled",
@@ -268,7 +271,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/shop.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "label": null
           },
           {
@@ -285,7 +289,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/toilet.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           }
         ]
       }
@@ -298,7 +303,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/pharmacy.svg",
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40",
+            "anchor": "bottom",
             "label": null
           }
         ]
@@ -312,7 +318,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/doctor.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           }
         ]
       }
@@ -325,7 +332,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/hospital.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           },
           {
             "color": "#dd463b"
@@ -349,7 +357,8 @@
         "mapRendering": [
           {
             "icon": "circle:white;./assets/themes/onwheels/elevator.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           }
         ]
       }
@@ -362,7 +371,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/hotel.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           }
         ]
       }
@@ -374,7 +384,8 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/government.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": "40,40",
+            "anchor": "bottom"
           }
         ]
       }
@@ -503,4 +514,4 @@
     ]
   },
   "enableDownload": true
-}
+}
diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json
@@ -48,7 +48,7 @@
               "centroid"
             ],
             "icon": "./assets/themes/pets/dog-food.svg",
-            "iconSize": "30,30,center"
+            "iconSize": "30,30"
           }
         ],
         "=presets": [],
@@ -131,7 +131,7 @@
                 }
               ]
             },
-            "iconSize": "30,30,center"
+            "iconSize": "30,30"
           },
           {
             "#": "Rendering of a line",
@@ -220,4 +220,4 @@
     }
   ],
   "credits": "Niels Elgaard Larsen"
-}
+}
diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json
@@ -39,7 +39,7 @@
               "render": null,
               "mappings": null
             },
-            "iconSize": "0,0,bottom"
+            "iconSize": "0,0"
           }
         ]
       }
@@ -404,4 +404,4 @@
       ]
     }
   ]
-}
+}
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -67,9 +67,6 @@
             ],
             "title": {
               "nl": "laadpunt voor elektrische fietsen"
-            },
-            "preciseInput": {
-              "preferredBackground": "map"
             }
           }
         ]
@@ -250,4 +247,4 @@
   "hideFromOverview": true,
   "enableMoreQuests": false,
   "enableShareScreen": false
-}
+}