diff --git a/loko/assets/static/assets/asset_symbology.js b/loko/assets/static/assets/asset_symbology.js index 7969cf2..deef49c 100644 --- a/loko/assets/static/assets/asset_symbology.js +++ b/loko/assets/static/assets/asset_symbology.js @@ -300,11 +300,11 @@ naturegreensurface: { thematic: 'nature', color: '#2e7d32', - iconUrl: '/static/assets/nature_tree_icon.svg?v=20260521a', - iconSize: 56, - iconClass: 'bi-tree-fill', - glyphCodepoint: 'f5e1', - mapImage: 'icon-nature', + iconUrl: '/static/assets/nature_greensurface_icon.svg?v=20261010a', + iconSize: 52, + iconClass: 'bi-grid-fill', + glyphCodepoint: 'f3fb', + mapImage: 'icon-naturegreensurface', }, natureshrub: { thematic: 'nature', @@ -708,6 +708,7 @@ natureregional: injected.natureregional || (ASSET_TYPE_OVERRIDES.naturetree_regional && ASSET_TYPE_OVERRIDES.naturetree_regional.iconUrl), natureremarkable: injected.natureremarkable || (ASSET_TYPE_OVERRIDES.naturetree_remarkable && ASSET_TYPE_OVERRIDES.naturetree_remarkable.iconUrl), naturedead: injected.naturedead || (ASSET_TYPE_OVERRIDES.naturetree_dead && ASSET_TYPE_OVERRIDES.naturetree_dead.iconUrl), + naturegreensurface: injected.naturegreensurface || (ASSET_TYPE_OVERRIDES.naturegreensurface && ASSET_TYPE_OVERRIDES.naturegreensurface.iconUrl), structures: injected.structures || THEMATIC_CONFIG.structures.iconUrl, roaddrain: injected.roaddrain || ASSET_TYPE_OVERRIDES.roaddrain.iconUrl, roadconcreteblockset: injected.roadconcreteblockset || ASSET_TYPE_OVERRIDES.roadconcreteblockset.iconUrl, @@ -733,6 +734,7 @@ { name: 'icon-trafficlightradarpole', codepoint: 'f4e0', color: '#e53935' }, { name: 'icon-sign', codepoint: 'f82b', color: '#0022ff' }, { name: 'icon-nature', codepoint: 'f5e1', color: '#2e7d32' }, + { name: 'icon-naturegreensurface', codepoint: 'f3fb', color: '#2e7d32' }, { name: 'icon-naturebench', codepoint: 'f5e1', color: '#2e7d32' }, { name: 'icon-natureplanter', codepoint: 'f3ce', color: '#d97706' }, { name: 'icon-naturerwiasset', codepoint: 'f30b', color: '#0277bd' }, @@ -848,6 +850,7 @@ ['any', ['==', ['get', 'management_type'], 'regional'], ['==', ['get', 'management_type'], 'Régional']] ], 'icon-nature-regional', ['==', ['get', 'asset_type'], 'naturetree'], 'icon-nature', + ['==', ['get', 'asset_type'], 'naturegreensurface'], 'icon-naturegreensurface', ['==', ['get', 'asset_type'], 'drain'], 'icon-roaddrain', ['==', ['get', 'asset_type'], 'roaddrain'], 'icon-roaddrain', ['==', ['get', 'category'], 'Ralentisseur'], 'icon-speedbump', diff --git a/loko/assets/static/assets/nature_greensurface_icon.svg b/loko/assets/static/assets/nature_greensurface_icon.svg new file mode 100644 index 0000000..e1f9246 --- /dev/null +++ b/loko/assets/static/assets/nature_greensurface_icon.svg @@ -0,0 +1,69 @@ + diff --git a/loko/assets/static/assets/unified_map_layers.js b/loko/assets/static/assets/unified_map_layers.js index 1fab787..0127bdf 100644 --- a/loko/assets/static/assets/unified_map_layers.js +++ b/loko/assets/static/assets/unified_map_layers.js @@ -158,6 +158,12 @@ function loadUnifiedMapIcons(map) { .then(data => { if (!map.hasImage('icon-nature-dead')) map.addImage('icon-nature-dead', data); }) .catch(e => console.warn('unified_map_layers: could not load nature dead icon', e)); } + // naturegreensurface: dedicated green surface / lawn SVG (52 px) + if (iconUrls.naturegreensurface && !map.hasImage('icon-naturegreensurface')) { + loadNormalisedIcon(iconUrls.naturegreensurface, 52) + .then(data => { if (!map.hasImage('icon-naturegreensurface')) map.addImage('icon-naturegreensurface', data); }) + .catch(e => console.warn('unified_map_layers: could not load naturegreensurface icon', e)); + } // structures: dedicated bridge/tunnel SVG (52 px) if (iconUrls.structures && !map.hasImage('icon-structures')) { diff --git a/loko/assets/templates/assets/unified_index.html b/loko/assets/templates/assets/unified_index.html index 897c2a4..595cfd2 100644 --- a/loko/assets/templates/assets/unified_index.html +++ b/loko/assets/templates/assets/unified_index.html @@ -1357,6 +1357,7 @@ natureregional: "{% static 'assets/nature_tree_icon_regional.svg' %}?v=20261009_round", natureremarkable: "{% static 'assets/nature_tree_icon_remarkable.svg' %}?v=20261009_round", naturedead: "{% static 'assets/nature_tree_icon_dead.svg' %}?v=20261009_round", + naturegreensurface: "{% static 'assets/nature_greensurface_icon.svg' %}?v=20261010a", 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", @@ -1373,7 +1374,7 @@ - - - + + + {% endblock script %} \ No newline at end of file diff --git a/loko/mobile/templates/mobile/assets/assets_index_mobile.html b/loko/mobile/templates/mobile/assets/assets_index_mobile.html index d3bf393..f1a2696 100644 --- a/loko/mobile/templates/mobile/assets/assets_index_mobile.html +++ b/loko/mobile/templates/mobile/assets/assets_index_mobile.html @@ -1134,7 +1134,7 @@ {% endblock content %} {% block extra_scripts %} - +