Theme format refactoring: move line properties into a seperate lineRendering configuration

assets/layers/artwork/artwork.json

@@ -404,6 +404,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#0000ff"
+            },
+            "width": {
+                "render": "10"
+            }
         }
     ]
 }

assets/layers/barrier/barrier.json

@@ -330,6 +330,9 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "width": "5"
         }
     ]
 }

assets/layers/bench_at_pt/bench_at_pt.json

@@ -160,6 +160,14 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/bicycle_library/bicycle_library.json

@@ -312,6 +312,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#c00"
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json

@@ -299,6 +299,9 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": "#6bc4f7"
         }
     ]
 }

assets/layers/bike_cafe/bike_cafe.json

@@ -378,6 +378,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#694E2D"
+            },
+            "width": {
+                "render": "2"
+            }
         }
     ]
 }

assets/layers/bike_parking/bike_parking.json

@@ -562,6 +562,10 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": "#00f",
+            "width": "1"
         }
     ]
 }

assets/layers/bike_repair_station/bike_repair_station.json

@@ -840,6 +840,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/bike_shop/bike_shop.json

@@ -775,13 +775,19 @@
                     "badge": true
                 },
                 {
-                    "if": "opening_hours~*",
-                    "then": "isOpen",
+                    "if": "service:bicycle:pump=yes",
+                    "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
                     "badge": true
                 },
                 {
-                    "if": "service:bicycle:pump=yes",
-                    "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
+                    "if": {
+                        "and": [
+                            "service:bicycle:cleaning~*"
+                        ]
+                    },
+                    "then": {
+                        "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
+                    },
                     "badge": true
                 }
             ],
@@ -792,6 +798,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#c00"
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/bike_themed_object/bike_themed_object.json

@@ -82,6 +82,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#AB76D5"
+            },
+            "width": {
+                "render": "2"
+            }
         }
     ]
 }

assets/layers/binocular/binocular.json

@@ -139,6 +139,14 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/cluster_style/cluster_style.json

@@ -51,6 +51,28 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#3c3",
+                "mappings": [
+                    {
+                        "if": "showCount>200",
+                        "then": "#f33"
+                    },
+                    {
+                        "if": "showCount>100",
+                        "then": "#c93"
+                    },
+                    {
+                        "if": "showCount>50",
+                        "then": "#cc3"
+                    }
+                ]
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/crossings/crossings.json

@@ -351,6 +351,9 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "width": "5"
         }
     ]
 }

assets/layers/cycleways_and_roads/cycleways_and_roads.json

@@ -1188,6 +1188,75 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "rgba(170, 170, 170, 0.7)",
+                "mappings": [
+                    {
+                        "if": "highway=cycleway",
+                        "then": "rgba(0, 189, 141, 0.7)"
+                    },
+                    {
+                        "if": "highway=path",
+                        "then": "rgba(204, 74, 207, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=track",
+                        "then": "rgba(113, 3, 200, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=shared_lane",
+                        "then": "rgba(74, 59, 247, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=lane",
+                        "then": "rgba(254, 155, 6, 0.9)"
+                    },
+                    {
+                        "if": "cyclestreet=yes",
+                        "then": "rgba(57, 159, 191, 0.7)"
+                    }
+                ]
+            },
+            "width": {
+                "render": "8"
+            },
+            "dashArray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "oneway=yes",
+                                {
+                                    "or": [
+                                        "highway=cycleway",
+                                        "highway=path"
+                                    ]
+                                }
+                            ]
+                        },
+                        "then": ""
+                    },
+                    {
+                        "if": "cycleway=track",
+                        "then": ""
+                    },
+                    {
+                        "if": "cycleway=shared_lane",
+                        "then": "15 30"
+                    },
+                    {
+                        "if": "cycleway=lane",
+                        "then": "25 15 15 15 25"
+                    },
+                    {
+                        "if": "cyclestreet=yes",
+                        "then": ""
+                    }
+                ]
+            }
         }
     ]
 }

assets/layers/defibrillator/defibrillator.json

@@ -573,6 +573,9 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": "#0000ff"
         }
     ]
 }

assets/layers/direction/direction.json

@@ -64,6 +64,9 @@
             "rotation": {
                 "render": "{_direction:numerical}deg"
             }
