Update leaflet maplibre

mapentity/forms.py

@@ -138,7 +138,7 @@ def __init__(self, *args, **kwargs):
                     formmodel = self._meta.model
                     modelfield = formmodel._meta.get_field(fieldname)
                     needs_replace_widget = (isinstance(modelfield, GeometryField)
-                                            and not isinstance(formfield.widget, MapWidget))
+                                            and not isinstance(formfield.widget, MapWidget)) # faire gaffe à la refactorisation, garder le nom MapWidget
                     if needs_replace_widget:
                         formfield.widget = MapWidget()
                         if self.instance.pk and self.user:

mapentity/models.py

@@ -139,7 +139,7 @@ def duplicate(self, **kwargs):
 
 class BaseMapEntityMixin(DuplicateMixin, models.Model):
     _entity = None
-    capture_map_image_waitfor = '.leaflet-tile-loaded'
+    capture_map_image_waitfor = '.maplibre-tile-loaded' # faire attention à ceci au moment de mettre en place le control de capture
 
     class Meta:
         abstract = True
@@ -273,6 +273,7 @@ def get_update_url(self):
     def get_delete_url(self):
         return reverse(self._entity.url_name(ENTITY_DELETE), args=[str(self.pk)])
 
+# map image
     def get_map_image_extent(self, srid=API_SRID):
         fieldname = app_settings['GEOM_FIELD_NAME']
         obj = getattr(self, fieldname)

mapentity/settings.py

@@ -1,19 +1,73 @@
 from collections import OrderedDict
 from copy import deepcopy
-
 from django.conf import settings
 from django.contrib.messages import constants as messages
+from django.core.exceptions import ImproperlyConfigured
+from django.utils.translation import gettext_lazy as _
 
 API_SRID = 4326
 
+# Styles par défaut
 _DEFAULT_MAP_STYLES = {
-    'detail': {'weight': 5, 'opacity': 1, 'color': 'yellow', 'arrowColor': '#FF5E00', 'arrowSize': 8},
-    'others': {'opacity': 0.9, 'fillOpacity': 0.7, 'color': 'yellow'},
+    'detail': {'weight': 5, 'opacity': 1, 'color': 'mediumpurple', 'arrowColor': '#FF5E00', 'arrowSize': 8},
+    'others': {'opacity': 0.9, 'fillOpacity': 0.5, 'color': 'yellow'},
     'filelayer': {'color': 'red', 'opacity': 1.0, 'fillOpacity': 0.9, 'weight': 2, 'radius': 5},
     'draw': {'color': '#35FF00', 'opacity': 0.8, 'weight': 3},
     'print': {},
 }
 
