react-native-map4d-services 1.0.2 → 1.2.0

package/android/src/main/java/com/reactnativemap4dservices/SConverter.java

@@ -1,166 +1,166 @@
-package com.reactnativemap4dservices;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-class SConverter {
-  private static String toAvoidPath(ReadableArray array) {
-    if (array == null) {
-      return null;
-    }
-    StringBuilder resultBuilder = new StringBuilder();
-    for (int i = 0; i < array.size(); ++i) {
-      resultBuilder.append(toLocation(array.getMap(i)));
-      if (i < array.size() - 1) {
-        resultBuilder.append(",");
-      }
-    }
-    return resultBuilder.toString();
-  }
-
-  static String toLocation(ReadableMap map) {
-    if (map == null) {
-      return null;
-    }
-    double lat = map.getDouble("latitude");
-    double lng = map.getDouble("longitude");
-    return lat + "," + lng;
-  }
-
-  static String toViewbox(ReadableMap map) {
-    if (map == null) {
-      return null;
-    }
-    String southWest = toLocation(map.getMap("southwest"));
-    String northEast = toLocation(map.getMap("northeast"));
-    return southWest + "," + northEast;
-  }
-
-  static String toDatetime(double time) {
-    long datetime = (long) time;
-    return String.valueOf(datetime);
-  }
-
-  static String toTypes(@NonNull ReadableArray types) {
-    StringBuilder result = new StringBuilder();
-    for (int i = 0; i < types.size(); ++i) {
-      if (i > 0) {
-        result.append("&types=");
-      }
-      result.append(types.getString(i));
-    }
-    return result.toString();
-  }
-
-  static String toTags(@NonNull ReadableArray tags) {
-    StringBuilder result = new StringBuilder();
-    for (int i = 0; i < tags.size(); ++i) {
-      if (i > 0) {
-        result.append("&tags=");
-      }
-      result.append(tags.getString(i));
-    }
-    return result.toString();
-  }
-
-  static int toWeighting(@NonNull String weighting) {
-    switch (weighting) {
-      case "shortest":
-        return 0;
-      case "fastest":
-        return 1;
-      case "balance":
-        return 2;
-      default:
-        return 3;
-    }
-  }
-
-  static String toLocationList(ReadableArray map) {
-    if (map == null) {
-      return null;
-    }
-
-    StringBuilder result = new StringBuilder();
-    for (int i = 0; i < map.size(); ++i) {
-      result.append(toLocation(map.getMap(i)));
-      if (i < map.size() - 1) {
-        result.append(";");
-      }
-    }
-    return result.toString();
-  }
-
-  static JSONArray toOriginJsonArray(ReadableArray origins) {
-    if (origins == null) {
-      return null;
-    }
-    JSONArray originsJsonArray = null;
-    if (origins != null && origins.size() > 0) {
-      originsJsonArray = new JSONArray();
-    }
-    for (int i = 0; i < origins.size(); ++i) {
-      ReadableMap origin = origins.getMap(i);
-      try {
-        JSONObject originJsonObject = new JSONObject();
-        String alias = origin.getString("alias");
-        originJsonObject.put("alias", alias);
-        originJsonObject.put("location", toLocation(origin));
-        originsJsonArray.put(originJsonObject);
-      } catch (JSONException e) {
-        e.printStackTrace();
-      }
-    }
-    return originsJsonArray;
-  }
-
-  static String toAvoid(ReadableMap map) {
-    if (map == null) {
-      return null;
-    }
-    StringBuilder resultBuilder = new StringBuilder();
-    if (map.hasKey("location")) {
-      String location = toLocation(map.getMap("location"));
-      if (location != null) {
-        resultBuilder.append(location);
-        if (map.hasKey("radius")) {
-          int radius = map.getInt("radius");
-          resultBuilder.append(",").append(radius);
-        }
-      }
-    }
-    else if (map.hasKey("viewbox")) {
-      resultBuilder.append(toViewbox(map.getMap("viewbox")));
-    }
-    else if (map.hasKey("path")) {
-      resultBuilder.append(toAvoidPath(map.getArray("path")));
-    }
-
-    return resultBuilder.toString();
-  }
-
-  static String toAvoidRoads(ReadableMap map) {
-    if (map == null) {
-      return null;
-    }
-    if (map.hasKey("types")) {
-      StringBuilder resultBuilder = new StringBuilder();
-      ReadableArray array = map.getArray("types");
-      for (int i = 0; i < array.size(); ++i) {
-        String type = array.getString(i);
-        resultBuilder.append(type);
-        if (i < array.size() - 1) {
-          resultBuilder.append(",");
-        }
-      }
-      return resultBuilder.toString();
-    }
-    return null;
-  }
-}
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+class SConverter {
+  private static String toAvoidPath(ReadableArray array) {
+    if (array == null) {
+      return null;
+    }
+    StringBuilder resultBuilder = new StringBuilder();
+    for (int i = 0; i < array.size(); ++i) {
+      resultBuilder.append(toLocation(array.getMap(i)));
+      if (i < array.size() - 1) {
+        resultBuilder.append(",");
+      }
+    }
+    return resultBuilder.toString();
+  }
+
+  static String toLocation(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    double lat = map.getDouble("latitude");
+    double lng = map.getDouble("longitude");
+    return lat + "," + lng;
+  }
+
+  static String toViewbox(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    String southWest = toLocation(map.getMap("southwest"));
+    String northEast = toLocation(map.getMap("northeast"));
+    return southWest + "," + northEast;
+  }
+
+  static String toDatetime(double time) {
+    long datetime = (long) time;
+    return String.valueOf(datetime);
+  }
+
+  static String toTypes(@NonNull ReadableArray types) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < types.size(); ++i) {
+      if (i > 0) {
+        result.append("&types=");
+      }
+      result.append(types.getString(i));
+    }
+    return result.toString();
+  }
+
+  static String toTags(@NonNull ReadableArray tags) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < tags.size(); ++i) {
+      if (i > 0) {
+        result.append("&tags=");
+      }
+      result.append(tags.getString(i));
+    }
+    return result.toString();
+  }
+
+  static int toWeighting(@NonNull String weighting) {
+    switch (weighting) {
+      case "shortest":
+        return 0;
+      case "fastest":
+        return 1;
+      case "balance":
+        return 2;
+      default:
+        return 3;
+    }
+  }
+
+  static String toLocationList(ReadableArray map) {
+    if (map == null) {
+      return null;
+    }
+
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < map.size(); ++i) {
+      result.append(toLocation(map.getMap(i)));
+      if (i < map.size() - 1) {
+        result.append(";");
+      }
+    }
+    return result.toString();
+  }
+
+  static JSONArray toOriginJsonArray(ReadableArray origins) {
+    if (origins == null) {
+      return null;
+    }
+    JSONArray originsJsonArray = null;
+    if (origins != null && origins.size() > 0) {
+      originsJsonArray = new JSONArray();
+    }
+    for (int i = 0; i < origins.size(); ++i) {
+      ReadableMap origin = origins.getMap(i);
+      try {
+        JSONObject originJsonObject = new JSONObject();
+        String alias = origin.getString("alias");
+        originJsonObject.put("alias", alias);
+        originJsonObject.put("location", toLocation(origin));
+        originsJsonArray.put(originJsonObject);
+      } catch (JSONException e) {
+        e.printStackTrace();
+      }
+    }
+    return originsJsonArray;
+  }
+
+  static String toAvoid(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    StringBuilder resultBuilder = new StringBuilder();
+    if (map.hasKey("location")) {
+      String location = toLocation(map.getMap("location"));
+      if (location != null) {
+        resultBuilder.append(location);
+        if (map.hasKey("radius")) {
+          int radius = map.getInt("radius");
+          resultBuilder.append(",").append(radius);
+        }
+      }
+    }
+    else if (map.hasKey("viewbox")) {
+      resultBuilder.append(toViewbox(map.getMap("viewbox")));
+    }
+    else if (map.hasKey("path")) {
+      resultBuilder.append(toAvoidPath(map.getArray("path")));
+    }
+
+    return resultBuilder.toString();
+  }
+
+  static String toAvoidRoads(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    if (map.hasKey("types")) {
+      StringBuilder resultBuilder = new StringBuilder();
+      ReadableArray array = map.getArray("types");
+      for (int i = 0; i < array.size(); ++i) {
+        String type = array.getString(i);
+        resultBuilder.append(type);
+        if (i < array.size() - 1) {
+          resultBuilder.append(",");
+        }
+      }
+      return resultBuilder.toString();
+    }
+    return null;
+  }
+}

