wo #14: 🐛 add default clustering option to the FeatureCollectionDisplay in the DefaultSettingsPanel

Author: helllth

src/lib/FeatureCollection.js

@@ -34,7 +34,18 @@ export const getDefaultFeatureStyler = (size = 24, colorizer = () => "#2664D8")
     };
   };
 };
-
+export const defaultClusteringOptions = {
+  spiderfyOnMaxZoom: false,
+  showCoverageOnHover: false,
+  zoomToBoundsOnClick: false,
+  maxClusterRadius: 40,
+  disableClusteringAtZoom: 19,
+  animate: false,
+  cismapZoomTillSpiderfy: 12,
+  selectionSpiderfyMinZoom: 12,
+  colorizer: (props) => props.color,
+  clusterIconSize: 30,
+};
 // Since this component is simple and static, there's no parent container for it.
 const FeatureCollection = (props) => {
   const {
@@ -91,16 +102,7 @@ const FeatureCollection = (props) => {
   }
 
   const _clusterOptions = {
-    spiderfyOnMaxZoom: false,
-    showCoverageOnHover: false,
-    zoomToBoundsOnClick: false,
-    maxClusterRadius: 40,
-    disableClusteringAtZoom: 19,
-    animate: false,
-    cismapZoomTillSpiderfy: 12,
-    selectionSpiderfyMinZoom: 12,
-    colorizer: (props) => props.color,
-    clusterIconSize: 30,
+    ...defaultClusteringOptions,
     ...clusteringOptionsFromContext,
     ...clusteringOptions,
   };

src/lib/topicmaps/menu/DefaultSettingsPanel.js

@@ -23,7 +23,7 @@ import {
   TopicMapStylingDispatchContext,
 } from "../../contexts/TopicMapStylingContextProvider";
 import { getSymbolSVGGetter } from "../../tools/uiHelper";
-import { getDefaultFeatureStyler } from "../../FeatureCollection";
+import { defaultClusteringOptions, getDefaultFeatureStyler } from "../../FeatureCollection";
 
 const SettingsPanel = (props) => {
   const { setAppMenuActiveMenuSection, setAppMenuVisible } = useContext(UIDispatchContext);
@@ -184,7 +184,10 @@ const SettingsPanel = (props) => {
           key={"FeatureCollectionDisplayPreview." + _markerSymbolSize + clusteringEnabled}
           featureCollection={previewFeatures}
           clusteringEnabled={previewMapClusteringEnabled || clusteringEnabled}
-          clusterOptions={previewMapClusteringOptions || clusteringOptions}
+          clusterOptions={{
+            ...defaultClusteringOptions,
+            ...(previewMapClusteringOptions || clusteringOptions),
+          }}
           style={style}
           featureStylerScalableImageSize={currentMarkerSize}
           //mapRef={previewMapRef} // commented out because there cannot be a ref in a functional comp and it is bnot needed