react-native-map4d-map-dtqg 0.1.1 → 0.1.3

package/android/src/main/java/com/reactnativemap4dmap/RMFTileOverlay.java

@@ -1,95 +1,95 @@
-package com.reactnativemap4dmap;
-
-import android.content.Context;
-
-import vn.map4d.map.core.*;
-
-import vn.map4d.map.overlays.MFTileOverlay;
-import vn.map4d.map.overlays.MFTileOverlayOptions;
-import vn.map4d.map.overlays.MFTileProvider;
-import vn.map4d.map.overlays.MFUrlTileProvider;
-
-public class RMFTileOverlay extends RMFFeature {
-
-  private MFTileOverlayOptions options;
-  private MFTileOverlay tileOverlay;
-
-  private String templateUrl;
-  private boolean visible;
-  private double zIndex;
-
-  public RMFTileOverlay(Context context) {
-    super(context);
-    visible = true;
-    zIndex = 0.0f;
-    templateUrl = null;
-  }
-
-  public void addToMap(Map4D map) {
-    this.tileOverlay = map.addTileOverlay(getOptions());
-  }
-
-  public void removeFromMap(Map4D map) {
-    if (tileOverlay == null) {
-      return;
-    }
-    tileOverlay.remove();
-    tileOverlay = null;
-  }
-
-  public void setTemplateUrl(String url) {
-    this.templateUrl = url;
-  }
-
-  public void setVisible(boolean visible) {
-    this.visible = visible;
-    if (tileOverlay != null) {
-      tileOverlay.setVisible(this.visible);
-    }
-  }
-
-  public void setZIndex(double zIndex) {
-    this.zIndex = zIndex;
-    if (tileOverlay != null) {
-      tileOverlay.setZIndex(this.zIndex);
-    }
-  }
-
-   public MFTileOverlayOptions getOptions() {
-    if (options == null) {
-      options = new MFTileOverlayOptions();
-    }
-
-    fillOptions(options);
-    return options;
-  }
-
-  private MFTileOverlayOptions fillOptions(MFTileOverlayOptions options) {
-    MFTileProvider tileProvider = new MFUrlTileProvider() {
-      @Override
-      public String getTileUrl(int x, int y, int zoom) {
-        if (templateUrl == null) {
-          return null;
-        }
-        String url;
-        if (templateUrl.contains("{z}")) {
-          url = templateUrl.replace("{z}", String.valueOf(zoom));
-        }
-        else {
-          url = templateUrl.replace("{zoom}", String.valueOf(zoom));
-        }
-        url = url.replace("{x}", String.valueOf(x));
-        url = url.replace("{y}", String.valueOf(y));
-        return url;
-      }
-    };
-    options.tileProvider(tileProvider);
-    options.zIndex(zIndex);
-    options.visible(visible);
-    return options;
-  }
-
-   public Object getFeature() {
-      return tileOverlay;
-   }
-}
+package com.reactnativemap4dmap;
+
+import android.content.Context;
+
+import vn.map4d.map.core.*;
+
+import vn.map4d.map.overlays.MFTileOverlay;
+import vn.map4d.map.overlays.MFTileOverlayOptions;
+import vn.map4d.map.overlays.MFTileProvider;
+import vn.map4d.map.overlays.MFUrlTileProvider;
+
+public class RMFTileOverlay extends RMFFeature {
+
+  private MFTileOverlayOptions options;
+  private MFTileOverlay tileOverlay;
+
+  private String templateUrl;
+  private boolean visible;
+  private double zIndex;
+
+  public RMFTileOverlay(Context context) {
+    super(context);
+    visible = true;
+    zIndex = 0.0f;
+    templateUrl = null;
+  }
+
+  public void addToMap(Map4D map) {
+    this.tileOverlay = map.addTileOverlay(getOptions());
+  }
+
+  public void removeFromMap(Map4D map) {
+    if (tileOverlay == null) {
+      return;
+    }
+    tileOverlay.remove();
+    tileOverlay = null;
+  }
+
+  public void setTemplateUrl(String url) {
+    this.templateUrl = url;
+  }
+
+  public void setVisible(boolean visible) {
+    this.visible = visible;
+    if (tileOverlay != null) {
+      tileOverlay.setVisible(this.visible);
+    }
+  }
+
+  public void setZIndex(double zIndex) {
+    this.zIndex = zIndex;
+    if (tileOverlay != null) {
+      tileOverlay.setZIndex(this.zIndex);
+    }
+  }
+
+   public MFTileOverlayOptions getOptions() {
+    if (options == null) {
+      options = new MFTileOverlayOptions();
+    }
+
+    fillOptions(options);
+    return options;
+  }
+
+  private MFTileOverlayOptions fillOptions(MFTileOverlayOptions options) {
+    MFTileProvider tileProvider = new MFUrlTileProvider() {
+      @Override
+      public String getTileUrl(int x, int y, int zoom) {
+        if (templateUrl == null) {
+          return null;
+        }
+        String url;
+        if (templateUrl.contains("{z}")) {
+          url = templateUrl.replace("{z}", String.valueOf(zoom));
+        }
+        else {
+          url = templateUrl.replace("{zoom}", String.valueOf(zoom));
+        }
+        url = url.replace("{x}", String.valueOf(x));
+        url = url.replace("{y}", String.valueOf(y));
+        return url;
+      }
+    };
+    options.tileProvider(tileProvider);
+    options.zIndex(zIndex);
+    options.visible(visible);
+    return options;
+  }
+
+   public Object getFeature() {
+      return tileOverlay;
+   }
+}

