@situm/cordova 3.3.14 → 3.4.0

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

@@ -755,159 +755,140 @@ static JSONObject buildingInfoToJsonObject(BuildingInfo buildingInfo) throws JSO
       return locationBuilder.build();
     }
 
-    JSONObject jsonoBuilding = args.getJSONObject(0);
-    String sBuildingId;
-    if (jsonoBuilding.get(SitumMapper.BUILDING_IDENTIFIER) instanceof String) {
-      sBuildingId = jsonoBuilding.getString(SitumMapper.BUILDING_IDENTIFIER);
-    } else {
-      sBuildingId = String.format(Locale.getDefault(), "%d", jsonoBuilding.getInt(SitumMapper.BUILDING_IDENTIFIER));
+    JSONObject request = args.getJSONObject(0);
+    if (request.has(SitumMapper.BUILDING_IDENTIFIER)) {
+      String buildingIdentifier = String.valueOf(request.get(SitumMapper.BUILDING_IDENTIFIER));
+      locationBuilder.buildingIdentifier(buildingIdentifier);
+      Log.i(TAG, "buildingIdentifier: " + buildingIdentifier);
     }
 
-    if (args.length() > 1) {
-        JSONObject request = args.getJSONObject(1);
-        if (request.has(SitumMapper.BUILDING_IDENTIFIER)) {
-          String buildingIdentifier;
-          if (request.get(SitumMapper.BUILDING_IDENTIFIER) instanceof String) {
-            buildingIdentifier = request.getString(SitumMapper.BUILDING_IDENTIFIER);
-          } else {
-            buildingIdentifier = String.format(Locale.getDefault(), "%d", jsonoBuilding.getInt(SitumMapper.BUILDING_IDENTIFIER));
-          }
-
-            locationBuilder.buildingIdentifier(buildingIdentifier);
-            Log.i(TAG, "buildingIdentifier: " + buildingIdentifier);
-        }
-
-        if (request.has(SitumMapper.INTERVAL)) {
-            Integer interval = request.getInt(SitumMapper.INTERVAL);
-            if (interval != null) {
-                locationBuilder.interval(interval);
-                Log.i(TAG, "interval: " + interval);
-            }
-        }
+    if (request.has(SitumMapper.INTERVAL)) {
+      Integer interval = request.getInt(SitumMapper.INTERVAL);
+      if (interval != null) {
+        locationBuilder.interval(interval);
+        Log.i(TAG, "interval: " + interval);
+      }
+    }
 
-        if (request.has(SitumMapper.INDOOR_PROVIDER)) {
-            String indoorProvider = request.getString(SitumMapper.INDOOR_PROVIDER);
-            if (indoorProvider != null && !indoorProvider.isEmpty()) {
-                if (indoorProvider.equals(LocationRequest.IndoorProvider.SUPPORT.name())) {
-                    locationBuilder.indoorProvider(LocationRequest.IndoorProvider.SUPPORT);
-                } else {
-                    locationBuilder.indoorProvider(LocationRequest.IndoorProvider.INPHONE);
-                }
-                Log.i(TAG, "indoorProvider: " + indoorProvider);
-            }
+    if (request.has(SitumMapper.INDOOR_PROVIDER)) {
+      String indoorProvider = request.getString(SitumMapper.INDOOR_PROVIDER);
+      if (indoorProvider != null && !indoorProvider.isEmpty()) {
+        if (indoorProvider.equals(LocationRequest.IndoorProvider.SUPPORT.name())) {
+          locationBuilder.indoorProvider(LocationRequest.IndoorProvider.SUPPORT);
+        } else {
+          locationBuilder.indoorProvider(LocationRequest.IndoorProvider.INPHONE);
         }
+        Log.i(TAG, "indoorProvider: " + indoorProvider);
+      }
+    }
 
-        if (request.has(SitumMapper.USE_BLE)) {
-            Boolean useBle = request.getBoolean(SitumMapper.USE_BLE);
-            locationBuilder.useBle(useBle);
-            Log.i(TAG, "useBle: " + useBle);
-        }
+    if (request.has(SitumMapper.USE_BLE)) {
+      Boolean useBle = request.getBoolean(SitumMapper.USE_BLE);
+      locationBuilder.useBle(useBle);
+      Log.i(TAG, "useBle: " + useBle);
+    }
 
-        if (request.has(SitumMapper.USE_WIFI)) {
-            Boolean useWifi = request.getBoolean(SitumMapper.USE_WIFI);
-            locationBuilder.useWifi(useWifi);
-            Log.i(TAG, "useWifi: " + useWifi);
-        }
+    if (request.has(SitumMapper.USE_WIFI)) {
+      Boolean useWifi = request.getBoolean(SitumMapper.USE_WIFI);
+      locationBuilder.useWifi(useWifi);
+      Log.i(TAG, "useWifi: " + useWifi);
+    }
 
-        if (request.has(SitumMapper.USE_GPS)) {
-            Boolean useGps = request.getBoolean(SitumMapper.USE_GPS);
-            locationBuilder.useGps(useGps);
-            Log.i(TAG, "useGps: " + useGps);
-        }
+    if (request.has(SitumMapper.USE_GPS)) {
+      Boolean useGps = request.getBoolean(SitumMapper.USE_GPS);
+      locationBuilder.useGps(useGps);
+      Log.i(TAG, "useGps: " + useGps);
+    }
 
-        if (request.has(SitumMapper.USE_BAROMETER)) {
-            Boolean useBarometer = request.getBoolean(SitumMapper.USE_BAROMETER);
-            locationBuilder.useBarometer(useBarometer);
-            Log.i(TAG, "useBarometer: " + useBarometer);
-        }
+    if (request.has(SitumMapper.USE_BAROMETER)) {
+      Boolean useBarometer = request.getBoolean(SitumMapper.USE_BAROMETER);
+      locationBuilder.useBarometer(useBarometer);
+      Log.i(TAG, "useBarometer: " + useBarometer);
+    }
 
-        if (request.has(SitumMapper.AUTO_ENABLE_BLE)) {
-            Boolean autoEnableBleDuringPositioning = request.getBoolean(SitumMapper.AUTO_ENABLE_BLE);
-            locationBuilder.autoEnableBleDuringPositioning(autoEnableBleDuringPositioning);
-            Log.i(TAG, "autoEnableBleDuringPositioning: " + autoEnableBleDuringPositioning);
-        }
+    if (request.has(SitumMapper.AUTO_ENABLE_BLE)) {
+      Boolean autoEnableBleDuringPositioning = request.getBoolean(SitumMapper.AUTO_ENABLE_BLE);
+      locationBuilder.autoEnableBleDuringPositioning(autoEnableBleDuringPositioning);
+      Log.i(TAG, "autoEnableBleDuringPositioning: " + autoEnableBleDuringPositioning);
+    }
 
-        if (request.has(SitumMapper.MOTION_MODE)) {
-            String motionMode = request.getString(SitumMapper.MOTION_MODE);
-            if (motionMode != null) {
-                if (motionMode.equals(LocationRequest.MotionMode.BY_FOOT.name())) {
-                    locationBuilder.motionMode(LocationRequest.MotionMode.BY_FOOT);
-                } else if (motionMode.equals(LocationRequest.MotionMode.BY_CAR.name())) {
-                    locationBuilder.motionMode(LocationRequest.MotionMode.BY_CAR);
-                }
-                Log.i(TAG, "motionMode: " + motionMode);
-            }
+    if (request.has(SitumMapper.MOTION_MODE)) {
+      String motionMode = request.getString(SitumMapper.MOTION_MODE);
+      if (motionMode != null) {
+        if (motionMode.equals(LocationRequest.MotionMode.BY_FOOT.name())) {
+          locationBuilder.motionMode(LocationRequest.MotionMode.BY_FOOT);
+        } else if (motionMode.equals(LocationRequest.MotionMode.BY_CAR.name())) {
+          locationBuilder.motionMode(LocationRequest.MotionMode.BY_CAR);
         }
+        Log.i(TAG, "motionMode: " + motionMode);
+      }
+    }
 
-        if (request.has(SitumMapper.USE_FOREGROUND_SERVICE)) {
-            Boolean useForegroundService = request.getBoolean(SitumMapper.USE_FOREGROUND_SERVICE);
-            locationBuilder.useForegroundService(useForegroundService);
-            Log.i(TAG, "useForegroundService: " + useForegroundService);
-        }
+    if (request.has(SitumMapper.USE_FOREGROUND_SERVICE)) {
+      Boolean useForegroundService = request.getBoolean(SitumMapper.USE_FOREGROUND_SERVICE);
+      locationBuilder.useForegroundService(useForegroundService);
+      Log.i(TAG, "useForegroundService: " + useForegroundService);
+    }
 
-        if (request.has(SitumMapper.USE_DEAD_RECKONING)) {
-            Boolean useDeadReckoning = request.getBoolean(SitumMapper.USE_DEAD_RECKONING);
-            locationBuilder.useDeadReckoning(useDeadReckoning);
-            Log.i(TAG, "useDeadReckoning: " + useDeadReckoning);
-        }
+    if (request.has(SitumMapper.USE_DEAD_RECKONING)) {
+      Boolean useDeadReckoning = request.getBoolean(SitumMapper.USE_DEAD_RECKONING);
+      locationBuilder.useDeadReckoning(useDeadReckoning);
+      Log.i(TAG, "useDeadReckoning: " + useDeadReckoning);
+    }
 
-        if (request.has(SitumMapper.OUTDOOR_LOCATION_OPTIONS)) {
-            JSONObject outdoorLocationOptions = request.getJSONObject(SitumMapper.OUTDOOR_LOCATION_OPTIONS);
-            if (outdoorLocationOptions != null) {
-                locationBuilder.outdoorLocationOptions(buildOutdoorLocationOptions(outdoorLocationOptions));
-            }
-        }
+    if (request.has(SitumMapper.OUTDOOR_LOCATION_OPTIONS)) {
+      JSONObject outdoorLocationOptions = request.getJSONObject(SitumMapper.OUTDOOR_LOCATION_OPTIONS);
+      if (outdoorLocationOptions != null) {
+        locationBuilder.outdoorLocationOptions(buildOutdoorLocationOptions(outdoorLocationOptions));
+      }
+    }
 
-        if (request.has(SitumMapper.BEACON_FILTERS)) {
-            JSONArray beaconFilters = request.getJSONArray(SitumMapper.BEACON_FILTERS);
-            List<BeaconFilter> filtersList = new ArrayList<BeaconFilter>();
-            for (int i = 0; i < beaconFilters.length(); i++) {
-                JSONObject beaconFilter = beaconFilters.getJSONObject(i);
-                if (beaconFilter.has(SitumMapper.UUID)) {
-                    String uuid = beaconFilter.getString(SitumMapper.UUID);
-                    if (uuid != null && !uuid.isEmpty()) {
-                        BeaconFilter.Builder builder = new BeaconFilter.Builder().uuid(uuid);
-                        filtersList.add(builder.build());
-                        Log.i(TAG, "beaconFilter: " + uuid);
-                    }
-                }
-            }
-
-            locationBuilder.addBeaconFilters(filtersList);
+    if (request.has(SitumMapper.BEACON_FILTERS)) {
+      JSONArray beaconFilters = request.getJSONArray(SitumMapper.BEACON_FILTERS);
+      List<BeaconFilter> filtersList = new ArrayList<BeaconFilter>();
+      for (int i = 0; i < beaconFilters.length(); i++) {
+        JSONObject beaconFilter = beaconFilters.getJSONObject(i);
+        if (beaconFilter.has(SitumMapper.UUID)) {
+          String uuid = beaconFilter.getString(SitumMapper.UUID);
+          if (uuid != null && !uuid.isEmpty()) {
+            BeaconFilter.Builder builder = new BeaconFilter.Builder().uuid(uuid);
+            filtersList.add(builder.build());
+            Log.i(TAG, "beaconFilter: " + uuid);
+          }
         }
+      }
+      locationBuilder.addBeaconFilters(filtersList);
+    }
 
-        if (request.has(SitumMapper.SMALLEST_DISPLACEMENT)) {
-            Float smallestDisplacement = new Float(request.getDouble(SitumMapper.SMALLEST_DISPLACEMENT));
-            if (smallestDisplacement != null && smallestDisplacement > 0) {
-                locationBuilder.smallestDisplacement(smallestDisplacement);
-                Log.i(TAG, "smallestDisplacement: " + smallestDisplacement);
-            }
-        }
+    if (request.has(SitumMapper.SMALLEST_DISPLACEMENT)) {
+      Float smallestDisplacement = new Float(request.getDouble(SitumMapper.SMALLEST_DISPLACEMENT));
+      if (smallestDisplacement != null && smallestDisplacement > 0) {
+        locationBuilder.smallestDisplacement(smallestDisplacement);
+        Log.i(TAG, "smallestDisplacement: " + smallestDisplacement);
+      }
+    }
 
-        if (request.has(SitumMapper.REALTIME_UPDATE_INTERVAL) &&
-                request.get(SitumMapper.REALTIME_UPDATE_INTERVAL) instanceof String) {
-            String realtimeUpdateInterval = request.getString(SitumMapper.REALTIME_UPDATE_INTERVAL);
-            if (realtimeUpdateInterval != null) {
-                if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.REALTIME.name())) {
-                    locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.REALTIME);
-                } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.FAST.name())) {
-                    locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.FAST);
-                } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.NORMAL.name())) {
-                    locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.NORMAL);
-                } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.SLOW.name())) {
-                    locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.SLOW);
-                } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.BATTERY_SAVER.name())) {
-                    locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.BATTERY_SAVER);
-                }
-                Log.i(TAG, "realtimeUpdateInterval: " + realtimeUpdateInterval);
-            }
+    if (request.has(SitumMapper.REALTIME_UPDATE_INTERVAL) &&
+      request.get(SitumMapper.REALTIME_UPDATE_INTERVAL) instanceof String) {
+      String realtimeUpdateInterval = request.getString(SitumMapper.REALTIME_UPDATE_INTERVAL);
+      if (realtimeUpdateInterval != null) {
+        if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.REALTIME.name())) {
+          locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.REALTIME);
+        } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.FAST.name())) {
+          locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.FAST);
+        } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.NORMAL.name())) {
+          locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.NORMAL);
+        } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.SLOW.name())) {
+          locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.SLOW);
+        } else if (realtimeUpdateInterval.equals(LocationRequest.RealtimeUpdateInterval.BATTERY_SAVER.name())) {
+          locationBuilder.realtimeUpdateInterval(LocationRequest.RealtimeUpdateInterval.BATTERY_SAVER);
         }
