react-native-steerpath-smart-map 1.20.0 → 1.22.0

package/CHANGELOG.md

@@ -15,6 +15,18 @@ This package is built on top of Steerpath's Smart SDK, and most of releases are
 - [iOS](https://s3-eu-west-1.amazonaws.com/steerpath/ios/releases/smart-sdk-changelog/index.html)
 - [Web](https://s3-eu-west-1.amazonaws.com/steerpath-web-sdk/documentation/smart/latest/index.html)
 
+
+## [1.22.0] - 2023-04-24
+
+- Fixed issues where buildings or some POIs were not selectable when using onSearchResultSelected and selectMapObject combination
+- Bump Android Smart SDK version to android-smart-1.20.0
+- Bump iOS Smart SDK version to 1.16.5
+
+## [1.21.0]- 2023-04-14
+
+- Added externalFeedbackUrl to SmartMapObjectProperties
+- Bump iOS Smart SDK version to 1.16.4
+
 ## [1.20.0] - 2023-03-02
 
 - Added missing configString prop to ConfigSDK interface

package/android/build.gradle

@@ -53,7 +53,7 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactnativeVersion', '+')}"
-    implementation "com.steerpath:smart:android-smart-1.19.1"
+    implementation "com.steerpath:smart:android-smart-1.20.0"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0"
 }

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartMapModule.java

@@ -58,7 +58,7 @@ public class RNSmartMapModule extends ReactContextBaseJavaModule {
 
             mapView.getMap().getMapObject(localRef, buildingRef, source, (smartMapObject, s) -> {
                 if (smartMapObject != null) {
-                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject, false), s);
+                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject), s);
                 } else {
                     callback.invoke(null, s);
                 }
@@ -94,7 +94,7 @@ public class RNSmartMapModule extends ReactContextBaseJavaModule {
 
             mapView.getMap().getMapObjectByProperties(properties, (smartMapObject, s) -> {
                 if (smartMapObject != null) {
-                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject, false), s);
+                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject), s);
                 } else {
                     callback.invoke(null, s);
                 }

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartMapView.java

@@ -130,7 +130,7 @@ public class RNSmartMapView extends FrameLayout
         WritableArray array = new WritableNativeArray();
 
         for (SmartMapObject object : mapObjects) {
-            array.pushMap(smartMapObjectToWritableMap(object, false));
+            array.pushMap(smartMapObjectToWritableMap(object));
         }
 
         WritableMap map = new WritableNativeMap();
@@ -143,7 +143,7 @@ public class RNSmartMapView extends FrameLayout
     @Override
     public boolean onSearchResultSelected(SmartMapObject mapObject) {
         WritableMap map = new WritableNativeMap();
-        map.putMap("mapObject", smartMapObjectToWritableMap(mapObject, true));
+        map.putMap("mapObject", smartMapObjectToWritableMap(mapObject));
         manager.sendEvent(reactContext, this, SEARCH_RESULT_SELECTED, map);
         return true;
     }
@@ -160,7 +160,7 @@ public class RNSmartMapView extends FrameLayout
         payload.putMap("searchAction", action);
         WritableNativeArray list = new WritableNativeArray();
         for (SmartMapObject obj : searchResults) {
-            list.pushMap(smartMapObjectToWritableMap(obj, true));
+            list.pushMap(smartMapObjectToWritableMap(obj));
         }
 
         payload.putArray("searchResults", list);
@@ -225,16 +225,15 @@ public class RNSmartMapView extends FrameLayout
         if (userTask instanceof NavigationUserTask) {
             taskMap.putString("type", "navigation");
             taskMap.putMap("payload",
-                    smartMapObjectToWritableMap(((NavigationUserTask) userTask).getMapObjects().get(0), false));
+                    smartMapObjectToWritableMap(((NavigationUserTask) userTask).getMapObjects().get(0)));
         } else if (userTask instanceof POISelectionUserTask) {
             taskMap.putString("type", "poiSelection");
             WritableMap payload = new WritableNativeMap();
             payload.putMap("smartMapObject",
-                    smartMapObjectToWritableMap(((POISelectionUserTask) userTask).getMapObject(), false));
+                    smartMapObjectToWritableMap(((POISelectionUserTask) userTask).getMapObject()));
             taskMap.putMap("payload", payload);
         }
 