package/android/src/main/java/com/reactnativemap4dmap/RMFTileOverlayManager.java

@@ -1,65 +1,65 @@
-package com.reactnativemap4dmap;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RMFTileOverlayManager extends ViewGroupManager<RMFTileOverlay> {
-  private static final int k_setVisible = 1;
-  private static final int k_setZIndex = k_setVisible + 1;
-
-  @Override
-  public String getName() {
-    return "RMFTileOverlay";
-  }
-
-  @Override
-  protected RMFTileOverlay createViewInstance(final ThemedReactContext reactContext) {
-    return new RMFTileOverlay(reactContext);
-  }
-
-  @Override
-  public void receiveCommand(final RMFTileOverlay view, final int commandId, @Nullable final ReadableArray args) {
-    ReadableMap data;
-    switch (commandId) {
-      case k_setVisible:
-        view.setVisible(args.getBoolean(0));
-        break;
-      case k_setZIndex:
-        view.setZIndex(args.getDouble(0));
-        break;
-    }
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Integer> getCommandsMap() {
-    final HashMap<String, Integer> map = new HashMap();
-    map.put("setVisible", k_setVisible);
-    map.put("setZIndex", k_setZIndex);
-    return map;
-  }
-
-  @ReactProp(name = "urlTemplate")
-  public void setTemplateUrl(final RMFTileOverlay view, final String url) {
-    view.setTemplateUrl(url);
-  }
-
-  @ReactProp(name = "visible")
-  public void setVisible(final RMFTileOverlay view, final boolean visible) {
-    view.setVisible(visible);
-  }
-
-  @ReactProp(name = "zIndex")
-  public void setZIndex(final RMFTileOverlay view, final double zIndex) {
-    view.setZIndex(zIndex);
-  }
-
+package com.reactnativemap4dmap;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RMFTileOverlayManager extends ViewGroupManager<RMFTileOverlay> {
+  private static final int k_setVisible = 1;
+  private static final int k_setZIndex = k_setVisible + 1;
+
+  @Override
+  public String getName() {
+    return "RMFTileOverlay";
+  }
+
+  @Override
+  protected RMFTileOverlay createViewInstance(final ThemedReactContext reactContext) {
+    return new RMFTileOverlay(reactContext);
+  }
+
+  @Override
+  public void receiveCommand(final RMFTileOverlay view, final int commandId, @Nullable final ReadableArray args) {
+    ReadableMap data;
+    switch (commandId) {
+      case k_setVisible:
+        view.setVisible(args.getBoolean(0));
+        break;
+      case k_setZIndex:
+        view.setZIndex(args.getDouble(0));
+        break;
+    }
+  }
+
+  @Nullable
+  @Override
+  public Map<String, Integer> getCommandsMap() {
+    final HashMap<String, Integer> map = new HashMap();
+    map.put("setVisible", k_setVisible);
+    map.put("setZIndex", k_setZIndex);
+    return map;
+  }
+
+  @ReactProp(name = "urlTemplate")
+  public void setTemplateUrl(final RMFTileOverlay view, final String url) {
+    view.setTemplateUrl(url);
+  }
+
+  @ReactProp(name = "visible")
+  public void setVisible(final RMFTileOverlay view, final boolean visible) {
+    view.setVisible(visible);
+  }
+
+  @ReactProp(name = "zIndex")
+  public void setZIndex(final RMFTileOverlay view, final double zIndex) {
+    view.setZIndex(zIndex);
+  }
+
 }

package/android/src/main/java/com/reactnativemap4dmap/SizeReportingShadowNode.java

@@ -1,31 +1,31 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-package com.reactnativemap4dmap;
-
-import com.facebook.react.uimanager.LayoutShadowNode;
-import com.facebook.react.uimanager.UIViewOperationQueue;
-
-import java.util.HashMap;
-import java.util.Map;
-
-// Custom LayoutShadowNode implementation used in conjunction with the AirMapManager
-// which sends the width/height of the view after layout occurs.
-public class SizeReportingShadowNode extends LayoutShadowNode {
-
-  @Override
-  public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
-    super.onCollectExtraUpdates(uiViewOperationQueue);
-
-    Map<String, Float> data = new HashMap<>();
-    data.put("width", getLayoutWidth());
-    data.put("height", getLayoutHeight());
-
-    uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), data);
-  }
-}
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.reactnativemap4dmap;
+
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.UIViewOperationQueue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+// Custom LayoutShadowNode implementation used in conjunction with the AirMapManager
+// which sends the width/height of the view after layout occurs.
+public class SizeReportingShadowNode extends LayoutShadowNode {
+
+  @Override
+  public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
+    super.onCollectExtraUpdates(uiViewOperationQueue);
+
+    Map<String, Float> data = new HashMap<>();
+    data.put("width", getLayoutWidth());
+    data.put("height", getLayoutHeight());
+
+    uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), data);
+  }
+}