-    } else {
-       locationBuilder.buildingIdentifier(sBuildingId);
+        Log.i(TAG, "realtimeUpdateInterval: " + realtimeUpdateInterval);
+      }
     }
 
     return locationBuilder.build();
-}
+  }
 
   static OutdoorLocationOptions buildOutdoorLocationOptions(JSONObject outdoorLocationOptions) throws JSONException{
     OutdoorLocationOptions.Builder optionsBuilder = new OutdoorLocationOptions.Builder();

package/src/android/app/src/test/java/es/situm/plugin/SitumMapperTest.java

@@ -471,18 +471,6 @@ public class SitumMapperTest {
         }
     }
 
-    @Test
-    public void indicationJSONObjectTest() {
-        try {
-            Indication indication = indicationCreator.createIndication();
-            JSONObject indicationJSONObject = SitumMapper.indicationToJsonObject(indication);
-            JSONObject indication1 = indicationCreator.getIndication1();
-            testIndication(indicationJSONObject, indication1);
-        } catch (JSONException e) {
-            System.err.println(e.getMessage());
-        }
-    }
-
     @Test
     public void locationTest1() {
         try {
@@ -837,34 +825,6 @@ public class SitumMapperTest {
         }
     }
 
-    @Test
-    public void routeStepJSONObjectTest(){
-        try{
-            RouteStep routeStepWithCoordinate = routeStepCreator.createRouteStepWithCoordinate();
-            JSONObject routeStepWithCoordinateJSONObject = SitumMapper.routeStepToJsonObject(routeStepWithCoordinate);
-            JSONObject routeStep1 = routeStepCreator.getRouteStep1();
-            testRouteStep(routeStepWithCoordinateJSONObject, routeStep1);
-            RouteStep routeStepWithCoordinateAndBuildingId = routeStepCreator.createRouteStepWithCoordinateAndBuildingId();
-            JSONObject routeStepWithCoordinateAndBuildingIdJSONObject = SitumMapper.routeStepToJsonObject(routeStepWithCoordinateAndBuildingId);
-            JSONObject routeStep2 = routeStepCreator.getRouteStep2();
-            testRouteStep(routeStepWithCoordinateAndBuildingIdJSONObject, routeStep2);
-            RouteStep routeStepWithCoordinateBuildingIdAndFloor = routeStepCreator.createRouteStepWithCoordinateBuildingIdAndFloor();
-            JSONObject routeStepWithCoordinateBuildingIdAndFloorJSONObject = SitumMapper.routeStepToJsonObject(routeStepWithCoordinateBuildingIdAndFloor);
-            JSONObject routeStep3 = routeStepCreator.getRouteStep3();
-            testRouteStep(routeStepWithCoordinateBuildingIdAndFloorJSONObject, routeStep3);
-            RouteStep routeStepWithBuildingWithAngleFromDegree = routeStepCreator.createRouteStepWithBuildingWithAngleFromDegree();
-            JSONObject routeStepWithBuildingWithAngleFromDegreeJSONObject = SitumMapper.routeStepToJsonObject(routeStepWithBuildingWithAngleFromDegree);
-            JSONObject routeStep4 = routeStepCreator.getRouteStep4();
-            testRouteStep(routeStepWithBuildingWithAngleFromDegreeJSONObject, routeStep4);
-            RouteStep routeStepWithBuildingWithAngleFromRadians = routeStepCreator.createRouteStepWithBuildingWithAngleFromRadians();
-            JSONObject routeStepWithBuildingWithAngleFromRadiansJSONObject = SitumMapper.routeStepToJsonObject(routeStepWithBuildingWithAngleFromRadians);
-            JSONObject routeStep5 = routeStepCreator.getRouteStep5();
-            testRouteStep(routeStepWithBuildingWithAngleFromRadiansJSONObject, routeStep5);
-        }catch(JSONException e){
-            System.err.println(e.getMessage());
-        }
-    }
-
     @Test
     public void pointTest1() {
         try{

package/src/android/situm.gradle

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

package/src/ios/situmcordovaplugin/SitumLocationWrapper.m

@@ -234,9 +234,7 @@ static SitumLocationWrapper *singletonSitumLocationWrapperObj;
     return jo;
 }
 
-
 - (SITLocationRequest *) jsonObjectToLocationRequest: (NSArray *) json {
-    NSDictionary *buildingJO;
     NSNumber *useDeadReckoning = nil;
     NSNumber *useGps = nil;
     NSString *buildingId;
@@ -245,11 +243,10 @@ static SitumLocationWrapper *singletonSitumLocationWrapperObj;
     NSNumber *smallestDisplacement = nil;
     NSNumber *useBarometer = nil;
     SITRealtimeUpdateInterval realtimeInterval = 0;
-    
+
     // Check use of remote configuration
     if ([json isKindOfClass:[NSDictionary class]]) {
         NSDictionary *params = (NSDictionary *)json;
-        
         if ([params allKeys].count == 0) {
             return nil;
         }
@@ -258,38 +255,17 @@ static SitumLocationWrapper *singletonSitumLocationWrapperObj;
             return nil;
         }
     }
-    
-    //The following if-else is necessary in order to mantain compatibility
-    //with the startPositioning[building] method.
-    //If params is an array, then it contains both a building and a locationRequest
-    //If params is a dictionary, then it should only contain a building
-    
-    if ([json isKindOfClass:[NSArray class]]) {
-        buildingJO = (NSDictionary*)[json objectAtIndex:0];
-        if (json.count > 1) {
-            NSDictionary *requestJO = (NSDictionary*)[json objectAtIndex:1];
-            buildingId = [NSString stringWithFormat:@"%@", requestJO[@"buildingIdentifier"]];
-            useDeadReckoning = [requestJO objectForKey: @"useDeadReckoning"];
-            useGps = [requestJO objectForKey: @"useGps"];
-            realtimeUpdateInterval = requestJO[@"realtimeUpdateInterval"];
-            interval = requestJO[@"interval"];
-            smallestDisplacement = requestJO[@"smallestDisplacement"];
-            useBarometer = [requestJO objectForKey: @"useBarometer"];
-        }
-    } else {
-        buildingJO = (NSDictionary*)json[0];
-    }
-    
-    if (buildingId == nil) {
-        buildingId = [buildingJO valueForKey:@"identifier"];
-    }
-    
-    if (buildingId == nil) {
-        buildingId = [NSString stringWithFormat:@"%@", [buildingJO valueForKey:@"buildingIdentifier"]];
-    }
-    
+
+    NSDictionary *requestJO = (NSDictionary*)[json objectAtIndex:0];
+    buildingId = [NSString stringWithFormat:@"%@", requestJO[@"buildingIdentifier"]];
+    useDeadReckoning = [requestJO objectForKey: @"useDeadReckoning"];
+    useGps = [requestJO objectForKey: @"useGps"];
+    realtimeUpdateInterval = requestJO[@"realtimeUpdateInterval"];
+    interval = requestJO[@"interval"];
+    smallestDisplacement = requestJO[@"smallestDisplacement"];
+    useBarometer = [requestJO objectForKey: @"useBarometer"];
+
     if (realtimeUpdateInterval != nil && [realtimeUpdateInterval isKindOfClass: [NSString class]]) {
-        
         if ([realtimeUpdateInterval isEqualToString:@"REALTIME"]) {
             realtimeInterval = kSITUpdateIntervalRealtime;
         } else if ([realtimeUpdateInterval isEqualToString:@"FAST"]) {
@@ -302,18 +278,19 @@ static SitumLocationWrapper *singletonSitumLocationWrapperObj;
             realtimeInterval = kSITUpdateIntervalBatterySaver;
         }
     }
-    
+
     SITLocationRequest *locationRequest = [[SITLocationRequest alloc] initWithBuildingId:buildingId];
+
     if (useDeadReckoning != nil) {
         [locationRequest setUseDeadReckoning:[useDeadReckoning boolValue]];
-        
     }
+
     if(useGps != nil) {
         [locationRequest setUseGps:[useGps boolValue]];
     }
-    
+
     if(interval != nil) {
-      [locationRequest setInterval:[interval intValue]];
+        [locationRequest setInterval:[interval intValue]];
     }
 
     if (smallestDisplacement != nil) {
@@ -321,11 +298,11 @@ static SitumLocationWrapper *singletonSitumLocationWrapperObj;
     }
 
     if(useBarometer != nil) {
-      [locationRequest setUseBarometer: [useBarometer boolValue]];
+        [locationRequest setUseBarometer: [useBarometer boolValue]];
     }
 
     if (realtimeInterval != 0) {
-        [locationRequest setUpdateInterval:realtimeInterval];
+        [locationRequest setRealtimeUpdateInterval:realtimeInterval];
     }
     return locationRequest;
 }

package/src/ios/situmcordovaplugin/SitumPlugin.m

@@ -462,9 +462,10 @@ static NSString *DEFAULT_SITUM_LOG = @"SitumSDK >>: ";
 }
 
 - (void)stopPositioning:(CDVInvokedUrlCommand *)command {
-    locationCallbackId = command.callbackId;
     [[SITLocationManager sharedInstance] removeUpdates];
     [[SITLocationManager sharedInstance] removeDelegate:self];
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)onEnterGeofences:(CDVInvokedUrlCommand *)command {
@@ -581,7 +582,7 @@ static NSString *DEFAULT_SITUM_LOG = @"SitumSDK >>: ";
 
     CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Navigation updated"];
     pluginResult.keepCallback = [NSNumber numberWithBool:true];
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:locationCallbackId];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void) removeNavigationUpdates:(CDVInvokedUrlCommand *)command {
@@ -592,7 +593,7 @@ static NSString *DEFAULT_SITUM_LOG = @"SitumSDK >>: ";
     NSMutableDictionary *obj = [[NSMutableDictionary alloc] init];
     [[SITCommunicationManager sharedManager] clearCache];
     CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:obj.copy];
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:locationCallbackId];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 // Realtime 

