Merge pull request #13 from sbruggmann/feature/map-hooks

TASK: Added a possability to hook into the layer generation
webexcess · Sep 23, 2020 · 5f36ae8 · 5f36ae8
2 parents 24dafbc + 141453a
commit 5f36ae8
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -25,3 +25,4 @@ WebExcess:
     paddingTopLeft: [100, 100]
     paddingBottomRight: [100, 100]
     mapOptions: []
+    mapHooks: []
diff --git a/Resources/Private/Assets/Main.js b/Resources/Private/Assets/Main.js
@@ -16,6 +16,10 @@ function OpenStreetMap() {
         scrollWheelZoom: false
     };
 
+    var mapHooks = {
+        addMarkersLayerHook: false
+    };
+
     if (!Array.from) {
         Array.from = (function () {
             var toStr = Object.prototype.toString;
@@ -120,7 +124,29 @@ function OpenStreetMap() {
                 markers[mapElement._container.attributes.id.value].push(marker);
                 return marker;
             }
-        }).addTo(mapElement);
+        });
+
+        if (mapHooks.addMarkersLayerHook) {
+            var addMarkersLayerHookResult;
+            try {
+                if (typeof(mapHooks.addMarkersLayerHook) === 'string') {
+                    addMarkersLayerHookResult = window[mapHooks.addMarkersLayerHook](geojsonLayer);
+                } else if (typeof(mapHooks.addMarkersLayerHook) === 'function') {
+                    addMarkersLayerHookResult = mapHooks.addMarkersLayerHook(geojsonLayer);
+                }
+            } catch (e) {
+                console.log(e);
+            }
+
+            if (!addMarkersLayerHookResult) {
+                addMarkersLayerHookResult = geojsonLayer;
+            }
+
+            mapElement.addLayer(addMarkersLayerHookResult);
+        } else {
+            mapElement.addLayer(geojsonLayer);
+        }
+
         mapElement.fitBounds(geojsonLayer.getBounds(), {
             paddingTopLeft: paddingTopLeft,
             paddingBottomRight: paddingBottomRight
@@ -168,6 +194,14 @@ function OpenStreetMap() {
         }
         mapSpecificOptions = Object.assign({}, mapOptions, mapSpecificOptions);
 
+        var mapSpecificHooks = mapContainer.getAttribute('data-map-hooks');
+        if (mapSpecificHooks) {
+            mapSpecificHooks = JSON.parse(mapSpecificHooks);
+        } else {
+            mapSpecificHooks = {};
+        }
+        mapHooks = Object.assign({}, mapHooks, mapSpecificHooks);
+
         mapIds.push(mapId);
         maps[mapId] = new L.Map(mapId, mapSpecificOptions);
         markers[mapId] = [];

diff --git a/Resources/Private/Fusion/Components/Map.fusion b/Resources/Private/Fusion/Components/Map.fusion
@@ -26,6 +26,11 @@ prototype(WebExcess.OpenStreetMap:Map.Component) < prototype(Neos.Fusion:Compone
     mapOptionsRenderer = ${Array.concat(this.defaultMapOptions, this.mapOptions)}
     mapOptionsRenderer.@process.jsonStringify = ${value ? Json.stringify(value) : null}
 
+    mapHooks = Neos.Fusion:RawArray
+    defaultMapHooks = ${Configuration.setting('WebExcess.OpenStreetMap.mapHooks')}
+    mapHooksRenderer = ${Array.concat(this.defaultMapHooks, this.mapHooks)}
+    mapHooksRenderer.@process.jsonStringify = ${value ? Json.stringify(value) : null}
+
     address = null
     latLonRenderer = ${this.address ? Geocode.latLonFromAddress(this.address) : null}
 
@@ -79,6 +84,7 @@ prototype(WebExcess.OpenStreetMap:Map.Component) < prototype(Neos.Fusion:Compone
                     data-popup = ${props.popupRenderer}
                     data-json = ${props.jsonRenderer}
                     data-map-options = ${props.mapOptionsRenderer}
+                    data-map-hooks = ${props.mapHooksRenderer}
                 }
             }
         }

diff --git a/Resources/Public/Assets/Main.js b/Resources/Public/Assets/Main.js