+        },
+        {
+            "color": "--catch-detail-color"
         }
     ]
 }

assets/layers/etymology/etymology.json

@@ -190,6 +190,25 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#05d7fcaa",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "name:etymology=",
+                                "name:etymology:wikidata="
+                            ]
+                        },
+                        "then": "#fcca05aa"
+                    }
+                ]
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/grass_in_parks/grass_in_parks.json

@@ -60,6 +60,10 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": "#0f0",
+            "width": "1"
         }
     ]
 }

assets/layers/home_location/home_location.json

@@ -25,6 +25,11 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            }
         }
     ]
 }

assets/layers/information_board/information_board.json

@@ -80,6 +80,11 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            }
         }
     ]
 }

assets/layers/map/map.json

@@ -281,6 +281,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/nature_reserve/nature_reserve.json

@@ -474,6 +474,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#3c3"
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/play_forest/play_forest.json

@@ -129,6 +129,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#007055"
+            },
+            "width": {
+                "render": "2"
+            }
         }
     ]
 }

assets/layers/playground/playground.json

@@ -578,6 +578,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#5dbaa9"
+            },
+            "width": {
+                "render": "1"
+            }
         }
     ]
 }

assets/layers/public_bookcase/public_bookcase.json

@@ -503,6 +503,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#0000ff"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/shops/shops.json

@@ -342,6 +342,14 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/slow_roads/slow_roads.json

@@ -259,6 +259,40 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#eaba2a"
+            },
+            "width": {
+                "render": "7"
+            },
+            "dashArray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": "highway=cycleway",
+                        "then": ""
+                    },
+                    {
+                        "if": "highway=path",
+                        "then": "0 12"
+                    },
+                    {
+                        "if": {
+                            "or": [
+                                "highway=footway",
+                                "highway=pedestrian"
+                            ]
+                        },
+                        "then": "12 18"
+                    },
+                    {
+                        "if": "highway=living_street",
+                        "then": "12 12 0 12"
+                    }
+                ]
+            }
         }
     ]
 }

assets/layers/surveillance_camera/surveillance_camera.json

@@ -531,6 +531,14 @@
                     }
                 ]
             }
+        },
+        {
+            "color": {
+                "render": "#f00"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/layers/trail/trail.json

@@ -228,6 +228,23 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#335D9F",
+                "mappings": [
+                    {
+                        "if": "colour~*",
+                        "then": "{colour}"
+                    }
+                ]
+            },
+            "width": {
+                "render": "3"
+            },
+            "dashArray": {
+                "render": "5 5"
+            }
         }
     ]
 }

assets/layers/viewpoint/viewpoint.json

@@ -78,6 +78,10 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": "#ffffff",
+            "width": "5"
         }
     ]
 }

assets/layers/village_green/village_green.json

@@ -44,6 +44,10 @@
                 "point",
                 "centroid"
             ]
+        },
+        {
+            "color": "#937f20",
+            "width": "1"
         }
     ]
 }

assets/layers/waste_basket/waste_basket.json

@@ -203,6 +203,14 @@
             "location": [
                 "point"
             ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
         }
     ]
 }

assets/themes/aed/aed_brugge.json

@@ -42,6 +42,24 @@
       "iconSize": "20,20,center",
       "tagRenderings": [
         "all_tags"
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:red",
+            "mappings": [
+              {
+                "if": "_has_closeby_feature=yes",
+                "then": "circle:#008000aa"
+              }
+            ]
+          },
+          "iconSize": "20,20,center",
+          "location": [
+            "point"
+          ]
+        },
+        {}
       ]
     }
   ],

assets/themes/buurtnatuur/buurtnatuur.json

@@ -123,6 +123,51 @@
             "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
+          },
+          "iconSize": {
+            "render": "50,50,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3c3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname=",
+                    "operator=",
+                    "access=",
+                    "access:description=",
+                    "leisure=park"
+                  ]
+                },
+                "then": "#cc1100"
+              },
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     {
@@ -221,6 +266,38 @@
             "nl": "Voeg een ontbrekend park toe"
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3c3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     {
@@ -338,6 +415,56 @@
             "nl": "Voeg een ontbrekend bos toe aan de kaart"
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3a3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "operator=",
+                    "access=",
+                    "access:description="
+                  ]
+                },
+                "then": "#cc1100"
+              },
+              {
+                "if": {
+                  "and": [
+                    "operator="
+                  ]
+                },
+                "then": "#cccc00"
+              },
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     "viewpoint"

