fix: return promise

Author: sjhoeksma

docs/configure.md

@@ -158,12 +158,12 @@ Behaviors control the look & feel of the map. Changing them will always regenera
 |Method|Parameters|Description|
 |---|---|---|
 |animate|`coordinates`:array, `duration`:number, `properties`:object,`animation`:string|Perform animation on the specified coordinates and for the duration in milliseconds. properties |
-|map||Return the last `map object`|
+|map|[returns `MapObject`]|Return the last `map`|
 |notify|`message`:string, `duration`:number| Show notify `message` at bottom of map. Duration defaults too 2000ms|
 |showPopup|`coordinates`:array,`message`:string|Show a popup at the Coordinates with message
-|setFeatures|`data`:object/string, `layer`:string,`clear`:boolean|Add one ore more GEOJson features to the given layer, when clear is true all features of layer will be deleted before adding.|
-|getFeatures|`layer`:string|Get all features returning a `GEOJson` for the given layer|
+|setFeatures|`data`:object/string, `layer`:string,`clear`:boolean, `merge`:boolean [returns `promise`]|Add one ore more GEOJson features to the given layer, when clear is true all features of layer will be deleted before adding. When `merge` is true merge will done base on feature type and location. |
+|getFeatures|`layer`:string [returns `promise`]|Get all features returning a `GEOJson` for the given layer|
 |clearFeatures|`layer`:string|Clear all features for the given layer|
-|setConfig|`json`:object,`filter`:string/array |Set configuration of the plugin by json, filter by properties. When filter is empty array[] all items will be update, when null only layers is updateor the specified in filter|
-|getConfig|`filter`:string/array |Get configuration of the plugin by returning `json`, filter by properties. When filter is empty array[] all items will be returned, when null only layers is update, or the specified in filter|
-|getZoom||Get current zoom value|
+|setConfig|`json`:object,`filter`:string/array |Set configuration of the plugin by json, filter by properties. When filter is empty array[] all items will be update, when null only layers is update or the specified in filter|
+|getConfig|`filter`:string/array [returns `object`]|Get configuration of the plugin by returning `json`, filter by properties. When filter is empty array[] all items will be returned, when null only layers is update, or the specified in filter|
+|getZoom|[returns `float`]|Get current zoom value|

src/GEOComp.tsx