package/www/{android/Interfaces.js → Interfaces.js}

@@ -553,7 +553,7 @@ module.exports = SitumConversionArea
 
 /**
  * @name
- * LocationOptions
+ * LocationRequest
  * @description
  * A data object that contains parameters for the location service, LocationManager.
  * @property {number} buildingIdentifier - Identifier of the building on which the positioning will be started
@@ -567,13 +567,12 @@ module.exports = SitumConversionArea
  * @property {boolean} useForegroundService - Defines whether or not to activate the {@link http://developers.situm.es/pages/android/using_situm_sdk_background.html foreground service}
  * @property {boolean} useDeadReckoning - Defines whether ot not to use dead reckoning to get fast position updates using only the inertial sensors, between the server position updates.
  * @property {OutdoorLocationOptions} outdoorLocationOptions - Outdoor location options. Only used in an indoor/outdoor request
- * @property {BeaconFilter[]} beaconFilters - Beacon filters to be handled during scan time, otherwise only Situm beacons will be scanned. Can be invoked multiple times to add as much beacon filters as you want @deprecated The SitumSDK now does it automatically
+ * @property {BeaconFilter[]} beaconFilters - Beacon filters to be handled during scan time, otherwise only Situm beacons will be scanned. Can be invoked multiple times to add as much beacon filters as you want.
  * @property {number} smallestDisplacement - Default smallest displacement to nofiy location updates
  * @property {string} realtimeUpdateInterval - Default interval to send locations to the Realtime. Possible values are REALTIME, FAST, NORMAL, SLOW and BATTERY_SAVER
  * @property {boolean} autoEnableBleDuringPositioning - Set if the BLE should be re-enabled during positioning if the ble is used. Android only
  */