-        Log.d("nativeTask", "" + taskMap);
         map.putMap("userTask", taskMap);
 
         manager.sendEvent(reactContext, this, USER_TASK_RESPONSE, map);
@@ -319,7 +318,7 @@ public class RNSmartMapView extends FrameLayout
         }
 
         if (smartMapObject != null) {
-            map.putMap("smartMapObject", smartMapObjectToWritableMap(smartMapObject, false));
+            map.putMap("smartMapObject", smartMapObjectToWritableMap(smartMapObject));
         }
 
         map.putString("status", status);
@@ -400,8 +399,8 @@ public class RNSmartMapView extends FrameLayout
         smartMap.removeMarkers(smartMapObjects);
     }
 
-    public void selectMapObject(String buildingRef, String localRef) {
-        smartMap.selectMapObject(localRef, buildingRef);
+    public void selectMapObject(SmartMapObject mapObject) {
+        smartMap.selectMapObject(mapObject);
     }
 
     public void setCamera(double latitude, double longitude, double zoomLevel, double bearing, double pitch,
@@ -436,7 +435,6 @@ public class RNSmartMapView extends FrameLayout
         }
 
         int finalResId = resId;
-        Log.d("finalResId", "" + finalResId);
         smartMap.getMapObject(localRef, buildingRef, objectSource, (smartMapObject, s) -> {
             if (smartMapObject != null) {
                 smartMap.startUserTask(
@@ -453,15 +451,10 @@ public class RNSmartMapView extends FrameLayout
      * - - - - - PRIVATE METHODS - - - - -
      */
 
-    WritableMap smartMapObjectToWritableMap(SmartMapObject object, boolean removePropertiesKey) {
+    WritableMap smartMapObjectToWritableMap(SmartMapObject object) {
         WritableMap map = new WritableNativeMap();
         try {
-            if (removePropertiesKey) {
-                map.putMap("properties",
-                        convertJsonToWritableMap(object.getProperties().getJSONObject("properties")));
-            } else {
-                map.putMap("properties", convertJsonToWritableMap(object.getProperties()));
-            }
+            map.putMap("properties", convertJsonToWritableMap(object.getProperties()));
         } catch (JSONException e) {
             e.printStackTrace();
         }

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartMapViewManager.java

@@ -39,6 +39,10 @@ import static com.steerpath.rnsmartmap.RNEventKeys.USER_TASK_RESPONSE;
 import static com.steerpath.rnsmartmap.RNEventKeys.VIEW_STATUS_CHANGED;
 import static com.steerpath.rnsmartmap.RNEventKeys.VISIBLE_FLOOR_CHANGED;
 import static com.steerpath.rnsmartmap.RNEventKeys.BOTTOMSHEET_STATE_CHANGED;
+import static com.steerpath.rnsmartmap.Utils.convertMapToJson;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class RNSmartMapViewManager extends ViewGroupManager<RNSmartMapView> {
 
@@ -148,7 +152,6 @@ public class RNSmartMapViewManager extends ViewGroupManager<RNSmartMapView> {
                         args.getString(3), args.getString(4));
                 break;
             case ANIMATE_CAMERA:
-                Log.d("animateCamera", args.toString());
                 lat = args.getDouble(0);
                 lon = args.getDouble(1);
                 zoom = args.getDouble(2);
@@ -173,8 +176,7 @@ public class RNSmartMapViewManager extends ViewGroupManager<RNSmartMapView> {
                 mapView.removeMarkers(generateMapObjectsList(args.getArray(0)));
                 break;
             case SELECT_MAP_OBJECT:
-                map = args.getMap(0);
-                mapView.selectMapObject(getBuildingRef(map), getLocalRef(map));
+                mapView.selectMapObject(generateMapObject(args.getMap(0)));
                 break;
             case SET_CAMERA:
                 lat = args.getDouble(0);
@@ -262,8 +264,21 @@ public class RNSmartMapViewManager extends ViewGroupManager<RNSmartMapView> {
         return map.getString("source");
     }
 
-    void sendEvent(ReactContext reactContext, View view, String eventName, @Nullable WritableMap params) {
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), eventName, params);
+    private String getTitle(ReadableMap map) {
+        return map.getString("title");
+    }
+
+    private JSONObject getProperties(ReadableMap map) {
+        ReadableMap propertiesMap = map.getMap("properties");
+        JSONObject properties = new JSONObject();
+        if (propertiesMap != null) {
+            try {
+                properties = convertMapToJson(propertiesMap);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return properties;
     }
 
     private List<SmartMapObject> generateMapObjectsList(ReadableArray array) {
@@ -276,7 +291,17 @@ public class RNSmartMapViewManager extends ViewGroupManager<RNSmartMapView> {
     }
 
     private SmartMapObject generateMapObject(ReadableMap map) {
-        return new SmartMapObject(getLatitude(map), getLongitude(map), getFloorIndex(map), getLocalRef(map),
+        SmartMapObject mapObject = new SmartMapObject(getLatitude(map), getLongitude(map), getFloorIndex(map), getLocalRef(map),
                 getBuildingRef(map));
+        mapObject.setProperties(getProperties(map));
+        mapObject.setSource(getSource(map));
+        mapObject.setTitle(getTitle(map));
+
+        return mapObject;
+
+    }
+
+    void sendEvent(ReactContext reactContext, View view, String eventName, @Nullable WritableMap params) {
+        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), eventName, params);
     }
 }

package/android/src/main/java/com/steerpath/rnsmartmap/Utils.java

@@ -13,10 +13,6 @@ import org.json.JSONObject;
 
 import java.util.Iterator;
 
-import static com.facebook.react.bridge.ReadableType.Array;
-import static com.facebook.react.bridge.ReadableType.Map;
-import static com.facebook.react.bridge.ReadableType.Null;
-
 public class Utils {
 
     static WritableMap convertJsonToWritableMap(JSONObject jsonObject) throws JSONException {

package/dist/SmartMapViewProps.d.ts

@@ -171,6 +171,7 @@ export interface SmartMapObjectProperties {
     'title:nb'?: string;
     'title:en'?: string;
     weekPlannerCapacity?: number;
+    externalFeedbackUrl?: string;
     [key: string]: any;
 }
 export interface SmartMapObject {

package/ios/RCTConvert+SmartMapView.m

@@ -19,6 +19,9 @@
       localRef:[self NSString:json[@"localRef"]]
       buildingRef:[self NSString:json[@"buildingRef"]]];
   obj.title = [self NSString:json[@"title"]];
+
+  NSDictionary* props = [RCTConvert NSDictionary:json[@"properties"]];
+  obj.properties = props;
   
   NSString* rawSource = [self NSString:json[@"source"]];
   NSArray *items = @[@"static", @"marker", @"live"];

package/ios/RNSmartMapViewManager.m

@@ -291,7 +291,6 @@ RCT_EXPORT_METHOD(selectMapObject:(nonnull NSNumber*) reactTag
       [view selectMapObject:[RCTConvert SPSmartMapObject:json]];
     }
   }];
-  
 }
 
 RCT_EXPORT_METHOD(getWidgetPadding:(nonnull NSNumber*) reactTag

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-steerpath-smart-map",
   "title": "React Native Steerpath Smart Map",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "description": "Steerpath SmartMapView for React Native",
   "main": "dist/index.js",
   "scripts": {

package/react-native-steerpath-smart-map.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-	s.dependency 'SteerpathSmartSDK', '~> 1.16.3'
+	s.dependency 'SteerpathSmartSDK', '~> 1.16.5'
   # s.dependency "..."
 end
 

package/src/SmartMapViewProps.ts

@@ -235,6 +235,7 @@ export interface SmartMapObjectProperties {
   'title:nb'?: string;
   'title:en'?: string;
   weekPlannerCapacity?: number;
+  externalFeedbackUrl?: string;
   [key: string]: any; // Probably not the best practice, but this way we can get the access to properties that are not typed above.
 }