@situm/cordova 3.5.2 → 3.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@situm/cordova",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "description": "Situm Wayfinding for Capacitor and Cordova. Integrate plug&play indoor navigation experience with floorplans, POIs, routes and turn-by-turn directions in no time. With the power of Situm.",
   "private": false,
   "repository": "https://github.com/situmtech/cordova",

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="@situm/cordova"
-    version="3.5.2">
+    version="3.5.4">
     <name>Situm Cordova plugin Official</name>
     <description>This is the stable branch.</description>
     <license>MIT</license>
@@ -46,6 +46,7 @@
        </config-file>
 
         <source-file src="src/android/app/src/main/java/es/situm/plugin/SitumPlugin.java" target-dir="src/es/situm/plugin" />
+        <source-file src="src/android/app/src/main/java/es/situm/plugin/JsonUtils.java" target-dir="src/es/situm/plugin" />
         <source-file src="src/android/app/src/main/java/es/situm/plugin/PluginHelper.java" target-dir="src/es/situm/plugin" />
         <source-file src="src/android/app/src/main/java/es/situm/plugin/SitumMapper.java" target-dir="src/es/situm/plugin" />
         <source-file src="src/android/app/src/main/java/es/situm/plugin/DateUtils.java" target-dir="src/es/situm/plugin" />

package/src/android/app/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation ('com.googlecode.json-simple:json-simple:1.1.1'){
         exclude group: 'junit', module:'junit'
     }