-
-var LocationOptions = {
+var LocationRequest = {
   buildingIdentifier,
   interval,
   indoorProvider,
@@ -587,27 +586,22 @@ var LocationOptions = {
   outdoorLocationOptions,
   beaconFilters,
   smallestDisplacement,
-  realtimeUpdateInterval
-}
+  realtimeUpdateInterval,
+  autoEnableBleDuringPositioning,
+};
 
-module.exports = LocationOptions
+module.exports = LocationRequest;
 
 /**
  * @name
- * LocationRequest
+ * LocationOptions
  * @description
  * A data object that contains parameters for the location service, LocationManager.
- * @type {array}
- * @property {Building} building 0 - Building on which the positioning will be started
- * @property {LocationOptions} locationOptions 1 - Location options.
+ * @deprecated Use {@link LocationRequest} instead.
  */
+var LocationOptions = LocationRequest;
 
-var LocationRequest = {
-    building,
-    locationOptions
-}
-
-module.exports = LocationRequest
+module.exports = LocationOptions
 
 /**
  * @name

package/www/common-utils.js

@@ -0,0 +1,36 @@
+module.exports = {
+  /**
+   * Takes the different input types from requestLocationUpdates (and startPositioning) and standarizes the response.
+   * This function aims to maintain compatibility with older versions of this plugin.
+   * @param {any} input 
+   * @returns A single item array containing the LocationRequest, ready to be sent to native platforms.
+   */
+  standarizeRequest: function(input) {
+    let response;
+    if (!input) {
+      // If it is null or undefined, pass an empty location request.
+      response = {};
+    } else if (Array.isArray(input) && input.length > 0) {
+      // If it is an array:
+      if (input.every(item => typeof item === 'object')){
+        // It may contain objects (legacy API: Building + LocationOptions).
+        // Then merge all of them into a single object.
+        response = Object.assign({}, ...input);
+      } else if (typeof input[0] === 'string' || typeof input[0] === 'number') {
+        // It may contain a building identifier + a set of LocationOptions.
+        // Assign the building identifier and merge.
+        input[0] = {buildingIdentifier: input[0]};
+        response = Object.assign({}, ...input);
+      }
+    } else if (typeof input === 'string' || typeof input === 'number') {
+      // The input itself may be a single building identifier.
+      response = {buildingIdentifier: input};
+    } else {
+      // If the input is an object (or any other case), return the object itself. Delegate the
+      // error checks to the platform's mapper.
+      response = input;
+    }
+    // Cordova platforms wait for a JSONArray:
+    return [response];
+  }
+}