assets/themes/campersite/campersite.json

@@ -699,6 +699,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     },
@@ -1111,6 +1119,14 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     }

assets/themes/climbing/climbing.json

@@ -585,6 +585,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#0f0"
+          },
+          "width": {
+            "render": "4"
+          }
         }
       ]
     },
@@ -868,6 +876,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#d38d5fAA"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     },
@@ -1005,6 +1021,14 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#ddff55AA"
+          },
+          "width": {
+            "render": "2"
+          }
         }
       ]
     }

assets/themes/cycle_highways/cycle_highways.json

@@ -239,6 +239,41 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#ff7392",
+            "mappings": [
+              {
+                "if": "state=",
+                "then": "#00acfc"
+              },
+              {
+                "if": "state=temporary",
+                "then": "#00acfc"
+              }
+            ]
+          },
+          "width": {
+            "render": "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"
+              }
+            ]
+          }
         }
       ]
     }

assets/themes/cyclestreets/cyclestreets.json

@@ -84,6 +84,18 @@
       "width": "10",
       "tagRenderings": [
         "images"
+      ],
+      "mapRendering": [
+        {
+          "icon": "./assets/themes/cyclestreets/F111.svg",
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": "#0000ff",
+          "width": "10"
+        }
       ]
     },
     {
@@ -136,6 +148,18 @@
       "width": "5",
       "tagRenderings": [
         "images"
+      ],
+      "mapRendering": [
+        {
+          "icon": "./assets/themes/cyclestreets/F113.svg",
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": "#09f9dd",
+          "width": "5"
+        }
       ]
     },
     {
@@ -201,6 +225,30 @@
       },
       "tagRenderings": [
         "images"
+      ],
+      "mapRendering": [
+        {
+          "icon": "./assets/svg/pencil.svg",
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#aaaaaa",
+            "mappings": [
+              {
+                "then": "#0000ff",
+                "if": "cyclestreet=yes"
+              },
+              {
+                "then": "#09f9dd",
+                "if": "proposed:cyclestreet=yes"
+              }
+            ]
+          },
+          "width": "5"
+        }
       ]
     }
   ],

assets/themes/fruit_trees/fruit_trees.json

@@ -80,6 +80,14 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     },
@@ -195,6 +203,14 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     }

assets/themes/grb.json

@@ -215,6 +215,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "2"
+          }
         }
       ]
     }

assets/themes/hackerspaces/hackerspaces.json

@@ -259,6 +259,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     }

assets/themes/hailhydrant/hailhydrant.json

@@ -329,6 +329,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     },
@@ -697,6 +705,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#c22"
+          },
+          "width": {
+            "render": "1"
+          }
         }
       ]
     },
@@ -912,6 +928,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "1"
+          }
         }
       ]
     }

assets/themes/postboxes/postboxes.json

@@ -92,6 +92,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
         }
       ]
     },
@@ -202,6 +210,14 @@
             "point",
             "centroid"
           ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
         }
       ]
     }

assets/themes/speelplekken/speelplekken.json

@@ -42,6 +42,12 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": "#444444",
+          "width": {
+            "render": "1"
+          }
         }
       ]
     },
@@ -266,6 +272,24 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#6d6",
+            "mappings": [
+              {
+                "if": "color~*",
+                "then": "{color}"
+              },
+              {
+                "if": "colour~*",
+                "then": "{colour}"
+              }
+            ]
+          },
+          "width": {
+            "render": "9"
+          }
         }
       ]
     }

assets/themes/uk_addresses/uk_addresses.json

@@ -305,6 +305,30 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#00f",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    {
+                      "and": [
+                        "addr:housenumber=",
+                        "nohousenumber!=yes"
+                      ]
+                    },
+                    "addr:street="
+                  ]
+                },
+                "then": "#ff0"
+              }
+            ]
+          },
+          "width": {
+            "render": "8"
+          }
         }
       ]
     },
@@ -330,6 +354,14 @@
           "location": [
             "point"
           ]
+        },
+        {
+          "color": {
+            "render": "#ccc"
+          },
+          "width": {
+            "render": "0"
+          }
         }
       ]
     }