-    implementation ('es.situm:situm-sdk:3.12.0@aar') {
+    implementation ('es.situm:situm-sdk:3.13.0@aar') {
         transitive = true
     }
     implementation 'org.apache.cordova:framework:10.1.1'

package/src/android/app/src/main/java/es/situm/plugin/JsonUtils.java

@@ -0,0 +1,52 @@
+package es.situm.plugin;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+public class JsonUtils {
+
+
+    public static Map<String, Object> toMap(JSONObject jsonObject) {
+        if (jsonObject == null) {
+            return new HashMap<>();
+        }
+        Map<String, Object> finalMap = new HashMap<>();
+        Stack<Object> stack = new Stack<>();
+        Stack<Map<String, Object>> mapsStack = new Stack<>();
+        stack.push(jsonObject);
+        mapsStack.push(finalMap);
+        while (!stack.isEmpty()) {
+            Object item = stack.pop();
+            Map<String, Object> map = mapsStack.pop();
+            if (item instanceof JSONObject) {
+                Iterator<String> keys = ((JSONObject) item).keys();
+                while (keys.hasNext()) {
+                    String key = keys.next();
+                    Object value = null;
+                    try {
+                        value = ((JSONObject) item).get(key);
+                    } catch (JSONException e) {
+
+                    }
+                    if (value instanceof JSONObject) {
+                        stack.push(value);
+                        Map<String, Object> newMap = new HashMap<>();
+                        mapsStack.push(newMap);
+                        map.put(key, newMap);
+                    } else {
+                        map.put(key, value);
+                    }
+                }
+            }
+        }
+        return finalMap;
+    }
+}

package/src/android/app/src/main/java/es/situm/plugin/PluginHelper.java

@@ -19,6 +19,7 @@ import org.json.JSONObject;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import es.situm.sdk.SitumSdk;
 import es.situm.sdk.communication.CommunicationManager;
@@ -38,6 +39,7 @@ import es.situm.sdk.model.directions.Route;
 import es.situm.sdk.model.location.Location;
 import es.situm.sdk.model.navigation.NavigationProgress;
 import es.situm.sdk.model.realtime.RealTimeData;
+import es.situm.sdk.navigation.ExternalNavigation;
 import es.situm.sdk.navigation.NavigationListener;
 import es.situm.sdk.navigation.NavigationManager;
 import es.situm.sdk.navigation.NavigationRequest;
@@ -650,6 +652,50 @@ public class PluginHelper {
         callbackContext.sendPluginResult(new PluginResult(Status.OK, "Cache invalidated"));
     }
 
+    public void updateNavigationState(final CordovaInterface cordova,
+        CordovaWebView webView,
+        JSONArray args,
+        final CallbackContext callbackContext) {
+            ExternalNavigation externalNavigation = null;
+            try {
+                JSONObject jsonObject = args.getJSONObject(0);
+                String type = jsonObject.getString("messageType");
+                ExternalNavigation.MessageType messageType;
+                switch (type) {
+                    case "NavigationStarted":
+                        messageType = ExternalNavigation.MessageType.NAVIGATION_STARTED;
+                        break;
+                  case "NavigationUpdated":
+                    messageType = ExternalNavigation.MessageType.NAVIGATION_UPDATED;
+                    break;
+                  case "DestinationReached":
+                    messageType = ExternalNavigation.MessageType.DESTINATION_REACHED;
+                    break;
+                  case "OutsideRoute":
+                    messageType = ExternalNavigation.MessageType.OUTSIDE_ROUTE;
+                    break;
+                  case "NavigationCancelled":
+                    messageType = ExternalNavigation.MessageType.NAVIGATION_CANCELLED;
+                    break;
+                    default:
+                      callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "MessageType invalid"));
+                        return;
+                }
+                Map<String, Object> payload;
+                if (jsonObject.has("payload")) {
+                    payload = JsonUtils.toMap(jsonObject.getJSONObject("payload"));
+                  } else {
+                    payload = new HashMap<>();
+                  }
+                externalNavigation = new ExternalNavigation(messageType,payload);
+            } catch (JSONException e) {
+              callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error parsing the external navigation json" + e.getMessage()));
+            }
+
+            getNavigationManagerInstance().updateNavigationState(externalNavigation);
+            callbackContext.sendPluginResult(new PluginResult(Status.OK, "Navigation state changed"));
+    }
+
     public void requestNavigationUpdates(final CordovaInterface cordova,
      CordovaWebView webView,
      JSONArray args,

package/src/android/app/src/main/java/es/situm/plugin/SitumPlugin.java

@@ -102,6 +102,8 @@ public class SitumPlugin extends CordovaPlugin {
       getPluginInstance().requestRealTimeUpdates(cordova, webView, args, callbackContext);
     } else  if(action.equalsIgnoreCase("removeRealTimeUpdates")) {
       getPluginInstance().removeRealTimeUpdates(cordova, webView, args, callbackContext);
+    } else  if(action.equalsIgnoreCase("updateNavigationState")) {
+      getPluginInstance().updateNavigationState(cordova, webView, args, callbackContext);
     } else {
       getPluginInstance().returnDefaultResponse(callbackContext);
     }

package/src/android/situm.gradle

@@ -12,7 +12,7 @@ allprojects {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation('es.situm:situm-sdk:3.12.0@aar') {
+    implementation('es.situm:situm-sdk:3.13.0@aar') {
         transitive = true
     }
 }

package/www/Interfaces.js

@@ -650,6 +650,22 @@ var DirectionsRequest = {
 
 module.exports = DirectionsRequest;
 
+
+/**
+ * @name
+ * ExternalNavigation
+ * @description
+ * For internal use only.
+ * @property {String} messageType
+ * @property {Map} payload 
+ */
+var ExternalNavigation = {
+  messageType,
+  payload
+};
+
+module.exports = ExternalNavigation;
+
 /**
  * @name
  * DirectionsOptions

package/www/map-view-controller.js

@@ -52,6 +52,7 @@ class MapViewControllerImpl {
   _buildings = undefined;
   _mapView = undefined;
   _isNavigating = false;
+  _navigationType = "";
 
   constructor() {
     Situm.internalSetEventDelegate(this._handleSdkNativeEvents.bind(this));
@@ -59,6 +60,23 @@ class MapViewControllerImpl {
 
   _prepare(mapView) {
     this._mapView = mapView;
+    let useViewerNavigation = mapView.getAttribute('use-viewer-navigation')
+      ? mapView.getAttribute('use-viewer-navigation')
+      : null;
+    if (useViewerNavigation != null) {
+      this._setNavigationType(useViewerNavigation);
+    }
+  }
+
+  _setNavigationType(useViewerNavigation) {
+    if (useViewerNavigation) {
+      if (useViewerNavigation === "true") {
+        this._navigationType = 'webAssembly';
+      } else {
+        this._navigationType = 'sdk';
+      }
+    }
+     
   }
 
   _setOnLoadCallback(callback) {
@@ -141,6 +159,9 @@ class MapViewControllerImpl {
           this._onLoadCallback(this);
           console.debug('Map is ready!');
         }
+        if (this._navigationType) {
+          this._sendNavigationConfig(this._navigationType);
+        }
         break;
       case 'cartography.poi_selected':
         console.debug(`poi (${m.payload.identifier}) was selected`);
@@ -170,6 +191,15 @@ class MapViewControllerImpl {
       case 'navigation.stopped':
         this._onNavigationCancel();
         break;
+      case 'viewer.navigation.started':
+        this._onViewerNavigationStarted(m.payload);
+        break;
+      case 'viewer.navigation.updated':
+        this._onViewerNavigationUpdated(m.payload);
+        break;
+      case 'viewer.navigation.stopped':
+        this._onViewerNavigationStopped(m.payload);
+        break;
       default:
         console.debug('Got unmanaged message: ', m);
         break;
@@ -317,6 +347,45 @@ class MapViewControllerImpl {
     );
   }
 
+  _onViewerNavigationStarted(webPayload) {
+    if (this._isNavigating) {
+      return;
+    }
+    this._isNavigating = true;
+    let externalNavigation = { messageType: "NavigationStarted", payload: webPayload};
+    Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
+  }
+
+  _onViewerNavigationUpdated(webPayload) {
+    if (!this._isNavigating) {
+      return;
+    }
+    if (webPayload.type == "PROGRESS") {
+      let externalNavigation = { messageType: "NavigationUpdated", payload: webPayload};
+      Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
+    } else if (webPayload.type == "DESTINATION_REACHED") {
+      let externalNavigation = { messageType: "DestinationReached", payload: webPayload};
+      Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
+      this._isNavigating = false;
+    } else if (webPayload.type == "OUT_OF_ROUTE") {
+      let externalNavigation = { messageType: "OutsideRoute", payload: webPayload};
+      Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
+      this._isNavigating = false;
+    }
+    
+  }
+
+  _onViewerNavigationStopped(webPayload) {
+    if (!this._isNavigating) {
+      return;
+    }
+    this._isNavigating = false;
+    let externalNavigation = { messageType: "NavigationCancelled", payload: webPayload};
+    Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
+  }
+
+
+
   // ==================================================
   // ACTIONS
   // ==================================================
@@ -335,6 +404,13 @@ class MapViewControllerImpl {
     });
   }
 
+  _sendNavigationConfig(navigationType) {
+    if (window.cordova.platformId !== 'android') {
+      return;
+    }
+    this._sendMessageToViewer('app.set_config_item', [{key:'internal.navigationLibrary',value:navigationType}]);
+  }
+
   /**
    * Allows you to navigate to a {@link POI} programmatically in your venue. This will cause the {@link MapView} to start navigation mode displaying the route between the user's location and the POI specified by parameters.
    *

package/www/map-view.js

@@ -12,10 +12,10 @@ const MapViewController = require('./map-view-controller');
  *   remote-identifier="YOUR_REMOTE_IDENTIFIER"
  * />
  * </pre>
- * 
+ *
  * <button id="copySnippetButton">Copy</button>
  * </div>
- * 
+ *
  * <script>
     document.getElementById("copySnippetButton").addEventListener("click", function() {
       var textToCopy = document.getElementById("textToCopy");
@@ -87,9 +87,15 @@ class MapView extends HTMLElement {
     let viewerDomain = this._formatValidDomain(
       this.getAttribute('viewer-domain')
     );
-    let situmApiKey = this.getAttribute('situm-api-key') ?? '';
-    let buildingIdentifier = this.getAttribute('building-identifier') ?? '';
-    let language = this.getAttribute('language') ?? '';
+    let situmApiKey = this.getAttribute('situm-api-key')
+      ? this.getAttribute('situm-api-key')
+      : '';
+    let buildingIdentifier = this.getAttribute('building-identifier')
+      ? this.getAttribute('building-identifier')
+      : '';
+    let language = this.getAttribute('language')
+      ? this.getAttribute('language')
+      : '';
 
     let situmApiKeyQP = situmApiKey.length > 0 ? `apikey=${situmApiKey}` : '';
     let buildingIdentifierQP =

package/www/situm.js

@@ -409,6 +409,17 @@ var Situm = {
   updateNavigationWithLocation: function (location, cb, error) {
     exec(cb, error, PLUGIN_NAME, 'updateNavigationWithLocation', [location]);
   },
+    /**
+   * For internal use only
+   * @description Informs NavigationManager object the change of the user's location.
+   * @param {ExternalNavigation} externalNavigation Navigation info.
+   * @param {function} cb Cordova native callback to recive data.
+   * @param {function} error Cordova native callback to recive errors.
+   * @return {boolean} success True if there is a listener to which notify progress update. False if there isn't, so this method do nothing.
+   */
+    updateNavigationState: function (externalNavigation, cb, error) {
+      exec(cb, error, PLUGIN_NAME, 'updateNavigationState', [externalNavigation]);
+    },
   /**
    * Removes all location updates.
    * @description Removes all location updates. This removes the internal state of the manager, including the listener provided in requestNavigationUpdates(NavigationRequest, NavigationListener), so it won't receive more progress updates.