package/android/src/main/java/com/reactnativemap4dservices/SJsonUtils.java

@@ -1,130 +1,130 @@
-package com.reactnativemap4dservices;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-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;
-import org.json.JSONObject;
-
-import java.util.Iterator;
-
-class SJsonUtils {
-  @NonNull
-  static WritableMap convertJsonToMap(@NonNull JSONObject jsonObject) throws JSONException {
-    WritableMap map = new WritableNativeMap();
-
-    Iterator<String> iterator = jsonObject.keys();
-    while (iterator.hasNext()) {
-      String key = iterator.next();
-      Object value = jsonObject.get(key);
-      if (value instanceof JSONObject) {
-        map.putMap(key, convertJsonToMap((JSONObject) value));
-      } else if (value instanceof JSONArray) {
-        map.putArray(key, convertJsonToArray((JSONArray) value));
-        if (("option_values").equals(key)) {
-          map.putArray("options", convertJsonToArray((JSONArray) value));
-        }
-      } else if (value instanceof Boolean) {
-        map.putBoolean(key, (Boolean) value);
-      } else if (value instanceof Integer) {
-        map.putInt(key, (Integer) value);
-      } else if (value instanceof Double) {
-        map.putDouble(key, (Double) value);
-      } else if (value instanceof String) {
-        map.putString(key, (String) value);
-      } else {
-        map.putString(key, value.toString());
-      }
-    }
-    return map;
-  }
-
-  @NonNull
-  static WritableArray convertJsonToArray(@NonNull JSONArray jsonArray) throws JSONException {
-    WritableArray array = new WritableNativeArray();
-    for (int i = 0; i < jsonArray.length(); i++) {
-      Object value = jsonArray.get(i);
-      if (value instanceof JSONObject) {
-        array.pushMap(convertJsonToMap((JSONObject) value));
-      } else if (value instanceof JSONArray) {
-        array.pushArray(convertJsonToArray((JSONArray) value));
-      } else if (value instanceof Boolean) {
-        array.pushBoolean((Boolean) value);
-      } else if (value instanceof Integer) {
-        array.pushInt((Integer) value);
-      } else if (value instanceof Double) {
-        array.pushDouble((Double) value);
-      } else if (value instanceof String) {
-        array.pushString((String) value);
-      } else {
-        array.pushString(value.toString());
-      }
-    }
-    return array;
-  }
-
-  @NonNull
-  static JSONObject convertMapToJson(@NonNull ReadableMap readableMap) throws JSONException {
-    JSONObject object = new JSONObject();
-    ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-    while (iterator.hasNextKey()) {
-      String key = iterator.nextKey();
-      switch (readableMap.getType(key)) {
-        case Null:
-          object.put(key, JSONObject.NULL);
-          break;
-        case Boolean:
-          object.put(key, readableMap.getBoolean(key));
-          break;
-        case Number:
-          object.put(key, readableMap.getDouble(key));
-          break;
-        case String:
-          object.put(key, readableMap.getString(key));
-          break;
-        case Map:
-          object.put(key, convertMapToJson(readableMap.getMap(key)));
-          break;
-        case Array:
-          object.put(key, convertArrayToJson(readableMap.getArray(key)));
-          break;
-      }
-    }
-    return object;
-  }
-
-  @NonNull
-  static JSONArray convertArrayToJson(@NonNull ReadableArray readableArray) throws JSONException {
-    JSONArray array = new JSONArray();
-    for (int i = 0; i < readableArray.size(); i++) {
-      switch (readableArray.getType(i)) {
-        case Null:
-          break;
-        case Boolean:
-          array.put(readableArray.getBoolean(i));
-          break;
-        case Number:
-          array.put(readableArray.getDouble(i));
-          break;
-        case String:
-          array.put(readableArray.getString(i));
-          break;
-        case Map:
-          array.put(convertMapToJson(readableArray.getMap(i)));
-          break;
-        case Array:
-          array.put(convertArrayToJson(readableArray.getArray(i)));
-          break;
-      }
-    }
-    return array;
-  }
-}
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+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;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+class SJsonUtils {
+  @NonNull
+  static WritableMap convertJsonToMap(@NonNull JSONObject jsonObject) throws JSONException {
+    WritableMap map = new WritableNativeMap();
+
+    Iterator<String> iterator = jsonObject.keys();
+    while (iterator.hasNext()) {
+      String key = iterator.next();
+      Object value = jsonObject.get(key);
+      if (value instanceof JSONObject) {
+        map.putMap(key, convertJsonToMap((JSONObject) value));
+      } else if (value instanceof JSONArray) {
+        map.putArray(key, convertJsonToArray((JSONArray) value));
+        if (("option_values").equals(key)) {
+          map.putArray("options", convertJsonToArray((JSONArray) value));
+        }
+      } else if (value instanceof Boolean) {
+        map.putBoolean(key, (Boolean) value);
+      } else if (value instanceof Integer) {
+        map.putInt(key, (Integer) value);
+      } else if (value instanceof Double) {
+        map.putDouble(key, (Double) value);
+      } else if (value instanceof String) {
+        map.putString(key, (String) value);
+      } else {
+        map.putString(key, value.toString());
+      }
+    }
+    return map;
+  }
+
+  @NonNull
+  static WritableArray convertJsonToArray(@NonNull JSONArray jsonArray) throws JSONException {
+    WritableArray array = new WritableNativeArray();
+    for (int i = 0; i < jsonArray.length(); i++) {
+      Object value = jsonArray.get(i);
+      if (value instanceof JSONObject) {
+        array.pushMap(convertJsonToMap((JSONObject) value));
+      } else if (value instanceof JSONArray) {
+        array.pushArray(convertJsonToArray((JSONArray) value));
+      } else if (value instanceof Boolean) {
+        array.pushBoolean((Boolean) value);
+      } else if (value instanceof Integer) {
+        array.pushInt((Integer) value);
+      } else if (value instanceof Double) {
+        array.pushDouble((Double) value);
+      } else if (value instanceof String) {
+        array.pushString((String) value);
+      } else {
+        array.pushString(value.toString());
+      }
+    }
+    return array;
+  }
+
+  @NonNull
+  static JSONObject convertMapToJson(@NonNull ReadableMap readableMap) throws JSONException {
+    JSONObject object = new JSONObject();
+    ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+    while (iterator.hasNextKey()) {
+      String key = iterator.nextKey();
+      switch (readableMap.getType(key)) {
+        case Null:
+          object.put(key, JSONObject.NULL);
+          break;
+        case Boolean:
+          object.put(key, readableMap.getBoolean(key));
+          break;
+        case Number:
+          object.put(key, readableMap.getDouble(key));
+          break;
+        case String:
+          object.put(key, readableMap.getString(key));
+          break;
+        case Map:
+          object.put(key, convertMapToJson(readableMap.getMap(key)));
+          break;
+        case Array:
+          object.put(key, convertArrayToJson(readableMap.getArray(key)));
+          break;
+      }
+    }
+    return object;
+  }
+
+  @NonNull
+  static JSONArray convertArrayToJson(@NonNull ReadableArray readableArray) throws JSONException {
+    JSONArray array = new JSONArray();
+    for (int i = 0; i < readableArray.size(); i++) {
+      switch (readableArray.getType(i)) {
+        case Null:
+          break;
+        case Boolean:
+          array.put(readableArray.getBoolean(i));
+          break;
+        case Number:
+          array.put(readableArray.getDouble(i));
+          break;
+        case String:
+          array.put(readableArray.getString(i));
+          break;
+        case Map:
+          array.put(convertMapToJson(readableArray.getMap(i)));
+          break;
+        case Array:
+          array.put(convertArrayToJson(readableArray.getArray(i)));
+          break;
+      }
+    }
+    return array;
+  }
+}