@situm/cordova 3.16.0 → 3.17.0

package/CHANGELOG_UNRELEASED.md

@@ -1,2 +1,12 @@
-### Fixed
-- Added defensive code to avoid race conditions when using ttsManager variable at PluginHelper.java
+## Unreleased
+
+### Updated
+- Updated Android example app targetSdkVersion and compileSdkVersion from 33 to 37.
+- Updated gradle wrapper version from 8.4 to 8.13.
+- Updated AGP (com.android.application) from 8.0.0 to 8.13.2.
+
+### Removed
+- Removed the legacy routing and navigation bridge between the MapView and the native SDK, as the MapView now always uses its own routing and navigation library.
+
+### Changed
+- Deprecated the `use-viewer-navigation` MapView attribute. It is now ignored and kept only for backward compatibility.

package/example/android/app/capacitor.build.gradle

@@ -17,8 +17,7 @@ dependencies {
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.3.1"
+
 }
 apply from: "../../../src/android/situm.gradle"
 

package/example/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath 'com.google.gms:google-services:4.3.15'
 
         // NOTE: Do not place your application dependencies here; they belong

package/example/android/capacitor.settings.gradle

@@ -1,27 +1,27 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.7.8/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/app/android')
 
 include ':capacitor-camera'
-project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
+project(':capacitor-camera').projectDir = new File('../../node_modules/.pnpm/@capacitor+camera@5.0.10_@capacitor+core@5.7.8/node_modules/@capacitor/camera/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../node_modules/.pnpm/@capacitor+filesystem@5.2.2_@capacitor+core@5.7.8/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../node_modules/.pnpm/@capacitor+geolocation@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../node_modules/.pnpm/@capacitor+preferences@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/status-bar/android')

package/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/android/variables.gradle

@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
+    compileSdkVersion = 37
+    targetSdkVersion = 37
     androidxActivityVersion = '1.7.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'

package/example/src/app/sdk/sdk.page.html

@@ -93,16 +93,16 @@
   </ion-card>
 
   <ion-card>
+    <ion-card-header>
+      <ion-card-title>{{ currentStatus }}</ion-card-title>
+    </ion-card-header>
     <ion-card-content>
-      <ion-item>
-        <ion-label>{{ currentStatus }}</ion-label>
-      </ion-item>
-
       <ion-textarea
-        class="custom"
+        class="positioning-info-textarea"
         [readonly]="true"
-        placeholder="{{ currentPositioningInfo }}"
-        style="height: 60vh"
+        [autoGrow]="false"
+        rows="45"
+        value="{{ currentPositioningInfo }}"
       />
     </ion-card-content>
   </ion-card>

package/example/src/app/sdk/sdk.page.scss

@@ -18,7 +18,9 @@ ion-item.custom {
   --margin-end: 0px;
 }
 
