diff --git a/loko/assets/static/assets/asset_symbology.js b/loko/assets/static/assets/asset_symbology.js
index deef49c..600dae8 100644
--- a/loko/assets/static/assets/asset_symbology.js
+++ b/loko/assets/static/assets/asset_symbology.js
@@ -34,7 +34,7 @@
color: '#2e7d32', // vert — green spaces
iconClass: 'bi-tree-fill',
glyphCodepoint: 'f5e1',
- iconUrl: '/static/assets/nature_tree_icon.svg?v=20260521a',
+ iconUrl: '/static/assets/nature_tree_icon.svg?v=20261012_circle',
iconSize: 56,
mapImage: 'icon-nature',
},
@@ -264,7 +264,7 @@
naturetree_regional: {
thematic: 'nature',
color: '#1d4ed8',
- iconUrl: '/static/assets/nature_tree_icon_regional.svg?v=20261009_round',
+ iconUrl: '/static/assets/nature_tree_icon_regional.svg?v=20261012_circle',
iconSize: 56,
iconClass: 'bi-tree',
glyphCodepoint: 'f5e1',
@@ -273,7 +273,7 @@
naturetree_remarkable: {
thematic: 'nature',
color: '#d97706',
- iconUrl: '/static/assets/nature_tree_icon_remarkable.svg?v=20261009_round',
+ iconUrl: '/static/assets/nature_tree_icon_remarkable.svg?v=20261012_circle',
iconSize: 56,
iconClass: 'bi-tree',
glyphCodepoint: 'f5e1',
@@ -282,7 +282,7 @@
naturetree_dead: {
thematic: 'nature',
color: '#6b7280',
- iconUrl: '/static/assets/nature_tree_icon_dead.svg?v=20261009_round',
+ iconUrl: '/static/assets/nature_tree_icon_dead.svg?v=20261012_circle',
iconSize: 56,
iconClass: 'bi-tree',
glyphCodepoint: 'f5e1',
@@ -291,7 +291,7 @@
naturetree: {
thematic: 'nature',
color: '#2e7d32',
- iconUrl: '/static/assets/nature_tree_icon.svg?v=20261009_round',
+ iconUrl: '/static/assets/nature_tree_icon.svg?v=20261012_circle',
iconSize: 56,
iconClass: 'bi-tree-fill',
glyphCodepoint: 'f5e1',
@@ -309,7 +309,7 @@
natureshrub: {
thematic: 'nature',
color: '#2e7d32',
- iconUrl: '/static/assets/nature_tree_icon.svg?v=20260521a',
+ iconUrl: '/static/assets/nature_tree_icon.svg?v=20261012_circle',
iconSize: 56,
iconClass: 'bi-tree-fill',
glyphCodepoint: 'f5e1',
diff --git a/loko/assets/static/assets/nature_location_detail.js b/loko/assets/static/assets/nature_location_detail.js
index 52b8a0d..7cda78d 100644
--- a/loko/assets/static/assets/nature_location_detail.js
+++ b/loko/assets/static/assets/nature_location_detail.js
@@ -201,9 +201,23 @@ document.addEventListener('DOMContentLoaded', function () {
16, 7,
19, 12
],
- 'circle-color': '#15803d',
+ 'circle-color': [
+ 'case',
+ ['any',
+ ['==', ['get', 'is_dead'], true],
+ ['==', ['get', 'is_dead'], 'true'],
+ ['==', ['get', 'is_dead'], 1],
+ ['==', ['get', 'status'], 'Mort'],
+ ['==', ['get', 'status'], 'dead'],
+ ['==', ['get', 'vitality'], 'Mort'],
+ ['==', ['get', 'vitality'], 'dead']
+ ], '#6b7280',
+ ['any', ['==', ['get', 'is_remarkable'], true], ['==', ['get', 'is_remarkable'], 'true'], ['==', ['get', 'is_remarkable'], 1]], '#d97706',
+ ['any', ['==', ['get', 'management_type'], 'regional'], ['==', ['get', 'management_type'], 'Régional']], '#1d4ed8',
+ '#2e7d32'
+ ],
'circle-stroke-width': 2,
- 'circle-stroke-color': '#ffffff'
+ 'circle-stroke-color': '#5d4037'
}
});
diff --git a/loko/assets/static/assets/nature_tree_icon.svg b/loko/assets/static/assets/nature_tree_icon.svg
index 995bb33..0d9d1b7 100644
--- a/loko/assets/static/assets/nature_tree_icon.svg
+++ b/loko/assets/static/assets/nature_tree_icon.svg
@@ -4,17 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/loko/assets/static/assets/nature_tree_icon_dead.svg b/loko/assets/static/assets/nature_tree_icon_dead.svg
index cac81e3..f9d3ec0 100644
--- a/loko/assets/static/assets/nature_tree_icon_dead.svg
+++ b/loko/assets/static/assets/nature_tree_icon_dead.svg
@@ -4,17 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/loko/assets/static/assets/nature_tree_icon_regional.svg b/loko/assets/static/assets/nature_tree_icon_regional.svg
index a07855d..064e92b 100644
--- a/loko/assets/static/assets/nature_tree_icon_regional.svg
+++ b/loko/assets/static/assets/nature_tree_icon_regional.svg
@@ -4,17 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/loko/assets/static/assets/nature_tree_icon_remarkable.svg b/loko/assets/static/assets/nature_tree_icon_remarkable.svg
index 2453db7..a180600 100644
--- a/loko/assets/static/assets/nature_tree_icon_remarkable.svg
+++ b/loko/assets/static/assets/nature_tree_icon_remarkable.svg
@@ -4,17 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/loko/assets/templates/assets/nature_index.html b/loko/assets/templates/assets/nature_index.html
index a39a25c..02257db 100644
--- a/loko/assets/templates/assets/nature_index.html
+++ b/loko/assets/templates/assets/nature_index.html
@@ -176,23 +176,27 @@
],
'circle-color': [
'case',
- ['==', ['get', 'management_type'], 'regional'], '#1E3A8A',
- ['boolean', ['get', 'is_remarkable'], false], '#F59E0B',
- ['coalesce', ['get', 'color'], '#15803D']
+ ['any',
+ ['==', ['get', 'is_dead'], true],
+ ['==', ['get', 'is_dead'], 'true'],
+ ['==', ['get', 'is_dead'], 1],
+ ['==', ['get', 'status'], 'dead'],
+ ['==', ['get', 'status'], 'archived'],
+ ['==', ['get', 'vitality'], 'dead']
+ ], '#6b7280',
+ ['any', ['==', ['get', 'is_remarkable'], true], ['==', ['get', 'is_remarkable'], 'true'], ['==', ['get', 'is_remarkable'], 1]], '#d97706',
+ ['any', ['==', ['get', 'management_type'], 'regional'], ['==', ['get', 'management_type'], 'Régional']], '#1d4ed8',
+ ['coalesce', ['get', 'color'], '#2e7d32']
],
'circle-stroke-width': [
'case',
['boolean', ['feature-state', 'highlighted'], false], 2.5,
- ['==', ['get', 'management_type'], 'regional'], 1.5,
- ['boolean', ['get', 'is_remarkable'], false], 2,
- 1
+ 1.5
],
'circle-stroke-color': [
'case',
['boolean', ['feature-state', 'highlighted'], false], '#EF4444',
- ['==', ['get', 'management_type'], 'regional'], '#93C5FD',
- ['boolean', ['get', 'is_remarkable'], false], '#FEF08A',
- '#064E3B'
+ '#5d4037'
],
'circle-opacity': 0.8
},
diff --git a/loko/assets/templates/assets/nature_locations_detail.html b/loko/assets/templates/assets/nature_locations_detail.html
index b8f4656..795e9ca 100644
--- a/loko/assets/templates/assets/nature_locations_detail.html
+++ b/loko/assets/templates/assets/nature_locations_detail.html
@@ -701,5 +701,5 @@
-
+
{% endblock script %}
diff --git a/loko/assets/templates/assets/unified_index.html b/loko/assets/templates/assets/unified_index.html
index df74545..51bcf5f 100644
--- a/loko/assets/templates/assets/unified_index.html
+++ b/loko/assets/templates/assets/unified_index.html
@@ -1505,10 +1505,10 @@
trafficlightelectricalcabinet: "{% static 'assets/electrical-panel.png' %}",
publiclighting: "{% static 'assets/public_lamp_post_icon.svg' %}?v=20260521c",
publiclightingelectricalcabinet: "{% static 'assets/electrical-panel.png' %}",
- nature: "{% static 'assets/nature_tree_icon.svg' %}?v=20261009_round",
- 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",
+ nature: "{% static 'assets/nature_tree_icon.svg' %}?v=20261012_circle",
+ natureregional: "{% static 'assets/nature_tree_icon_regional.svg' %}?v=20261012_circle",
+ natureremarkable: "{% static 'assets/nature_tree_icon_remarkable.svg' %}?v=20261012_circle",
+ naturedead: "{% static 'assets/nature_tree_icon_dead.svg' %}?v=20261012_circle",
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",
@@ -1526,7 +1526,7 @@
-
-
-
+
+
+
{% endblock script %}
\ No newline at end of file
diff --git a/loko/assets/views/nature.py b/loko/assets/views/nature.py
index 48b73ca..8bc5a86 100644
--- a/loko/assets/views/nature.py
+++ b/loko/assets/views/nature.py
@@ -233,6 +233,8 @@ def nature_locations_detail(request, location_id):
"height": f"{tree.height} m" if tree.height else '',
"status": tree.get_status_display(),
"is_remarkable": tree.is_remarkable,
+ "management_type": tree.management_type or '',
+ "is_dead": (tree.vitality == 'dead' or tree.status == 'dead' or tree.status == 'archived'),
"lon": tree.lon,
"lat": tree.lat,
"detail_url": reverse('assets:nature_assets_detail', kwargs={'asset_model': 'naturetree', 'asset_id': tree.id}),
diff --git a/loko/mobile/templates/mobile/assets/assets_index_mobile.html b/loko/mobile/templates/mobile/assets/assets_index_mobile.html
index f1a2696..1486bd1 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 %}
-
+