@@ -255,6 +255,12 @@ var GEOComp = (function () {
         eventDefinitions.forEach((k) => { if (k.value == n || k.value == name) { eventName = k.value } })
         //Double switch will allow fine grained event catching
         switch (name) { //Catch first on name
+          case 'destroy':
+            props.events.onChange({})
+            props.event.onChange({})
+            props.feature.onChange({})
+            _events = {}
+            break;
           case 'map:create':
             return //Internal event only, user should use map:init
           case 'click:feature':
@@ -485,15 +491,20 @@ GEOComp = withMethodExposing(GEOComp, [
           type: "string",
         },
         {
-          name: "clear (optional)",
+          name: "clear",
+          type: "boolean",
+        }
+        ,
+        {
+          name: "merge",
           type: "boolean",
         }
       ]
     },
     execute: async (comp: any, params: any) => {
       var map = comp.exposingValues.events['map:create']
-      if (map) return setFeatures(map, params[0], params[1], params[2] == true)
-      return false
+      if (map) return setFeatures(map, params[0], params[1], params[2] == true, params[3] == true)
+      return Promise.reject(new Error("Map not defined"))
     }
   },
   {
@@ -510,7 +521,7 @@ GEOComp = withMethodExposing(GEOComp, [
     execute: async (comp: any, params: any) => {
       var map = comp.exposingValues.events['map:create']
       if (map) return getFeatures(map, params[0])
-      return false
+      return Promise.reject(new Error("Map not defined"))
     }
   },
   {

src/vendors/Geo.jsx

@@ -199,6 +199,11 @@ function Geo(props) {
       geoRef.innerHTML = "<div id='GEO_" + geoId + "' " + (featureEnabled('largeButtons') ? "class='ol-large'" : "") +
         "  style='height:100%;width:100%'></div>"
 
+      //Check if we have an old geo map if so clean out
+      if (map) {
+        fireEvent("destroy", map)
+        map.getLayers().clear();
+      }
       //The real map object
       var olMap = new Map({
         controls: [],

src/vendors/helpers/Layers.js

@@ -289,54 +289,58 @@ export function findLayer(map, name) {
  * @param {boolean} clear Whether to clear existing features before adding new ones
  * @returns {boolean} True if the layer was found and updated, false otherwise
 */
-export function setFeatures(map, data, name, clear) {
-  const layer = findLayer(map, name);
-  if (layer) {
-    const source = layer.getSource()
-    const reader = (source.getFormat ? source.getFormat() : null) || new GeoJSON({
-      dataProjection: source.get('projection') || 'EPSG:4326', // Assuming the GeoJSON is in WGS 84,
-      featureProjection: map.getView().getProjection() || 'EPSG:3857' // Assuming the map projection
-    })
+export function setFeatures(map, data, name, clear, merge) {
+  return new Promise((reject, resolve) => {
+    const layer = findLayer(map, name);
+    if (layer) {
+      const source = layer.getSource()
+      const reader = (source.getFormat ? source.getFormat() : null) || new GeoJSON({
+        dataProjection: source.get('projection') || 'EPSG:4326', // Assuming the GeoJSON is in WGS 84,
+        featureProjection: map.getView().getProjection() || 'EPSG:3857' // Assuming the map projection
+      })
 
-    //Check if there is a undo stack connected to this source, if so clear and disable
-    var undos = []
-    //Disable all undo stacks
-    map.getControls().forEach((c) => {
-      if (c instanceof UndoRedo && c.getActive()) {
-        undos.push(c)
-        c.setActive(false)
+      //Check if there is a undo stack connected to this source, if so clear and disable
+      var undos = []
+      //Disable all undo stacks
+      map.getControls().forEach((c) => {
+        if (c instanceof UndoRedo && c.getActive()) {
+          undos.push(c)
+          c.setActive(false)
+        }
+      })
+
+      //Check if we should clear te source
+      if (clear) {
+        source.clear()
+        undos.forEach((c) => { c.clear() })
       }
-    })
 
-    //Check if we should clear te source
-    if (clear) {
-      source.clear()
-      undos.forEach((c) => { c.clear() })
-    }
-    if (reader && data) {
-      //Now add the features based on types
-      if (Array.isArray(data)) {
-        data.forEach((rec) => {
+      var features
+      if (reader && data) {
+        //Now add the features based on types
+        if (Array.isArray(data)) {
+          data.forEach((rec) => {
+            if (source.setFeatures) {
+              source.setFeatures(reader.readFeatures(rec))
+            } else {
+              source.addFeatures(reader.readFeatures(rec))
+            }
+          })
+        } else {
           if (source.setFeatures) {
-            source.setFeatures(reader.readFeatures(rec))
+            source.setFeatures(reader.readFeatures(data))
           } else {
-            source.addFeatures(reader.readFeatures(rec))
+            source.addFeatures(reader.readFeatures(data))
           }
-        })
-      } else {
-        if (source.setFeatures) {
-          source.setFeatures(reader.readFeatures(data))
-        } else {
-          source.addFeatures(reader.readFeatures(data))
         }
       }
+      //Enable the undo stack
+      undos.forEach((c) => { c.setActive(true) })
+      //Enable the connected undo check
+      resolve(features)
     }
-    //Enable the undo stack
-    undos.forEach((c) => { c.setActive(true) })
-    //Enable the connected undo check
-    return true//Exit, work is done
-  }
-  return false
+    reject(new Error('Layer (' + name + ') not found'))
+  })
 }