-ion-textarea.custom {
-  --placeholder-color: black;
-  --placeholder-opacity: 1;
+ion-textarea.positioning-info-textarea {
+  display: block;
+  max-height: 200vh;
+  overflow-y: auto;
+  --color: var(--ion-color-dark);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@situm/cordova",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "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.16.0">
+    version="3.17.0">
     <name>Situm Cordova plugin Official</name>
     <description>This is the stable branch.</description>
     <license>MIT</license>

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.37.0@aar') {
+    implementation ('es.situm:situm-sdk:3.37.1@aar') {
         transitive = true
     }
     implementation 'org.apache.cordova:framework:10.1.1'

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.37.0@aar') {
+    implementation('es.situm:situm-sdk:3.37.1@aar') {
         transitive = true
     }
 }

package/www/map-view-controller.js

@@ -49,10 +49,7 @@ class MapViewControllerImpl {
   _onLoadCallback = undefined;
   _onPoiSelectedCallback = undefined;
   _onPoiDeselectedCallback = undefined;
-  _buildings = undefined;
   _mapView = undefined;
-  _isNavigating = false;
-  _navigationType = "";
   _isWaitingForAuth = false;
 
   constructor() {
@@ -62,21 +59,12 @@ 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';
-      }
+    if (mapView.hasAttribute('use-viewer-navigation')) {
+      console.warn(
+        'Situm> MapView> [!] The "use-viewer-navigation" attribute is deprecated and ignored. ' +
+        'The MapView always uses its own routing and navigation library.'
+      );
     }
   }
 
@@ -127,17 +115,6 @@ class MapViewControllerImpl {
 
   _handleOnLocationUpdate(payload) {
     this._sendMessageToViewer('location.update', payload);
-    if (this._isNavigating) {
-      Situm.updateNavigationWithLocation(
-        [payload],
-        () => {
-          // Do nothing.
-        },
-        () => {
-          console.error('Error at updateNavigationWithLocation');
-        }
-      );
-    }
   }
 
   _handleOnLocationStatus(payload) {
@@ -177,15 +154,6 @@ class MapViewControllerImpl {
         };
         this._onPoiDeselectedCallback(poiDeselectedResult);
         break;
-      case 'directions.requested':
-        this._onDirectionsRequested(m.payload);
-        break;
-      case 'navigation.requested':
-        this._onNavigationRequested(m.payload);
-        break;
-      case 'navigation.stopped':
-        this._onNavigationCancel();
-        break;
       case 'viewer.navigation.started':
         this._onViewerNavigationStarted(m.payload);
         break;
@@ -211,9 +179,6 @@ class MapViewControllerImpl {
       this._onLoadCallback(this);
       console.debug('Map is ready!');
     }
-    if (this._navigationType) {
-      this._sendNavigationConfig(this._navigationType);
-    }
     this._sendMessageToViewer('app.set_config_item', [
       {key: "internal.tts.engine", value: "mobile"},
       // Any other config item here...
@@ -240,180 +205,34 @@ class MapViewControllerImpl {
     );
   }
 
-  // Fetch the given building and return it or undefined if not found.
-  _ensureBuilding(buildingId, callback) {
-    if (this._buildings) {
-      let building = this._buildings.find(
-        (b) => b.buildingIdentifier == buildingId
-      );
-      callback(building);
-    } else {
-      // Fetch buildings and calculate route.
-      cordova.plugins.Situm.fetchBuildings(
-        (res) => {
-          this._buildings = res;
-          let building = this._buildings.find(
-            (b) => b.buildingIdentifier == buildingId
-          );
-          callback(building);
-        },
-        (err) => {
-          callback(undefined);
-        }
-      );
-    }
-  }
-
-  // DIRECTIONS:
-
-  _onDirectionsRequested(payload) {
-    let directionsRequest = payload.directionsRequest;
-    let mapViewerData = {
-      identifier: payload.identifier,
-      originIdentifier: payload.originIdentifier,
-      destinationIdentifier: payload.destinationIdentifier,
-      type: directionsRequest.accessibilityMode
-    };
-    this._ensureBuilding(payload.buildingIdentifier, (building) => {
-      if (building) {
-        Situm.requestDirections(
-          [
-            building,
-            directionsRequest.from,
-            directionsRequest.to,
-            directionsRequest
-          ],
-          (route) => {
-            this._sendMessageToViewer('directions.update', {
-              ...route,
-              ...mapViewerData
-            });
-          },
-          (error) => {
-            this._sendMessageToViewer('directions.update', {
-              error: -1,
-              identifier: mapViewerData.identifier
-            });
-          }
-        );
-      } else {
-        this._sendMessageToViewer('directions.update', {
-          error: -1,
-          identifier: payload.identifier
-        });
-      }
-    });
-  }
-
   // NAVIGATION
 
-  _onNavigationRequested(payload) {
-    let directionsRequest = payload.directionsRequest;
-    let mapViewerData = {
-      identifier: payload.identifier,
-      originIdentifier: payload.originIdentifier,
-      destinationIdentifier: payload.destinationIdentifier,
-      type: directionsRequest.accessibilityMode
-    };
-    let navigationRequest = payload.navigationRequest;
-    this._ensureBuilding(payload.buildingIdentifier, (building) => {
-      // Request directions again to update the calculated route on the native side.
-      Situm.requestDirections(
-        [
-          building,
-          directionsRequest.from,
-          directionsRequest.to,
-          directionsRequest
-        ],
-        (route) => {
-          this._isNavigating = true;
-          this._sendMessageToViewer('navigation.start', {
-            ...route,
-            ...mapViewerData
-          });
-          Situm.requestNavigationUpdates(
-            [navigationRequest],
-            (progress) => {
-              // Navigation is working, handle different progress types:
-              if (progress.type == 'progress') {
-                progress.type = 'PROGRESS'; // The map-viewer waits for an upper case "type".
-                this._sendMessageToViewer('navigation.update', progress);
-              } else if (progress.type == 'destinationReached') {
-                this._sendMessageToViewer('navigation.update', {
-                  type: 'DESTINATION_REACHED'
-                });
-                this._isNavigating = false;
-              } else if (progress.type == 'userOutsideRoute') {
-                this._sendMessageToViewer('navigation.update', {
-                  type: 'OUT_OF_ROUTE'
-                });
-              }
-            },
-            (error) => {
-              this._sendMessageToViewer('directions.update', {
-                error: -1,
-                identifier: mapViewerData.identifier
-              });
-              this._isNavigating = false;
-            }
-          );
-        },
-        (error) => {
-          this._sendMessageToViewer('directions.update', {
-            error: -1,
-            identifier: mapViewerData.identifier
-          });
-          this._isNavigating = false;
-        }
-      );
-    });
-  }
-
-  _onNavigationCancel() {
-    this._isNavigating = false;
-    Situm.removeNavigationUpdates(
-      () => {
-        // Do nothing.
-      },
-      () => {
-        console.error('Error removing navigation updates.');
-      }
-    );
-  }
-
   _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;
+    let messageType;
+    switch (webPayload.type) {
+      case 'PROGRESS':
+        messageType = 'NavigationUpdated';
+        break;
+      case 'DESTINATION_REACHED':
+        messageType = 'DestinationReached';
+        break;
+      case 'OUT_OF_ROUTE':
+        messageType = 'OutsideRoute';
+        break;
+      default:
+        return;
     }
-    
+
+    const externalNavigation = { messageType, payload: webPayload };
+    Situm.updateNavigationState(externalNavigation, () => { }, () => { });
   }
 
   _onViewerNavigationStopped(webPayload) {
-    if (!this._isNavigating) {
-      return;
-    }
-    this._isNavigating = false;
     let externalNavigation = { messageType: "NavigationCancelled", payload: webPayload};
     Situm.updateNavigationState(externalNavigation,  () => {}, () => {});
   }
@@ -440,10 +259,6 @@ class MapViewControllerImpl {
     });
   }
 
-  _sendNavigationConfig(navigationType) {
-    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.
    *