Theme(street_lighting): Add utility poles (#1642)

assets/layers/street_lamps/street_lamps.json

@@ -82,6 +82,26 @@
   ],
   "tagRenderings": [
     "images",
+    {
+      "id": "utility_pole",
+      "question": {
+        "en": "Is this lamp mounted on a utility pole?"
+      },
+      "mappings": [
+        {
+          "if": "man_made=utility_pole",
+          "then": {
+            "en": "This lamp is mounted on a utility pole"
+          }
+        },
+        {
+          "if": "man_made=",
+          "then": {
+            "en": "This lamp is not mounted on a utility pole"
+          }
+        }
+      ]
+    },
     {
       "id": "ref",
       "render": {
@@ -104,7 +124,10 @@
       },
       "freeform": {
         "key": "ref"
-      }
+      },
+      "labels": [
+        "street_lamp_question"
+      ]
     },
     {
       "id": "support",
@@ -194,6 +217,10 @@
             "cs": "Toto svítidlo se montuje na stěnu pomocí kovové tyče"
           }
         }
+      ],
+      "condition": "man_made!=utility_pole",
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -206,7 +233,12 @@
         "ca": "Com està muntat aquest fanal al pal?",
         "cs": "Jak se tato lampa montuje na sloup?"
       },
-      "condition": "support=pole",
+      "condition": {
+        "and": [
+          "support=pole",
+          "man_made!=utility_pole"
+        ]
+      },
       "mappings": [
         {
           "if": "lamp_mount=straight_mast",
@@ -230,6 +262,9 @@
             "cs": "Tato lampa je umístěna na konci ohnutého stožáru"
           }
         }
+      ],
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -376,6 +411,9 @@
             "cs": "Tato lampa svítí pomocí plynu"
           }
         }
+      ],
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -434,6 +472,9 @@
             "cs": "Tato lampa vydává oranžové světlo"
           }
         }
+      ],
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -482,6 +523,9 @@
             "es": "Esta lámpara tiene 2 accesorios"
           }
         }
+      ],
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -539,6 +583,9 @@
             "cs": "Tato lampa se rozsvítí na základě požadavku (např. pomocí tlačítka)"
           }
         }
+      ],
+      "labels": [
+        "street_lamp_question"
       ]
     },
     {
@@ -563,7 +610,10 @@
       "freeform": {
         "key": "light:direction",
         "type": "direction"
-      }
+      },
+      "labels": [
+        "street_lamp_question"
+      ]
     }
   ],
   "deletion": {},
@@ -571,4 +621,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": false
   }
-}
+}

assets/layers/utility_pole/license_info.json

@@ -0,0 +1,10 @@
+[
+  {
+    "path": "utility_pole.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]

assets/layers/utility_pole/utility_pole.json

@@ -0,0 +1,65 @@
+{
+  "id": "utility_pole",
+  "name": {
+    "en": "Utility Poles"
+  },
+  "source": {
+    "osmTags": "man_made=utility_pole"
+  },
+  "title": {
+    "en": "Utility Pole"
+  },
+  "description": {
+    "en": "Layer showing various types of utility poles."
+  },
+  "tagRenderings": [
+    {
+      "id": "street_lamp",
+      "question": {
+        "en": "Does this utility pole have a street lamp mounted on it?"
+      },
+      "mappings": [
+        {
+          "if": "highway=street_lamp",
+          "then": {
+            "en": "This utility pole has a street lamp mounted on it."
+          }
+        },
+        {
+          "if": "highway=",
+          "then": {
+            "en": "This utility pole does not have a street lamp mounted on it."
+          }
+        }
+      ]
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "man_made=utility_pole"
+      ],
+      "title": {
+        "en": "a utility pole"
+      }
+    }
+  ],
+  "pointRendering": [
+    {
+      "marker": [
+        {
+          "icon": "./assets/layers/utility_pole/utility_pole.svg"
+        }
+      ],
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "minzoom": 18,
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  }
+}

assets/layers/utility_pole/utility_pole.svg

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="500"
+   height="500"
+   viewBox="0 0 500 500"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="utility_pole.svg"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   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="defs6" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.46831027"
+     inkscape:cx="25.624038"
+     inkscape:cy="541.30779"
+     inkscape:window-width="1704"
+     inkscape:window-height="996"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <g
+     id="g6"
+     transform="matrix(1.3262599,0,0,1.3262599,150.53051,8.85e-6)">
+    <rect
+       x="62"
+       y="27"
+       width="25"
+       height="350"
+       fill="#000000"
+       id="rect1" />
+    <rect
+       y="0"
+       width="15"
+       height="150"
+       transform="rotate(-90)"
+       fill="#000000"
+       id="rect2"
+       x="-27" />
+    <rect
+       x="4"
+       width="8"
+       height="12"
+       fill="#000000"
+       id="rect3"
+       y="0" />
+    <rect
+       x="15"
+       width="8"
+       height="12"
+       fill="#000000"
+       id="rect4"
+       y="0" />
+    <rect
+       x="127"
+       width="8"
+       height="12"
+       fill="#000000"
+       id="rect5"
+       y="0" />
+    <rect
+       x="138"
+       width="8"
+       height="12"
+       fill="#000000"
+       id="rect6"
+       y="0" />
+  </g>
+</svg>

assets/layers/utility_pole/utility_pole.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde
+SPDX-License-Identifier: CC0-1.0

assets/themes/street_lighting/street_lighting.json

@@ -45,6 +45,19 @@
   ],
   "layers": [
     "street_lamps",
+    {
+      "builtin": "utility_pole",
+      "override": {
+        "tagRenderings+": [
+          {
+            "builtin": "street_lamps.street_lamp_question",
+            "override": {
+              "condition": "highway=street_lamp"
+            }
+          }
+        ]
+      }
+    },
     {
       "id": "lit_streets",
       "name": {

assets/themes/street_lighting_assen/street_lighting_assen.json

@@ -15,7 +15,13 @@
   ],
   "hideFromOverview": true,
   "layers": [
-    "street_lamps",
+    {
+      "builtin": "street_lamps",
+      "hideTagRenderingsWithLabels": [
+        "utility_pole"
+      ],
+      "override": {}
+    },
     {
       "id": "assen",
       "name": "Dataset Assen",
@@ -76,4 +82,4 @@
       }
     }
   ]
-}
+}