From 9bdd68bea2af0069a83ee6b7960da9ce52b266b2 Mon Sep 17 00:00:00 2001
From: kdeterme <karl.determe@gmail.com>
Date: Fri, 9 Oct 2026 14:04:08 +0200
Subject: [PATCH] feat: add regional and remarkable nature asset symbology
 icons and matching logic

---
 loko/assets/static/assets/asset_symbology.js    | 14 ++++++++++----
 loko/assets/static/assets/unified_map_layers.js |  7 ++++++-
 loko/assets/templates/assets/unified_index.html |  8 +++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/loko/assets/static/assets/asset_symbology.js b/loko/assets/static/assets/asset_symbology.js
index b83a761..d1eb61c 100644
--- a/loko/assets/static/assets/asset_symbology.js
+++ b/loko/assets/static/assets/asset_symbology.js
@@ -717,6 +717,8 @@
             { name: 'icon-trafficlightradarpole', codepoint: 'f4e0', color: '#e53935' },
             { name: 'icon-sign', codepoint: 'f82b', color: '#0022ff' },
             { name: 'icon-nature', codepoint: 'f5e1', color: '#2e7d32' },
+            { name: 'icon-nature-regional', codepoint: 'f5e1', color: '#1d4ed8' },
+            { name: 'icon-nature-remarkable', codepoint: 'f5e1', color: '#d97706' },
             { name: 'icon-naturebench', codepoint: 'f5e1', color: '#2e7d32' },
             { name: 'icon-natureplanter', codepoint: 'f3ce', color: '#d97706' },
             { name: 'icon-naturerwiasset', codepoint: 'f30b', color: '#0277bd' },
@@ -812,10 +814,14 @@
                 ['==', ['slice', ['get', 'code'], 0, 7], 'CSE-BAC'],
             ], 'icon-natureplanter',
             ['==', ['get', 'asset_type'], 'naturebench'], 'icon-naturebench',
-            ['all', ['==', ['get', 'thematic'], 'nature'], ['==', ['get', 'is_remarkable'], true]], 'icon-nature-remarkable',
-            ['all', ['==', ['get', 'thematic'], 'nature'], ['==', ['get', 'management_type'], 'regional']], 'icon-nature-regional',
-            ['all', ['==', ['get', 'asset_type'], 'naturetree'], ['==', ['get', 'is_remarkable'], true]], 'icon-nature-remarkable',
-            ['all', ['==', ['get', 'asset_type'], 'naturetree'], ['==', ['get', 'management_type'], 'regional']], 'icon-nature-regional',
+            ['all',
+                ['any', ['==', ['get', 'asset_type'], 'naturetree'], ['==', ['get', 'thematic'], 'nature']],
+                ['any', ['==', ['get', 'is_remarkable'], true], ['==', ['get', 'is_remarkable'], 'true'], ['==', ['get', 'is_remarkable'], 1]]
+            ], 'icon-nature-remarkable',
+            ['all',
+                ['any', ['==', ['get', 'asset_type'], 'naturetree'], ['==', ['get', 'thematic'], 'nature']],
+                ['any', ['==', ['get', 'management_type'], 'regional'], ['==', ['get', 'management_type'], 'Régional']]
+            ], 'icon-nature-regional',
             ['==', ['get', 'asset_type'], 'naturetree'], 'icon-nature',
             ['==', ['get', 'asset_type'], 'drain'], 'icon-roaddrain',
             ['==', ['get', 'asset_type'], 'roaddrain'], 'icon-roaddrain',
diff --git a/loko/assets/static/assets/unified_map_layers.js b/loko/assets/static/assets/unified_map_layers.js
index 36beb22..9fd0f9b 100644
--- a/loko/assets/static/assets/unified_map_layers.js
+++ b/loko/assets/static/assets/unified_map_layers.js
@@ -90,7 +90,10 @@ function loadUnifiedMapIcons(map) {
     // ── File-based icons (full colour, non-SDF) ─────────────────────────────
     // UNIFIED_ICON_URLS is set in the inline <script> of unified_index.html
     // using {% static %} so the URL is resolved server-side.
-    const iconUrls = (typeof UNIFIED_ICON_URLS !== 'undefined') ? UNIFIED_ICON_URLS : {};
+    const injected = (typeof UNIFIED_ICON_URLS !== 'undefined') ? UNIFIED_ICON_URLS : {};
+    const iconUrls = (typeof AssetSymbology !== 'undefined' && AssetSymbology.getIconUrls)
+        ? Object.assign({}, AssetSymbology.getIconUrls(), injected)
+        : injected;
 
     // trafficlights: traffic_light_icon.svg  (56 px)
     if (iconUrls.trafficlights && !map.hasImage('icon-trafficlights')) {
@@ -231,6 +234,8 @@ function loadUnifiedMapIcons(map) {
             { name: 'icon-trafficlightsequipment', codepoint: 'f1d5', color: '#331110' },
             { name: 'icon-sign', codepoint: 'f82b', color: '#0022ff' },
             { name: 'icon-nature', codepoint: 'f5e1', color: '#2e7d32' },
+            { name: 'icon-nature-regional', codepoint: 'f5e1', color: '#1d4ed8' },
+            { name: 'icon-nature-remarkable', codepoint: 'f5e1', color: '#d97706' },
             { name: 'icon-structures', codepoint: 'f876', color: '#6d4c41' },
             { name: 'icon-its', codepoint: 'f1d5', color: '#0288d1' },
             { name: 'icon-clean', codepoint: 'f78a', color: '#5e5e5e' },
diff --git a/loko/assets/templates/assets/unified_index.html b/loko/assets/templates/assets/unified_index.html
index c8a5be6..e7dea0c 100644
--- a/loko/assets/templates/assets/unified_index.html
+++ b/loko/assets/templates/assets/unified_index.html
@@ -1354,6 +1354,8 @@
             publiclighting:                 "{% static 'assets/public_lamp_post_icon.svg' %}?v=20260521c",
             publiclightingelectricalcabinet: "{% static 'assets/electrical-panel.png' %}",
             nature:                        "{% static 'assets/nature_tree_icon.svg' %}?v=20260521a",
+            natureregional:                "{% static 'assets/nature_tree_icon_regional.svg' %}?v=20261009a",
+            natureremarkable:              "{% static 'assets/nature_tree_icon_remarkable.svg' %}?v=20261009a",
             structures:                    "{% static 'assets/structures_bridge_tunnel_icon.svg' %}?v=20260522b",
             roaddrain:                     "{% static 'assets/roaddrain_grille_icon.svg' %}?v=20260521a",
             speedbump:                     "{% static 'assets/road_speedbump_icon.svg' %}?v=20260920",
@@ -1370,7 +1372,7 @@
     <script src="{% static 'common/base_script.js' %}"></script>
     <script src="{% static 'common/base_map.js' %}"></script>
     <script src="{% static 'assets/sign_panels_shared.js' %}?v=20260703c"></script>
-    <script src="{% static 'assets/asset_symbology.js' %}?v=20260920_grid_options"></script>
-    <script src="{% static 'assets/unified_map_layers.js' %}?v=20260920_grid_options"></script>
-    <script src="{% static 'assets/unified_index.js' %}?v=20260920_grid_options"></script>
+    <script src="{% static 'assets/asset_symbology.js' %}?v=20261009_tree_icons"></script>
+    <script src="{% static 'assets/unified_map_layers.js' %}?v=20261009_tree_icons"></script>
+    <script src="{% static 'assets/unified_index.js' %}?v=20261009_tree_icons"></script>
 {% endblock script %}
\ No newline at end of file