react-native-maps 1.12.0 → 1.13.1

package/android/src/main/java/com/rnmaps/maps/MapMarkerManager.java

@@ -25,165 +25,167 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
-  public static class AirMapMarkerSharedIcon {
-    private BitmapDescriptor iconBitmapDescriptor;
-    private Bitmap bitmap;
-    private final Map<MapMarker, Boolean> markers;
-    private boolean loadImageStarted;
-
-    public AirMapMarkerSharedIcon(){
-      this.markers = new WeakHashMap<>();
-      this.loadImageStarted = false;
-    }
+    public static class AirMapMarkerSharedIcon {
+        private BitmapDescriptor iconBitmapDescriptor;
+        private Bitmap bitmap;
+        private final Map<MapMarker, Boolean> markers;
+        private boolean loadImageStarted;
+
+        public AirMapMarkerSharedIcon() {
+            this.markers = new WeakHashMap<>();
+            this.loadImageStarted = false;
+        }
 
-    /**
-     * check whether the load image process started.
-     * caller AirMapMarker will only need to load it when this returns true.
-     *
-     * @return true if it is not started, false otherwise.
-     */
-    public synchronized boolean shouldLoadImage(){
-      if (!this.loadImageStarted) {
-        this.loadImageStarted = true;
-        return true;
-      }
-      return false;
+        /**
+         * check whether the load image process started.
+         * caller AirMapMarker will only need to load it when this returns true.
+         *
+         * @return true if it is not started, false otherwise.
+         */
+        public synchronized boolean shouldLoadImage() {
+            if (!this.loadImageStarted) {
+                this.loadImageStarted = true;
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * subscribe icon update for given marker.
+         * <p>
+         * The marker is wrapped in weakReference, so no need to remove it explicitly.
+         *
+         * @param marker
+         */
+        public synchronized void addMarker(MapMarker marker) {
+            this.markers.put(marker, true);
+            if (this.iconBitmapDescriptor != null) {
+                marker.setIconBitmapDescriptor(this.iconBitmapDescriptor, this.bitmap);
+            }
+        }
+
+        /**
+         * Remove marker from this shared icon.
+         * <p>
+         * Marker will only need to call it when the marker receives a different marker image uri.
+         *
+         * @param marker
+         */
+        public synchronized void removeMarker(MapMarker marker) {
+            this.markers.remove(marker);
+        }
+
+        /**
+         * check if there is markers still listening on this icon.
+         * when there are not markers listen on it, we can remove it.
+         *
+         * @return true if there is, false otherwise
+         */
+        public synchronized boolean hasMarker() {
+            return this.markers.isEmpty();
+        }
+
+        /**
+         * Update the bitmap descriptor and bitmap for the image uri.
+         * And notify all subscribers about the update.
+         *
+         * @param bitmapDescriptor
+         * @param bitmap
+         */
+        public synchronized void updateIcon(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
+
+            this.iconBitmapDescriptor = bitmapDescriptor;
+            this.bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+
+            if (this.markers.isEmpty()) {
+                return;
+            }
+
+            for (Map.Entry<MapMarker, Boolean> markerEntry : markers.entrySet()) {
+                if (markerEntry.getKey() != null) {
+                    markerEntry.getKey().setIconBitmapDescriptor(bitmapDescriptor, bitmap);
+                }
+            }
+        }
     }
 
+    private final Map<String, AirMapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
+
     /**
-     * subscribe icon update for given marker.
+     * get the shared icon object, if not existed, create a new one and store it.
      *
-     * The marker is wrapped in weakReference, so no need to remove it explicitly.
-     *
-     * @param marker
+     * @param uri
+     * @return the icon object for the given uri.
      */
-    public synchronized void addMarker(MapMarker marker) {
-      this.markers.put(marker, true);
-      if (this.iconBitmapDescriptor != null) {
-        marker.setIconBitmapDescriptor(this.iconBitmapDescriptor, this.bitmap);
-      }
+    public AirMapMarkerSharedIcon getSharedIcon(String uri) {
+        AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+        if (icon == null) {
+            synchronized (this) {
+                if ((icon = this.sharedIcons.get(uri)) == null) {
+                    icon = new AirMapMarkerSharedIcon();
+                    this.sharedIcons.put(uri, icon);
+                }
+            }
+        }
+        return icon;
     }
 
     /**
-     * Remove marker from this shared icon.
+     * Remove the share icon object from our sharedIcons map when no markers are listening for it.
      *
-     * Marker will only need to call it when the marker receives a different marker image uri.
-     *
-     * @param marker
+     * @param uri
      */
-    public synchronized void removeMarker(MapMarker marker) {
-      this.markers.remove(marker);
+    public void removeSharedIconIfEmpty(String uri) {
+        AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+        if (icon == null) {
+            return;
+        }
+        if (!icon.hasMarker()) {
+            synchronized (this) {
+                if ((icon = this.sharedIcons.get(uri)) != null && !icon.hasMarker()) {
+                    this.sharedIcons.remove(uri);
+                }
+            }
+        }
     }
 
-    /**
-     * check if there is markers still listening on this icon.
-     * when there are not markers listen on it, we can remove it.
-     *
-     * @return true if there is, false otherwise
-     */
-    public synchronized boolean hasMarker(){
-      return this.markers.isEmpty();
+    public MapMarkerManager() {
     }
 
-    /**
-     * Update the bitmap descriptor and bitmap for the image uri.
-     * And notify all subscribers about the update.
-     *
-     * @param bitmapDescriptor
-     * @param bitmap
-     */
-    public synchronized void updateIcon(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
+    @Override
+    public String getName() {
+        return "AIRMapMarker";
+    }
 
-      this.iconBitmapDescriptor = bitmapDescriptor;
-      this.bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+    @Override
+    public MapMarker createViewInstance(ThemedReactContext context) {
+        return new MapMarker(context, this);
+    }
 
-      if (this.markers.isEmpty()) {
-        return;
-      }
+    @ReactProp(name = "coordinate")
+    public void setCoordinate(MapMarker view, ReadableMap map) {
+        view.setCoordinate(map);
+    }
 
-      for (Map.Entry<MapMarker, Boolean> markerEntry: markers.entrySet()) {
-        if (markerEntry.getKey() != null) {
-          markerEntry.getKey().setIconBitmapDescriptor(bitmapDescriptor, bitmap);
-        }
-      }
+    @ReactProp(name = "title")
+    public void setTitle(MapMarker view, String title) {
+        view.setTitle(title);
     }
-  }
-
-  private final Map<String, AirMapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
-
-  /**
-   * get the shared icon object, if not existed, create a new one and store it.
-   *
-   * @param uri
-   * @return the icon object for the given uri.
-   */
-  public AirMapMarkerSharedIcon getSharedIcon(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
-    if (icon == null) {
-      synchronized (this) {
-        if((icon = this.sharedIcons.get(uri)) == null) {
-          icon = new AirMapMarkerSharedIcon();
-          this.sharedIcons.put(uri, icon);
-        }
-      }
+
+    @ReactProp(name = "identifier")
+    public void setIdentifier(MapMarker view, String identifier) {
+        view.setIdentifier(identifier);
     }
-    return icon;
-  }
-
-  /**
-   * Remove the share icon object from our sharedIcons map when no markers are listening for it.
-   *
-   * @param uri
-   */
-  public void removeSharedIconIfEmpty(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
-    if (icon == null) {return;}
-    if (!icon.hasMarker()) {
-      synchronized (this) {
-        if((icon = this.sharedIcons.get(uri)) != null && !icon.hasMarker()) {
-          this.sharedIcons.remove(uri);
-        }
-      }
+
+    @ReactProp(name = "description")
+    public void setDescription(MapMarker view, String description) {
+        view.setSnippet(description);
     }
-  }
-
-  public MapMarkerManager() {
-  }
-
-  @Override
-  public String getName() {
-    return "AIRMapMarker";
-  }
-
-  @Override
-  public MapMarker createViewInstance(ThemedReactContext context) {
-    return new MapMarker(context, this);
-  }
-
-  @ReactProp(name = "coordinate")
-  public void setCoordinate(MapMarker view, ReadableMap map) {
-    view.setCoordinate(map);
-  }
-
-  @ReactProp(name = "title")
-  public void setTitle(MapMarker view, String title) {
-    view.setTitle(title);
-  }
-
-  @ReactProp(name = "identifier")
-  public void setIdentifier(MapMarker view, String identifier) {
-    view.setIdentifier(identifier);
-  }
-
-  @ReactProp(name = "description")
-  public void setDescription(MapMarker view, String description) {
-    view.setSnippet(description);
-  }
-
-  // NOTE(lmr):
-  // android uses normalized coordinate systems for this, and is provided through the
-  // `anchor` property  and `calloutAnchor` instead.  Perhaps some work could be done
-  // to normalize iOS and android to use just one of the systems.
+
+    // NOTE(lmr):
+    // android uses normalized coordinate systems for this, and is provided through the
+    // `anchor` property  and `calloutAnchor` instead.  Perhaps some work could be done
+    // to normalize iOS and android to use just one of the systems.
 //    @ReactProp(name = "centerOffset")
 //    public void setCenterOffset(AirMapMarker view, ReadableMap map) {
 //
@@ -194,167 +196,167 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 //
 //    }
 
-  @ReactProp(name = "anchor")
-  public void setAnchor(MapMarker view, ReadableMap map) {
-    // should default to (0.5, 1) (bottom middle)
-    double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
-    double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
-    view.setAnchor(x, y);
-  }
-
-  @ReactProp(name = "calloutAnchor")
-  public void setCalloutAnchor(MapMarker view, ReadableMap map) {
-    // should default to (0.5, 0) (top middle)
-    double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
-    double y = map != null && map.hasKey("y") ? map.getDouble("y") : 0.0;
-    view.setCalloutAnchor(x, y);
-  }
-
-  @ReactProp(name = "image")
-  public void setImage(MapMarker view, @Nullable String source) {
-    view.setImage(source);
-  }
+    @ReactProp(name = "anchor")
+    public void setAnchor(MapMarker view, ReadableMap map) {
+        // should default to (0.5, 1) (bottom middle)
+        double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
+        double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
+        view.setAnchor(x, y);
+    }
+
+    @ReactProp(name = "calloutAnchor")
+    public void setCalloutAnchor(MapMarker view, ReadableMap map) {
+        // should default to (0.5, 0) (top middle)
+        double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
+        double y = map != null && map.hasKey("y") ? map.getDouble("y") : 0.0;
+        view.setCalloutAnchor(x, y);
+    }
+
+    @ReactProp(name = "image")
+    public void setImage(MapMarker view, @Nullable String source) {
+        view.setImage(source);
+    }
 //    public void setImage(AirMapMarker view, ReadableMap image) {
 //        view.setImage(image);
 //    }
 
-  @ReactProp(name = "icon")
-  public void setIcon(MapMarker view, @Nullable String source) {
-    view.setImage(source);
-  }
-
-  @ReactProp(name = "pinColor", defaultInt = Color.RED, customType = "Color")
-  public void setPinColor(MapMarker view, int pinColor) {
-    float[] hsv = new float[3];
-    Color.colorToHSV(pinColor, hsv);
-    // NOTE: android only supports a hue
-    view.setMarkerHue(hsv[0]);
-  }
-
-  @ReactProp(name = "rotation", defaultFloat = 0.0f)
-  public void setMarkerRotation(MapMarker view, float rotation) {
-    view.setRotation(rotation);
-  }
-
-  @ReactProp(name = "flat", defaultBoolean = false)
-  public void setFlat(MapMarker view, boolean flat) {
-    view.setFlat(flat);
-  }
-
-  @ReactProp(name = "draggable", defaultBoolean = false)
-  public void setDraggable(MapMarker view, boolean draggable) {
-    view.setDraggable(draggable);
-  }
-
-  @Override
-  @ReactProp(name = "zIndex", defaultFloat = 0.0f)
-  public void setZIndex(MapMarker view, float zIndex) {
-    super.setZIndex(view, zIndex);
-    int integerZIndex = Math.round(zIndex);
-    view.setZIndex(integerZIndex);
-  }
-
-  @Override
-  @ReactProp(name = "opacity", defaultFloat = 1.0f)
-  public void setOpacity(MapMarker view, float opacity) {
-    super.setOpacity(view, opacity);
-    view.setOpacity(opacity);
-  }
-
-  @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
-  public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
-    view.setTracksViewChanges(tracksViewChanges);
-  }
-
-  @Override
-  public void addView(MapMarker parent, View child, int index) {
-    // if an <Callout /> component is a child, then it is a callout view, NOT part of the
-    // marker.
-    if (child instanceof MapCallout) {
-      parent.setCalloutView((MapCallout) child);
-    } else {
-      super.addView(parent, child, index);
-      parent.update(true);
+    @ReactProp(name = "icon")
+    public void setIcon(MapMarker view, @Nullable String source) {
+        view.setImage(source);
+    }
+
+    @ReactProp(name = "pinColor", defaultInt = Color.RED, customType = "Color")
+    public void setPinColor(MapMarker view, int pinColor) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(pinColor, hsv);
+        // NOTE: android only supports a hue
+        view.setMarkerHue(hsv[0]);
     }
-  }
-
-  @Override
-  public void removeViewAt(MapMarker parent, int index) {
-    super.removeViewAt(parent, index);
-    parent.update(true);
-  }
-
-  @Override
-  public void receiveCommand(@NonNull MapMarker view, String commandId, @Nullable ReadableArray args) {
-    int duration;
-    double lat;
-    double lng;
-    ReadableMap region;
-
-    switch (commandId) {
-      case "showCallout":
-        ((Marker) view.getFeature()).showInfoWindow();
-        break;
-
-      case "hideCallout":
-        ((Marker) view.getFeature()).hideInfoWindow();
-        break;
-
-      case "animateMarkerToCoordinate":
-        if(args == null) {
-          break;
+
+    @ReactProp(name = "rotation", defaultFloat = 0.0f)
+    public void setMarkerRotation(MapMarker view, float rotation) {
+        view.setRotation(rotation);
+    }
+
+    @ReactProp(name = "flat", defaultBoolean = false)
+    public void setFlat(MapMarker view, boolean flat) {
+        view.setFlat(flat);
+    }
+
+    @ReactProp(name = "draggable", defaultBoolean = false)
+    public void setDraggable(MapMarker view, boolean draggable) {
+        view.setDraggable(draggable);
+    }
+
+    @Override
+    @ReactProp(name = "zIndex", defaultFloat = 0.0f)
+    public void setZIndex(MapMarker view, float zIndex) {
+        super.setZIndex(view, zIndex);
+        int integerZIndex = Math.round(zIndex);
+        view.setZIndex(integerZIndex);
+    }
+
+    @Override
+    @ReactProp(name = "opacity", defaultFloat = 1.0f)
+    public void setOpacity(MapMarker view, float opacity) {
+        super.setOpacity(view, opacity);
+        view.setOpacity(opacity);
+    }
+
+    @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
+    public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
+        view.setTracksViewChanges(tracksViewChanges);
+    }
+
+    @Override
+    public void addView(MapMarker parent, View child, int index) {
+        // if an <Callout /> component is a child, then it is a callout view, NOT part of the
+        // marker.
+        if (child instanceof MapCallout) {
+            parent.setCalloutView((MapCallout) child);
+        } else {
+            super.addView(parent, child, index);
+            parent.update(true);
+        }
+    }
+
+    @Override
+    public void removeViewAt(MapMarker parent, int index) {
+        super.removeViewAt(parent, index);
+        parent.update(true);
+    }
+
+    @Override
+    public void receiveCommand(@NonNull MapMarker view, String commandId, @Nullable ReadableArray args) {
+        int duration;
+        double lat;
+        double lng;
+        ReadableMap region;
+
+        switch (commandId) {
+            case "showCallout":
+                ((Marker) view.getFeature()).showInfoWindow();
+                break;
+
+            case "hideCallout":
+                ((Marker) view.getFeature()).hideInfoWindow();
+                break;
+
+            case "animateMarkerToCoordinate":
+                if (args == null) {
+                    break;
+                }
+                region = args.getMap(0);
+                duration = args.getInt(1);
+
+                lng = region.getDouble("longitude");
+                lat = region.getDouble("latitude");
+                view.animateToCoodinate(new LatLng(lat, lng), duration);
+                break;
+
+            case "redraw":
+                view.updateMarkerIcon();
+                break;
         }
-        region = args.getMap(0);
-        duration = args.getInt(1);
+    }
+
+    @Override
+    @Nullable
+    public Map getExportedCustomDirectEventTypeConstants() {
+        return MapBuilder.<String, Map<String, String>>builder()
+                .put("onPress", MapBuilder.of("registrationName", "onPress"))
+                .put("onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"))
+                .put("onDragStart", MapBuilder.of("registrationName", "onDragStart"))
+                .put("onDrag", MapBuilder.of("registrationName", "onDrag"))
+                .put("onDragEnd", MapBuilder.of("registrationName", "onDragEnd"))
+                .build();
+    }
 
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        view.animateToCoodinate(new LatLng(lat, lng), duration);
-        break;
+    @Override
+    @Nullable
+    public Map getExportedCustomBubblingEventTypeConstants() {
+        return MapBuilder.<String, Map<String, Object>>builder()
+                .put("onSelect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onSelect")))
+                .put("onDeselect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onDeselect")))
+                .build();
+    }
+
+
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        // we use a custom shadow node that emits the width/height of the view
+        // after layout with the updateExtraData method. Without this, we can't generate
+        // a bitmap of the appropriate width/height of the rendered view.
+        return new SizeReportingShadowNode();
+    }
 
-      case "redraw":
-        view.updateMarkerIcon();
-        break;
+    @Override
+    public void updateExtraData(MapMarker view, Object extraData) {
+        // This method is called from the shadow node with the width/height of the rendered
+        // marker view.
+        HashMap<String, Float> data = (HashMap<String, Float>) extraData;
+        float width = data.get("width");
+        float height = data.get("height");
+        view.update((int) width, (int) height);
     }
-  }
-
-  @Override
-  @Nullable
-  public Map getExportedCustomDirectEventTypeConstants() {
-    Map<String, Map<String, String>> map = MapBuilder.of(
-        "onPress", MapBuilder.of("registrationName", "onPress"),
-        "onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"),
-        "onDragStart", MapBuilder.of("registrationName", "onDragStart"),
-        "onDrag", MapBuilder.of("registrationName", "onDrag"),
-        "onDragEnd", MapBuilder.of("registrationName", "onDragEnd"),
-        "onSelect", MapBuilder.of("registrationName", "onSelect"),
-        "onDeselect", MapBuilder.of("registrationName", "onDeselect")
-    );
-
-    map.putAll(MapBuilder.of(
-        "onDragStart", MapBuilder.of("registrationName", "onDragStart"),
-        "onDrag", MapBuilder.of("registrationName", "onDrag"),
-        "onDragEnd", MapBuilder.of("registrationName", "onDragEnd")
-    ));
-
-    return map;
-  }
-
-  @Override
-  public LayoutShadowNode createShadowNodeInstance() {
-    // we use a custom shadow node that emits the width/height of the view
-    // after layout with the updateExtraData method. Without this, we can't generate
-    // a bitmap of the appropriate width/height of the rendered view.
-    return new SizeReportingShadowNode();
-  }
-
-  @Override
-  public void updateExtraData(MapMarker view, Object extraData) {
-    // This method is called from the shadow node with the width/height of the rendered
-    // marker view.
-    HashMap<String, Float> data = (HashMap<String, Float>) extraData;
-    float width = data.get("width");
-    float height = data.get("height");
-    view.update((int) width, (int) height);
-  }
 }

package/android/src/main/java/com/rnmaps/maps/MapModule.java

@@ -8,10 +8,8 @@ import android.location.Geocoder;
 import android.net.Uri;
 import android.util.Base64;
 import android.util.DisplayMetrics;
-import android.util.Log;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -25,8 +23,6 @@ import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.UIBlock;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapsInitializer;
-import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 
@@ -35,10 +31,9 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 @ReactModule(name = MapModule.NAME)
 public class MapModule extends ReactContextBaseJavaModule {
@@ -356,25 +351,4 @@ public class MapModule extends ReactContextBaseJavaModule {
       }
     });
   }
-
-  @ReactMethod
-  public void enableLatestRenderer(final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
-
-    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-    uiManager.addUIBlock(new UIBlock()
-    {
-      @Override
-      public void execute(NativeViewHierarchyManager nvhm)
-      {
-        MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, new OnMapsSdkInitializedCallback() {
-          @Override
-          public void onMapsSdkInitialized(@NonNull MapsInitializer.Renderer renderer) {
-            Log.d("AirMapRenderer", renderer.toString());
-            promise.resolve(renderer.toString());
-          }
-        });
-      }
-    });
-  }
 }