@situm/react-native 3.0.10 → 3.1.0

package/android/src/main/java/com/situm/plugin/PluginHelper.java

@@ -60,6 +60,7 @@ import es.situm.sdk.location.GeofenceListener;
 import static com.situm.plugin.SitumPlugin.EVENT_LOCATION_CHANGED;
 import static com.situm.plugin.SitumPlugin.EVENT_LOCATION_ERROR;
 import static com.situm.plugin.SitumPlugin.EVENT_LOCATION_STATUS_CHANGED;
+import static com.situm.plugin.SitumPlugin.EVENT_LOCATION_STOPPED;
 import static com.situm.plugin.SitumPlugin.EVENT_NAVIGATION_ERROR;
 import static com.situm.plugin.SitumPlugin.EVENT_NAVIGATION_UPDATE;
 import static com.situm.plugin.SitumPlugin.EVENT_REALTIME_ERROR;
@@ -402,13 +403,14 @@ public class PluginHelper {
         }
     }
 
-    public void stopPositioning(Callback callback) {
+    public void stopPositioning(Callback callback, DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter) {
         try {
             SitumSdk.locationManager().removeUpdates();
             WritableMap map = Arguments.createMap();
             map.putBoolean("success", true);
             map.putString("message", "Stopped Successfully");
             invokeCallback(callback, map);
+            eventEmitter.emit(EVENT_LOCATION_STOPPED, null);
         } catch (Exception e) {
             invokeCallback(callback, e.getMessage());
         }
@@ -427,7 +429,6 @@ public class PluginHelper {
 
             DirectionsRequest directionRequest = SitumMapper.jsonObjectToDirectionsRequest(jsonBuilding, jsonFrom,
                     jsonTo, jsonOptions);
-
             SitumSdk.directionsManager().requestDirections(directionRequest, new Handler<Route>() {
                 @Override
                 public void onSuccess(Route route) {

package/android/src/main/java/com/situm/plugin/SitumMapper.java

@@ -7,12 +7,12 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -29,7 +29,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Stack;
 
 import es.situm.sdk.directions.DirectionsRequest;
 import es.situm.sdk.location.LocationRequest;
@@ -1100,9 +1099,12 @@ class SitumMapper {
         DirectionsRequest.AccessibilityMode accessibilityMode = DirectionsRequest.AccessibilityMode.CHOOSE_SHORTEST;
         Boolean minimizeFloorChanges = false;
         double startingAngle = 0.0;
-
+        
         if (joOptions != null) {
+        
+        
             if (joOptions.has(SitumMapper.ACCESSIBILITY_MODE)) {
+        
                 String mode = joOptions.getString(SitumMapper.ACCESSIBILITY_MODE);
                 if (mode.equals(DirectionsRequest.AccessibilityMode.ONLY_ACCESSIBLE.name())) {
                     accessibilityMode = DirectionsRequest.AccessibilityMode.ONLY_ACCESSIBLE;
@@ -1127,6 +1129,7 @@ class SitumMapper {
     }
 
     static ReadableArray mapList(List<? extends MapperInterface> modelObjects) {
+        
         WritableArray mappedList = new WritableNativeArray();
         for (MapperInterface modelObject : modelObjects) {
             ReadableMap modelMap = convertMapToReadableMap(modelObject.toMap());
@@ -1136,37 +1139,25 @@ class SitumMapper {
     }
 
     public static ReadableMap convertMapToReadableMap(Map<String, Object> map) {
-        WritableMap response = new WritableNativeMap();
-        // Use a local stack to keep nested objects (avoids recursion).
-        // First item in the stack: the given object.
-        Stack<Map<String, Object>> sourcesStack = new Stack();
-        Stack<WritableMap> responseStack = new Stack<>();
-        sourcesStack.push(map);
-        responseStack.push(response);
-
-        while (!sourcesStack.isEmpty()) {
-            Map<String, Object> currentSource = sourcesStack.pop();
-            WritableMap currentTarget = responseStack.pop();
-            for (Map.Entry<String, Object> entry : currentSource.entrySet()) {
-                String key = entry.getKey();
-                Object value = entry.getValue();
-                if (value instanceof String) {
-                    currentTarget.putString(key, (String) value);
-                } else if (value instanceof Integer) {
-                    currentTarget.putInt(key, (Integer) value);
-                } else if (value instanceof Double) {
-                    currentTarget.putDouble(key, (Double) value);
-                } else if (value instanceof Boolean) {
-                    currentTarget.putBoolean(key, (Boolean) value);
-                } else if (value instanceof List) {
-                    // Warning: #convertMapToReadableMap maybe called here:
-                    currentTarget.putArray(key, convertListToReadableArray((List<Object>) value));
-                } else if (value instanceof Map) {
-                    sourcesStack.push((Map) value);
-                    WritableMap nextMap = new WritableNativeMap();
-                    responseStack.push(nextMap);
-                    currentTarget.putMap(key, nextMap);
-                }
+        WritableMap response = Arguments.createMap();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (value instanceof String) {
+                response.putString(key, (String) value);
+            } else if (value instanceof Integer) {
+                response.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                response.putDouble(key, (Double) value);
+            } else if (value instanceof Boolean) {
+                response.putBoolean(key, (Boolean) value);
+            } else if (value instanceof List) {
+                // Warning: #convertMapToReadableMap maybe called here:
+                response.putArray(key, convertListToReadableArray((List<Object>) value));
+            } else if (value instanceof Map) {
+                // TODO: avoid recursive calls using a stack throws ObjectAlreadyConsumedException while
+                //  processing nested WritableMaps. Is there a way to avoid recursion?
+                response.putMap(key, convertMapToReadableMap((Map) value));
             }
         }
         return response;
@@ -1174,31 +1165,19 @@ class SitumMapper {
 
     public static ReadableArray convertListToReadableArray(List<Object> list) {
         WritableArray response = new WritableNativeArray();
-        Stack<List<Object>> sourcesStack = new Stack();
-        Stack<WritableArray> responseStack = new Stack<>();
-        sourcesStack.push(list);
-        responseStack.push(response);
-
-        while (!sourcesStack.isEmpty()) {
-            List<Object> currentSource = sourcesStack.pop();
-            WritableArray currentTarget = responseStack.pop();
-            for (Object value : currentSource) {
-                if (value instanceof String) {
-                    currentTarget.pushString((String) value);
-                } else if (value instanceof Integer) {
-                    currentTarget.pushInt((Integer) value);
-                } else if (value instanceof Double) {
-                    currentTarget.pushDouble((Double) value);
-                } else if (value instanceof Boolean) {
-                    currentTarget.pushBoolean((Boolean) value);
-                } else if (value instanceof Map) {
-                    currentTarget.pushMap(convertMapToReadableMap((Map) value));
-                } else if (value instanceof List) {
-                    sourcesStack.push((List) value);
-                    WritableArray nextList = new WritableNativeArray();
-                    responseStack.push(nextList);
-                    currentTarget.pushArray(nextList);
-                }
+        for (Object value : list) {
+            if (value instanceof String) {
+                response.pushString((String) value);
+            } else if (value instanceof Integer) {
+                response.pushInt((Integer) value);
+            } else if (value instanceof Double) {
+                response.pushDouble((Double) value);
+            } else if (value instanceof Boolean) {
+                response.pushBoolean((Boolean) value);
+            } else if (value instanceof Map) {
+                response.pushMap(convertMapToReadableMap((Map) value));
+            } else if (value instanceof List) {
+                response.pushArray(convertListToReadableArray((List) value));
             }
         }
         return response;

package/android/src/main/java/com/situm/plugin/SitumPlugin.java

@@ -8,6 +8,7 @@ public interface SitumPlugin {
     String EVENT_LOCATION_CHANGED = "locationChanged";
     String EVENT_LOCATION_ERROR = "locationError";
     String EVENT_LOCATION_STATUS_CHANGED = "statusChanged";
+    String EVENT_LOCATION_STOPPED = "locationStopped";
 
     String EVENT_NAVIGATION_UPDATE = "navigationUpdated";
     String EVENT_NAVIGATION_ERROR = "navigationError";

package/android/src/main/java/com/situm/plugin/SitumPluginImpl.java

@@ -181,7 +181,7 @@ public class SitumPluginImpl extends ReactContextBaseJavaModule implements Situm
     @Override
     @ReactMethod
     public void stopPositioning(Callback callback) {
-        getPluginInstance().stopPositioning(callback);
+       getPluginInstance().stopPositioning(callback, getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class));
     }
 
     @Override

package/ios/SitumPlugin.m

@@ -84,7 +84,7 @@ RCT_EXPORT_MODULE(RNCSitumPlugin);
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[@"locationChanged", @"statusChanged", @"locationError", @"navigationUpdated", @"navigationError", @"realtimeUpdated", @"realtimeError", @"onEnterGeofences", @"onExitGeofences"];
+    return @[@"locationChanged", @"statusChanged", @"locationError", @"locationStopped", @"navigationUpdated", @"navigationError", @"realtimeUpdated", @"realtimeError", @"onEnterGeofences", @"onExitGeofences"];
 }
 
 @synthesize computedRoute = _computedRoute;
@@ -359,6 +359,11 @@ RCT_EXPORT_METHOD(stopPositioning:(RCTResponseSenderBlock)callback)
     _positioningUpdates = NO;
     [[SITLocationManager sharedInstance] removeUpdates];
     [[SITLocationManager sharedInstance] removeDelegate:self];
+
+    NSDictionary *response = @{@"success": @YES, @"message": @"Stopped Successfully"};
+    callback(@[response]);
+
+    [self sendEventWithName:@"locationStopped" body:@{}];
 }
 
 RCT_EXPORT_METHOD(requestDirections: (NSArray *)requestArray withSuccessCallback:(RCTResponseSenderBlock)successBlock errorCallback:(RCTResponseSenderBlock)errorBlock)
@@ -897,13 +902,14 @@ destinationReachedOnRoute:(SITRoute *)route {
 
 
 - (void)didEnteredGeofences:(NSArray<SITGeofence *> *)geofences {    
+ 
     NSArray *geofencesJO = [SitumLocationWrapper.shared geofencesToJsonArray:geofences];
 
     [self sendEventWithName:@"onEnterGeofences" body:geofencesJO];
 }
 
 - (void)didExitedGeofences:(NSArray<SITGeofence *> *)geofences {
-
+ 
     NSArray *geofencesJO = [SitumLocationWrapper.shared geofencesToJsonArray:geofences];
 
     [self sendEventWithName:@"onExitGeofences" body:geofencesJO];