Merge pull request #68 from PnX-SI/feat/pf_geom_map

Feat/pf geom map
PnX-SI · Dec 11, 2023 · cecc1b8 · cecc1b8
2 parents 7aacf7a + c6a8f97
commit cecc1b8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 534 deletions.
diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml
@@ -19,6 +19,7 @@ layout:
       items:
         type: object
         display: geojson
+        deflate: true
         open_popup: true
         popup_fields: __SITE_MAP_POPUP_FIELDS__
 

diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.ts b/frontend/app/components/layout/object/layout-object-geojson.component.ts
@@ -91,6 +91,7 @@ export class ModulesLayoutObjectGeoJSONComponent
           pane: paneName,
           zoom: bZoom,
           key: this.computedLayout.key,
+          deflate: this.computedLayout.deflate,
           pk_field_name,
           title: utils.capitalize(this.computedLayout.title || this.objectConfig().display.labels),
           style: layerStyle,

diff --git a/frontend/app/services/map.service.ts b/frontend/app/services/map.service.ts
@@ -4,6 +4,7 @@ import { ModulesLayoutService } from './layout.service';
 import { MapService } from '@geonature_common/map/map.service';
 
 import * as L from '@librairies/leaflet';
+import 'Leaflet.Deflate';
 import '@geoman-io/leaflet-geoman-free';
 
 L.PM.initialize({ optIn: true }); // Property 'PM' does not exist on type 'typeof import(".../node_modules/@types/leaflet/index")'.ts(2339)

diff --git a/frontend/app/services/map/layer.ts b/frontend/app/services/map/layer.ts
@@ -205,9 +205,14 @@ export default {
     let layerGroup = this.getLayerData(mapId, key);
 
     if (!layerGroup) {
-      layerGroup = new this.L.FeatureGroup();
-      // layerGroup.key = key;
-      map.addLayer(layerGroup);
+      layerGroup = layerOptions?.deflate
+        ? this.L.deflate({
+            minsize: layerOptions.deflate.minSize || 10,
+            markerType: this.L.circleMarker,
+          })
+        : new this.L.FeatureGroup();
+      layerGroup.addTo(map);
+
       map.controls.addOverlay(
         layerGroup,
         `<span class="fa fa-circle-o" style="color: ${
@@ -253,7 +258,7 @@ export default {
     // creation et ajout des nouveaux layers
     const newLayers = this.createlayersFromGeojson(newGeojson, layerOptions);
     for (const layer of Object.values(newLayers._layers)) {
-      layerGroup.addLayer(layer);
+      (layer as any).addTo(layerGroup);
     }
 
     // mise à jour des layer existants ?????