package/android/src/main/java/com/reactnativemap4dmap/ViewAttacherGroup.java

@@ -1,31 +1,31 @@
-package com.reactnativemap4dmap;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.os.Build;
-
-import com.facebook.react.uimanager.ViewProps;
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class ViewAttacherGroup extends ReactViewGroup {
-
-  public ViewAttacherGroup(Context context) {
-    super(context);
-
-    this.setWillNotDraw(true);
-    this.setVisibility(VISIBLE);
-    this.setAlpha(0.0f);
-    this.setRemoveClippedSubviews(false);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      this.setClipBounds(new Rect(0, 0, 0, 0));
-    }
-    this.setOverflow("hidden"); // Change to ViewProps.HIDDEN until RN 0.57 is base
-  }
-
-  // This should make it more performant, avoid trying to hard to overlap layers with opacity.
-  @Override
-  public boolean hasOverlappingRendering() {
-    return false;
-  }
-}
+package com.reactnativemap4dmap;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
+
+import com.facebook.react.uimanager.ViewProps;
+import com.facebook.react.views.view.ReactViewGroup;
+
+public class ViewAttacherGroup extends ReactViewGroup {
+
+  public ViewAttacherGroup(Context context) {
+    super(context);
+
+    this.setWillNotDraw(true);
+    this.setVisibility(VISIBLE);
+    this.setAlpha(0.0f);
+    this.setRemoveClippedSubviews(false);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      this.setClipBounds(new Rect(0, 0, 0, 0));
+    }
+    this.setOverflow("hidden"); // Change to ViewProps.HIDDEN until RN 0.57 is base
+  }
+
+  // This should make it more performant, avoid trying to hard to overlap layers with opacity.
+  @Override
+  public boolean hasOverlappingRendering() {
+    return false;
+  }
+}

package/android/src/main/java/com/reactnativemap4dmap/ViewChangesTracker.java

