@situm/cordova 3.17.5 → 3.17.6

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

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

@@ -192,8 +192,10 @@ public class PluginHelper {
         try {
             JSONObject jsonoBuilding = args.getJSONObject(0);
             Building building = SitumMapper.buildingJsonObjectToBuilding(jsonoBuilding);
-
-            getCommunicationManagerInstance().fetchBuildingInfo(building, new Handler<BuildingInfo>() {
+            if (building == null) {
+                callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error fetching Building Info: failed mapping Building object from Json."));
+            }
+            getCommunicationManagerInstance().fetchBuildingInfo(building.getIdentifier(), new Handler<BuildingInfo>() {
                 @Override
                 public void onSuccess(BuildingInfo object) {
                     try {
@@ -267,7 +269,10 @@ public class PluginHelper {
         try {
             JSONObject jsonoBuilding = args.getJSONObject(0);
             Building building = SitumMapper.buildingJsonObjectToBuilding(jsonoBuilding);
-            getCommunicationManagerInstance().fetchFloorsFromBuilding(building, new Handler<Collection<Floor>>() {
+            if (building == null) {
+                callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error fetching Floors from Building: failed mapping Building object from Json."));
+            }
+            getCommunicationManagerInstance().fetchFloorsFromBuilding(building.getIdentifier(), new Handler<Collection<Floor>>() {
                 @Override
                 public void onSuccess(Collection<Floor> floors) {
                     try {
@@ -307,7 +312,10 @@ public class PluginHelper {
         try {
             JSONObject jsonoBuilding = args.getJSONObject(0);
             Building building = SitumMapper.buildingJsonObjectToBuilding(jsonoBuilding);
-            getCommunicationManagerInstance().fetchIndoorPOIsFromBuilding(building, new HashMap<String, Object>(),
+            if (building == null) {
+                callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error fetching Indoor POIs from Building: failed mapping Building object from Json."));
+            }
+            getCommunicationManagerInstance().fetchIndoorPOIsFromBuilding(building.getIdentifier(),
                     new Handler<Collection<Poi>>() {
                         @Override
                         public void onSuccess(Collection<Poi> pois) {
@@ -350,7 +358,10 @@ public class PluginHelper {
         try {
             JSONObject jsonoBuilding = args.getJSONObject(0);
             Building building = SitumMapper.buildingJsonObjectToBuilding(jsonoBuilding);
-            getCommunicationManagerInstance().fetchOutdoorPOIsFromBuilding(building, new HashMap<String, Object>(),
+            if (building == null) {
+                callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error fetching fetching Outdoor POIs from Building: failed mapping Building object from Json."));
+            }
+            getCommunicationManagerInstance().fetchOutdoorPOIsFromBuilding(building.getIdentifier(),
                     new Handler<Collection<Poi>>() {
                         @Override
                         public void onSuccess(Collection<Poi> pois) {
@@ -421,7 +432,7 @@ public class PluginHelper {
         try {
             JSONObject jsonoCategory = args.getJSONObject(0);
             PoiCategory category = SitumMapper.poiCategoryFromJsonObject(jsonoCategory);
-            getCommunicationManagerInstance().fetchPoiCategoryIconNormal(category, new Handler<Bitmap>() {
+            getCommunicationManagerInstance().fetchPoiCategoryIcon(category, false, new Handler<Bitmap>() {
                 @Override
                 public void onSuccess(Bitmap bitmap) {
                     try {
@@ -450,7 +461,7 @@ public class PluginHelper {
         try {
             JSONObject jsonoCategory = args.getJSONObject(0);
             PoiCategory category = SitumMapper.poiCategoryFromJsonObject(jsonoCategory);
-            getCommunicationManagerInstance().fetchPoiCategoryIconSelected(category, new Handler<Bitmap>() {
+            getCommunicationManagerInstance().fetchPoiCategoryIcon(category, true, new Handler<Bitmap>() {
                 @Override
                 public void onSuccess(Bitmap bitmap) {
                     try {
@@ -479,7 +490,10 @@ public class PluginHelper {
         try {
             JSONObject jsonoBuilding = args.getJSONObject(0);
             Building building = SitumMapper.buildingJsonObjectToBuilding(jsonoBuilding);
-            getCommunicationManagerInstance().fetchEventsFromBuilding(building, new HashMap<String, Object>(),
+            if (building == null) {
+                callbackContext.sendPluginResult(new PluginResult(Status.ERROR, "Error fetching Events from Building: failed mapping Building object from Json."));
+            }
+            getCommunicationManagerInstance().fetchEventsFromBuilding(building.getIdentifier(),
                     new Handler<Collection<es.situm.sdk.v1.SitumEvent>>() {
                         @Override
                         public void onSuccess(Collection<SitumEvent> situmEvents) {

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

@@ -63,9 +63,6 @@ import es.situm.sdk.userhelper.UserHelperColorScheme;
 
 class SitumMapper {
 
-  public static final float MIN_SNR = 10;
-  public static final float MAX_SNR = 40;
-
   public static final String ADDRESS = "address";
   public static final String BOUNDS = "bounds";
   public static final String BOUNDS_ROTATED = "boundsRotated";
@@ -188,9 +185,7 @@ class SitumMapper {
   public static final String AUTO_ENABLE_BLE = "autoEnableBleDuringPositioning";
 
   public static final String OUTDOOR_LOCATION_OPTIONS = "outdoorLocationOptions";
-  public static final String USER_DEFINED_THRESHOLD = "userDefinedThreshold";
   public static final String COMPUTE_INTERVAL = "computeInterval";
-  public static final String AVERAGE_SNR_THRESHOLD = "averageSnrThreshold";
 
   public static final String BEACON_FILTERS = "beaconFilters";
   public static final String UUID = "uuid";
@@ -911,12 +906,6 @@ static JSONObject buildingInfoToJsonObject(BuildingInfo buildingInfo) throws JSO
   static OutdoorLocationOptions buildOutdoorLocationOptions(JSONObject outdoorLocationOptions) throws JSONException{
     OutdoorLocationOptions.Builder optionsBuilder = new OutdoorLocationOptions.Builder();
 
-    if (outdoorLocationOptions.has(SitumMapper.USER_DEFINED_THRESHOLD)) {
-      Boolean userDefinedThreshold = outdoorLocationOptions.getBoolean(SitumMapper.USER_DEFINED_THRESHOLD);
-      optionsBuilder.userDefinedThreshold(userDefinedThreshold);
-      Log.i(TAG, "userDefinedThreshold: " + userDefinedThreshold);
-    }
-
     if (outdoorLocationOptions.has(SitumMapper.COMPUTE_INTERVAL)) {
       Integer computeInterval = outdoorLocationOptions.getInt(SitumMapper.COMPUTE_INTERVAL);
       if (computeInterval != null && computeInterval >= 1) {
@@ -924,13 +913,6 @@ static JSONObject buildingInfoToJsonObject(BuildingInfo buildingInfo) throws JSO
         Log.i(TAG, "computeInterval: " + computeInterval);
       }
     }
-
-    if (outdoorLocationOptions.has(SitumMapper.AVERAGE_SNR_THRESHOLD));
-    Float averageSnrThreshold = new Float(outdoorLocationOptions.getDouble(SitumMapper.AVERAGE_SNR_THRESHOLD));
-    if (averageSnrThreshold != null && averageSnrThreshold >= MIN_SNR && averageSnrThreshold <= MAX_SNR) {
-      optionsBuilder.averageSnrThreshold(averageSnrThreshold);
-      Log.i(TAG, "averageSnrThreshold: " + averageSnrThreshold);
-    }
     return optionsBuilder.build();
   }
 

package/src/android/situm.gradle

@@ -11,7 +11,7 @@ allprojects {
 }
 
 dependencies {
-    implementation('es.situm:situm-sdk:3.38.0@aar') {
+    implementation('es.situm:situm-sdk:3.39.0@aar') {
         transitive = true
     }
 }

package/www/Interfaces.js

@@ -725,15 +725,11 @@ module.exports = DirectionsOptions;
  * OutdoorLocationOptions
  * @description
  * Outdoor location options are only used in indoor-outdoor mode (Only available for Android)
- * @property {boolean} userDefinedThreshold
  * @property {number} computeInterval - Interval (in milliseconds) between consecutive GPS readings performed by Situm SDK, and therefore between consecutive generated Outdoor Locations.
- * @property {number} averageSnrThreshold
  */
 
 var OutdoorLocationOptions = {
-  userDefinedThreshold,
   computeInterval,
-  averageSnrThreshold
 };
 
 module.exports = OutdoorLocationOptions;