+# Tuiles par défaut
+_DEFAULT_TILES = [
+    ('OSM', 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png', '© OpenStreetMap contributors'),
+]
+
+# Config MapLibre par défaut
+_DEFAULT_MAPLIBRE_CONFIG = {
+    'BOUNDS': [[-3.630430, 40.120372], [3.208008, 45.061882]],
+    'DEFAULT_CENTER': [1.3952, 43.5963],
+    'DEFAULT_ZOOM': 5,
+    'SCALE': 'metric',
+    'TILES': _DEFAULT_TILES,
+}
+
+# Merge sécurisé : MAPLIBRE_CONFIG_OVERRIDES
+MAPLIBRE_CONFIG = deepcopy(_DEFAULT_MAPLIBRE_CONFIG)
+
+user_config = getattr(settings, 'MAPLIBRE_CONFIG_OVERRIDES', {})
+
+for key in user_config:
+    if key in MAPLIBRE_CONFIG:
+        MAPLIBRE_CONFIG[key] = user_config[key]
+    else:
+        raise ImproperlyConfigured(f"MAPLIBRE_CONFIG_OVERRIDES contains an unknown key: {key}")
+
+# Validation des champs
+BOUNDS = MAPLIBRE_CONFIG.get("BOUNDS")
+if BOUNDS is not None:
+    if not isinstance(BOUNDS, (list, tuple)) or len(BOUNDS) != 2:
+        raise ImproperlyConfigured(_("BOUNDS must be a list or tuple of two [lon, lat] coordinate pairs."))
+    for point in BOUNDS:
+        if not isinstance(point, (list, tuple)) or len(point) != 2:
+            raise ImproperlyConfigured(_("Each point in BOUNDS must be a list or tuple with two floats (lon, lat)."))
+
+DEFAULT_CENTER = MAPLIBRE_CONFIG.get("DEFAULT_CENTER")
+if not (isinstance(DEFAULT_CENTER, (list, tuple)) and len(DEFAULT_CENTER) == 2):
+    raise ImproperlyConfigured("MAPLIBRE_CONFIG['DEFAULT_CENTER'] must be a list/tuple with two elements - (lon, lat)")
+
+DEFAULT_ZOOM = MAPLIBRE_CONFIG.get("DEFAULT_ZOOM")
+if not (isinstance(DEFAULT_ZOOM, int) and (1 <= DEFAULT_ZOOM <= 24)):
+    raise ImproperlyConfigured("MAPLIBRE_CONFIG['DEFAULT_ZOOM'] must be an int between 1 and 24.")
+
+SCALE = MAPLIBRE_CONFIG.get("SCALE")
+if SCALE is True:
+    MAPLIBRE_CONFIG["SCALE"] = 'metric'
+elif SCALE not in ('metric', 'imperial', None, False):
+    raise ImproperlyConfigured("MAPLIBRE_CONFIG['SCALE'] must be True, False, None, 'metric', or  'imperial'")
+
+if isinstance(MAPLIBRE_CONFIG.get('TILES'), str):
+    MAPLIBRE_CONFIG['TILES'] = [(_('Background'), MAPLIBRE_CONFIG.get('TILES'), '')]
+
+# App settings généraux
 app_settings = dict({
     'TITLE': "Mapentity",
     'HISTORY_ITEMS_MAX': 5,
@@ -28,7 +82,7 @@
     'TEMP_DIR': getattr(settings, 'TEMP_DIR', '/tmp'),
     'MAP_CAPTURE_SIZE': 800,
     'MAP_CAPTURE_MAX_RATIO': 1.25,
-    'GEOM_FIELD_NAME': 'geom',
+    'GEOM_FIELD_NAME': 'geom', # Nom du champ géométrique - utilisé pour début du nom de l'id de la carte qui vaut "geom-map
     'GPX_FIELD_NAME': 'geom',
     'DATE_UPDATE_FIELD_NAME': 'date_update',
     'MAP_BACKGROUND_FOGGED': False,
@@ -46,15 +100,21 @@
     'REGEX_PATH_ATTACHMENTS': r'\.\d+x\d+_q\d+(_crop)?\.(jpg|png|jpeg|bmp|webp)$',
     'MAX_CHARACTERS': None,
     'MAX_CHARACTERS_BY_FIELD': {},
+    'MAPLIBRE_CONFIG': MAPLIBRE_CONFIG,
 }, **getattr(settings, 'MAPENTITY_CONFIG', {}))
 
-# default MAP_STYLES should not be replaced but updated by MAPENTITY_CONFIG
+# Merge sécurisé MAP_STYLES
 _MAP_STYLES = deepcopy(_DEFAULT_MAP_STYLES)
 _MAP_STYLES.update(app_settings['MAP_STYLES'])
 app_settings['MAP_STYLES'] = _MAP_STYLES
 
-CRISPY_TEMPLATE_PACK = 'bootstrap4'
+for name, override in getattr(settings, 'MAP_STYLES', {}).items():
+    merged = app_settings['MAP_STYLES'].get(name, {})
+    merged.update(override)
+    app_settings['MAP_STYLES'][name] = merged
+
 
+## config Tinymce
 TINYMCE_DEFAULT_CONFIG = {
     "theme": "silver",
     "height": 500,
@@ -82,7 +142,7 @@
 TINYMCE_DEFAULT_CONFIG.update(getattr(settings, 'TINYMCE_DEFAULT_CONFIG', {}))
 setattr(settings, 'TINYMCE_DEFAULT_CONFIG', TINYMCE_DEFAULT_CONFIG)
 
-
+# config Rest_Framework
 REST_FRAMEWORK_DEFAULT_CONFIG = {
     # Use Django's standard `django.contrib.auth` permissions,
     # or allow read-only access for unauthenticated users.
@@ -97,62 +157,6 @@
 REST_FRAMEWORK_DEFAULT_CONFIG.update(getattr(settings, 'REST_FRAMEWORK', {}))
 setattr(settings, 'REST_FRAMEWORK', REST_FRAMEWORK_DEFAULT_CONFIG)
 
-for name, override in getattr(settings, 'MAP_STYLES', {}).items():
-    # fallback old settings MAP_STYLES
-    merged = app_settings['MAP_STYLES'].get(name, {})
-    merged.update(override)
-    app_settings['MAP_STYLES'][name] = merged
-
-_LEAFLET_PLUGINS = OrderedDict([
-    ('leaflet.overintent', {
-        'js': 'mapentity/Leaflet.OverIntent/leaflet.overintent.js',
-    }),
-    ('leaflet.label', {
-        'css': 'mapentity/Leaflet.label/dist/leaflet.label.css',
-        'js': 'mapentity/Leaflet.label/dist/leaflet.label.js'
-    }),
-    ('leaflet.spin', {
-        'js': ['paperclip/spin.min.js',
-               'mapentity/Leaflet.Spin/leaflet.spin.js']
-    }),
-    ('leaflet.layerindex', {
-        'js': ['mapentity/RTree/src/rtree.js',
-               'mapentity/Leaflet.LayerIndex/leaflet.layerindex.js']
-    }),
-    ('leaflet.filelayer', {
-        'js': ['mapentity/togeojson/togeojson.js',
-               'mapentity/Leaflet.FileLayer/leaflet.filelayer.js']
-    }),
-    ('leaflet.geometryutil', {
-        'js': 'mapentity/Leaflet.GeometryUtil/dist/leaflet.geometryutil.js'
-    }),
-    ('forms', {}),
-    ('leaflet.snap', {
-        'js': 'mapentity/Leaflet.Snap/leaflet.snap.js'
-    }),
-    ('leaflet.measurecontrol', {
-        'css': 'mapentity/Leaflet.MeasureControl/leaflet.measurecontrol.css',
-        'js': 'mapentity/Leaflet.MeasureControl/leaflet.measurecontrol.js'
-    }),
-    ('leaflet.fullscreen', {
-        'css': 'mapentity/leaflet.fullscreen/Control.FullScreen.css',
-        'js': 'mapentity/leaflet.fullscreen/Control.FullScreen.js'
-    }),
-    ('leaflet.groupedlayercontrol', {
-        'css': 'mapentity/Leaflet.groupedlayercontrol/src/leaflet.groupedlayercontrol.css',
-        'js': 'mapentity/Leaflet.groupedlayercontrol/src/leaflet.groupedlayercontrol.js'
-    }),
-    ('mapentity', {
-        'js': ['mapentity/mapentity.js',
-               'mapentity/mapentity.forms.js'],
-    })
-])
-
-_LEAFLET_CONFIG = getattr(settings, 'LEAFLET_CONFIG', {})
-_LEAFLET_PLUGINS.update(_LEAFLET_CONFIG.get('PLUGINS', {}))  # mapentity plugins first
-_LEAFLET_CONFIG['PLUGINS'] = _LEAFLET_PLUGINS
-setattr(settings, 'LEAFLET_CONFIG', _LEAFLET_CONFIG)
-
 # MODELTRANSLATION config
 _MODELTRANSLATION_LANGUAGES = getattr(settings, 'MODELTRANSLATION_LANGUAGES', tuple(x[0] for x in settings.LANGUAGES))
 _MODELTRANSLATION_DEFAULT_LANGUAGE = getattr(settings, 'MODELTRANSLATION_DEFAULT_LANGUAGE',
@@ -172,6 +176,8 @@
 setattr(settings, 'MESSAGE_TAGS', _MESSAGE_TAGS)
 
 # crispy form default config with bootstrap4
+CRISPY_TEMPLATE_PACK = 'bootstrap4'
+
 _CRISPY_ALLOWED_TEMPLATE_PACKS = getattr(settings, 'CRISPY_ALLOWED_TEMPLATE_PACKS', ('bootstrap4', ))
 setattr(settings, 'CRISPY_ALLOWED_TEMPLATE_PACKS', _CRISPY_ALLOWED_TEMPLATE_PACKS)