@@ -1,70 +1,70 @@
-package com.reactnativemap4dmap;
-
-import android.os.Handler;
-import android.os.Looper;
-
-import java.util.LinkedList;
-
-public class ViewChangesTracker {
-
-  private static ViewChangesTracker instance;
-  private Handler handler;
-  private LinkedList<RMFMarker> markers = new LinkedList<>();
-  private boolean hasScheduledFrame = false;
-  private Runnable updateRunnable;
-  private final long fps = 40;
-
-  private ViewChangesTracker() {
-    handler = new Handler(Looper.myLooper());
-    updateRunnable = new Runnable() {
-      @Override
-      public void run() {
-        hasScheduledFrame = false;
-        update();
-
-        if (markers.size() > 0) {
-          handler.postDelayed(updateRunnable, fps);
-        }
-      }
-    };
-  }
-
-  static ViewChangesTracker getInstance() {
-    if (instance == null) {
-      synchronized (ViewChangesTracker.class) {
-        instance = new ViewChangesTracker();
-      }
-    }
-
-    return instance;
-  }
-
-  public void addMarker(RMFMarker marker) {
-    markers.add(marker);
-
-    if (!hasScheduledFrame) {
-      hasScheduledFrame = true;
-      handler.postDelayed(updateRunnable, fps);
-    }
-  }
-
-  public void removeMarker(RMFMarker marker) {
-    markers.remove(marker);
-  }
-
-  private LinkedList<RMFMarker> markersToRemove = new LinkedList<>();
-
-  public void update() {
-    for (RMFMarker marker : markers) {
-      if (!marker.updateCustomForTracking()) {
-        markersToRemove.add(marker);
-      }
-    }
-
-    // Remove markers that are not active anymore
-    if (markersToRemove.size() > 0) {
-      markers.removeAll(markersToRemove);
-      markersToRemove.clear();
-    }
-  }
-}
+package com.reactnativemap4dmap;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.LinkedList;
+
+public class ViewChangesTracker {
+
+  private static ViewChangesTracker instance;
+  private Handler handler;
+  private LinkedList<RMFMarker> markers = new LinkedList<>();
+  private boolean hasScheduledFrame = false;
+  private Runnable updateRunnable;
+  private final long fps = 40;
+
+  private ViewChangesTracker() {
+    handler = new Handler(Looper.myLooper());
+    updateRunnable = new Runnable() {
+      @Override
+      public void run() {
+        hasScheduledFrame = false;
+        update();
+
+        if (markers.size() > 0) {
+          handler.postDelayed(updateRunnable, fps);
+        }
+      }
+    };
+  }
+
+  static ViewChangesTracker getInstance() {
+    if (instance == null) {
+      synchronized (ViewChangesTracker.class) {
+        instance = new ViewChangesTracker();
+      }
+    }
+
+    return instance;
+  }
+
+  public void addMarker(RMFMarker marker) {
+    markers.add(marker);
+
+    if (!hasScheduledFrame) {
+      hasScheduledFrame = true;
+      handler.postDelayed(updateRunnable, fps);
+    }
+  }
+
+  public void removeMarker(RMFMarker marker) {
+    markers.remove(marker);
+  }
+
+  private LinkedList<RMFMarker> markersToRemove = new LinkedList<>();
+
+  public void update() {
+    for (RMFMarker marker : markers) {
+      if (!marker.updateCustomForTracking()) {
+        markersToRemove.add(marker);
+      }
+    }
+
+    // Remove markers that are not active anymore
+    if (markersToRemove.size() > 0) {
+      markers.removeAll(markersToRemove);
+      markersToRemove.clear();
+    }
+  }
+}

package/android/src/main/java/vn/map4d/map/annotations/RMFBitmapDescriptor.java

@@ -1,9 +1,9 @@
-package vn.map4d.map.annotations;
-
-import android.graphics.Bitmap;
-
-public class RMFBitmapDescriptor {
-    public static MFBitmapDescriptor create(Bitmap bitmap, int densityDpi) {
-        return new MFBitmapDescriptor(bitmap, densityDpi);
-    }
-}
+package vn.map4d.map.annotations;
+
+import android.graphics.Bitmap;
+
+public class RMFBitmapDescriptor {
+    public static MFBitmapDescriptor create(Bitmap bitmap, int densityDpi) {
+        return new MFBitmapDescriptor(bitmap, densityDpi);
+    }
+}

package/ios/Map4dMap.h

@@ -1,7 +1,7 @@
-#import <React/RCTBridgeModule.h>
-#import "RMFMapViewManager.h"
-#import "RMFMarkerManager.h"
-
-@interface Map4dMap : NSObject <RCTBridgeModule>
-
-@end
+#import <React/RCTBridgeModule.h>
+#import "RMFMapViewManager.h"
+#import "RMFMarkerManager.h"
+
+@interface Map4dMap : NSObject <RCTBridgeModule>
+
+@end

package/ios/Map4dMap.m

@@ -1,14 +1,14 @@
-#import "Map4dMap.h"
-
-
-@implementation Map4dMap
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
-{
-    // TODO: Implement some actually useful functionality
-    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
-}
-
-@end
+#import "Map4dMap.h"
+
+
+@implementation Map4dMap
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
+{
+    // TODO: Implement some actually useful functionality
+    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
+}
+
+@end

package/ios/Map4dMap.xcodeproj/project.pbxproj

@@ -171,7 +171,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -214,7 +214,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;