Fix build

Models/ThemeConfig/LayerConfig.ts

@@ -199,7 +199,9 @@ export default class LayerConfig extends WithContextLoader{
             return config;
         });
 
-      
+        if(json.mapRendering === undefined){
+            throw "MapRendering is undefined in "+context
+        }
 
         this.mapRendering = json.mapRendering
             .filter(r => r["icon"] !== undefined || r["label"] !== undefined)

assets/layers/charging_station/charging_station.protojson

@@ -560,69 +560,67 @@
       ]
     }
   ],
-  "icon": {
+  "mapRendering": [
-    "render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
-    "mappings": [
-      {
-        "if": "bicycle=yes",
-        "then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
-      },
-      {
-        "if": {
-          "or": [
-            "car=yes",
-            "motorcar=yes"
-          ]
-        },
-        "then": "pin:#fff;./assets/themes/charging_stations/car.svg"
-      }
-    ]
-  },
-  "iconOverlays": [
     {
-      "if": {
+      "icon": {
-        "or": [
+        "render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
-          "disused:amenity=charging_station",
+        "mappings": [
-          "operational_status=broken"
-        ]
-      },
-      "then": "cross_bottom_right:#c22;"
-    },
-    {
-      "if": {
-        "or": [
-          "proposed:amenity=charging_station",
-          "planned:amenity=charging_station"
-        ]
-      },
-      "then": "./assets/layers/charging_station/under_construction.svg",
-      "badge": true
-    },
-    {
-      "if": {
-        "and": [
-          "bicycle=yes",
           {
-            "or": [
+            "if": "bicycle=yes",
-              "motorcar=yes",
+            "then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
-              "car=yes"
+          },
-            ]
+          {
+            "if": {
+              "or": [
+                "car=yes",
+                "motorcar=yes"
+              ]
+            },
+            "then": "pin:#fff;./assets/themes/charging_stations/car.svg"
           }
         ]
       },
-      "then": "circle:#fff;./assets/themes/charging_stations/car.svg",
+      "iconOverlays": [
-      "badge": true
+        {
+          "if": {
+            "or": [
+              "disused:amenity=charging_station",
+              "operational_status=broken"
+            ]
+          },
+          "then": "cross_bottom_right:#c22;"
+        },
+        {
+          "if": {
+            "or": [
+              "proposed:amenity=charging_station",
+              "planned:amenity=charging_station"
+            ]
+          },
+          "then": "./assets/layers/charging_station/under_construction.svg",
+          "badge": true
+        },
+        {
+          "if": {
+            "and": [
+              "bicycle=yes",
+              {
+                "or": [
+                  "motorcar=yes",
+                  "car=yes"
+                ]
+              }
+            ]
+          },
+          "then": "circle:#fff;./assets/themes/charging_stations/car.svg",
+          "badge": true
+        }
+      ],
+      "iconSize": {
+        "render": "50,50,bottom"
+      }
     }
   ],
-  "width": {
-    "render": "8"
-  },
-  "iconSize": {
-    "render": "50,50,bottom"
-  },
-  "color": {
-    "render": "#00f"
-  },
   "presets": [
     {
       "tags": [

langs/layers/de.json

@@ -544,6 +544,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "name": "Fahrradstationen (Reparatur, Pumpe oder beides)",
         "presets": {
             "0": {

langs/layers/en.json

@@ -547,6 +547,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "name": "Bike stations (repair, pump or both)",
         "presets": {
             "0": {
@@ -2409,6 +2416,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "mappings": {
+                        "0": {
+                            "then": "./assets/layers/defibrillator/aed_checked.svg"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Defibrillators",
         "presets": {
             "0": {
@@ -3848,6 +3866,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "iconSize": {
+                    "mappings": {
+                        "0": {
+                            "then": "Waste Basket"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Waste Basket",
         "presets": {
             "0": {

langs/layers/fi.json

@@ -93,6 +93,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "presets": {
             "0": {
                 "title": "Pyöräpumppu"

langs/layers/fr.json

@@ -456,6 +456,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "name": "Station velo (réparation, pompe à vélo)",
         "presets": {
             "0": {
@@ -756,6 +763,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "mappings": {
+                        "0": {
+                            "then": "./assets/layers/defibrillator/aed_checked.svg"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Défibrillateurs",
         "presets": {
             "0": {

langs/layers/it.json

@@ -456,6 +456,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "name": "Stazioni bici (riparazione, gonfiaggio o entrambi)",
         "presets": {
             "0": {
@@ -772,6 +779,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "mappings": {
+                        "0": {
+                            "then": "./assets/layers/defibrillator/aed_checked.svg"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Defibrillatori",
         "presets": {
             "0": {

langs/layers/nl.json

@@ -896,6 +896,13 @@
         "icon": {
             "render": "./assets/layers/birdhide/birdhide.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/birdhide/birdhide.svg"
+                }
+            }
+        },
         "name": "Vogelkijkhutten",
         "presets": {
             "0": {
@@ -4131,6 +4138,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "iconSize": {
+                    "mappings": {
+                        "0": {
+                            "then": "Vuilnisbak"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Vuilnisbak",
         "presets": {
             "0": {

langs/layers/pt.json

@@ -341,6 +341,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "presets": {
             "0": {
                 "description": "Um aparelho para encher os seus pneus num local fixa no espaço público<h3>Exemplos de bombas de bicicletas</h3><div style='width: 100%; display: flex; align-items: stretch;'><img src='./assets/layers/bike_repair_station/pump_example_manual.jpg' style='height: 200px; width: auto;'/><img src='./assets/layers/bike_repair_station/pump_example.png' style='height: 200px; width: auto;'/><img src='./assets/layers/bike_repair_station/pump_example_round.jpg' style='height: 200px; width: auto;'/></div>"

langs/layers/pt_BR.json

@@ -341,6 +341,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "name": "Estações de bicicletas (reparo, bomba ou ambos)",
         "presets": {
             "0": {

langs/layers/ru.json

@@ -403,6 +403,13 @@
         "icon": {
             "render": "./assets/layers/bike_repair_station/repair_station.svg"
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "render": "./assets/layers/bike_repair_station/repair_station.svg"
+                }
+            }
+        },
         "presets": {
             "0": {
                 "title": "Велосипедный насос"
@@ -722,6 +729,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "icon": {
+                    "mappings": {
+                        "0": {
+                            "then": "./assets/layers/defibrillator/aed_checked.svg"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Дефибрилляторы",
         "presets": {
             "0": {
@@ -1446,6 +1464,17 @@
                 }
             }
         },
+        "mapRendering": {
+            "0": {
+                "iconSize": {
+                    "mappings": {
+                        "0": {
+                            "then": "Контейнер для мусора"
+                        }
+                    }
+                }
+            }
+        },
         "name": "Контейнер для мусора",
         "presets": {
             "0": {

langs/themes/de.json

@@ -751,6 +751,17 @@
                         }
                     }
                 },
+                "mapRendering": {
+                    "0": {
+                        "icon": {
+                            "mappings": {
+                                "0": {
+                                    "then": "./assets/themes/hackerspaces/led.png"
+                                }
+                            }
+                        }
+                    }
+                },
                 "name": "Hackerspace",
                 "presets": {
                     "0": {

langs/themes/en.json

@@ -804,6 +804,17 @@
                         }
                     }
                 },
+                "mapRendering": {
+                    "0": {
+                        "icon": {
+                            "mappings": {
+                                "0": {
+                                    "then": "./assets/themes/hackerspaces/led.png"
+                                }
+                            }
+                        }
+                    }
+                },
                 "name": "Hackerspace",
                 "presets": {
                     "0": {