react-native-maps 1.15.7 → 1.17.0

package/README.md

@@ -129,7 +129,7 @@ Note: You can also pass the image binary data like `image={require('custom_pin.p
 
 ### Rendering a Marker with a custom view
 
-Note: This has performance implications, if you wish for a simpler solution go with a custom image (save your self the head ache)
+Note: This has performance implications, if you wish for a simpler solution go with a custom image (save your self the headache)
 
 ```jsx
 <Marker coordinate={{latitude: latitude, longitude: longitude}}>

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

@@ -4,7 +4,10 @@ import android.content.Context;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.google.android.gms.maps.model.Dash;
+import com.google.android.gms.maps.model.Gap;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PatternItem;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
 import com.google.maps.android.collections.PolygonManager;
@@ -25,6 +28,8 @@ public class MapPolygon extends MapFeature {
   private boolean geodesic;
   private boolean tappable;
   private float zIndex;
+  private ReadableArray patternValues;
+  private List<PatternItem> pattern;
 
   public MapPolygon(Context context) {
     super(context);
@@ -117,6 +122,32 @@ public class MapPolygon extends MapFeature {
     }
   }
 
+  public void setLineDashPattern(ReadableArray patternValues) {
+    this.patternValues = patternValues;
+    this.applyPattern();
+  }
+
+  private void applyPattern() {
+    if(patternValues == null) {
+      return;
+    }
+    this.pattern = new ArrayList<>(patternValues.size());
+    for (int i = 0; i < patternValues.size(); i++) {
+      float patternValue = (float) patternValues.getDouble(i);
+      boolean isGap = i % 2 != 0;
+      if(isGap) {
+        this.pattern.add(new Gap(patternValue));
+      }else {
+        PatternItem patternItem;
+        patternItem = new Dash(patternValue);
+        this.pattern.add(patternItem);
+      }
+    }
+    if(polygon != null) {
+      polygon.setStrokePattern(this.pattern);
+    }
+  }
+
   public PolygonOptions getPolygonOptions() {
     if (polygonOptions == null) {
       polygonOptions = createPolygonOptions();
@@ -132,6 +163,7 @@ public class MapPolygon extends MapFeature {
     options.strokeWidth(strokeWidth);
     options.geodesic(geodesic);
     options.zIndex(zIndex);
+    options.strokePattern(this.pattern);
 
     if (this.holes != null) {
       for (int i = 0; i < holes.size(); i++) {

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

@@ -78,6 +78,11 @@ public class MapPolygonManager extends ViewGroupManager<MapPolygon> {
     view.setZIndex(zIndex);
   }
 
+  @ReactProp(name = "lineDashPattern")
+  public void setLineDashPattern(MapPolygon view, ReadableArray patternValues) {
+      view.setLineDashPattern(patternValues);
+  }
+
   @Override
   @Nullable
   public Map getExportedCustomDirectEventTypeConstants() {

package/ios/AirMaps/AIRMap.m

@@ -38,6 +38,8 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 @property (nonatomic, strong) UIActivityIndicatorView *activityIndicatorView;
 @property (nonatomic, assign) NSNumber *shouldZoomEnabled;
 @property (nonatomic, assign) NSNumber *shouldScrollEnabled;
+@property (nonatomic, strong) MKCompassButton *defaultCompassButton;
+@property (nonatomic, strong) MKCompassButton *overlayCompassButton;
 
 - (void)updateScrollEnabled;
 - (void)updateZoomEnabled;
@@ -508,6 +510,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 // and check if their selector is available before calling super method.
 
 - (void)setShowsCompass:(BOOL)showsCompass {
+    if (self.overlayCompassButton != nil) {
+        self.overlayCompassButton.compassVisibility = showsCompass ? MKFeatureVisibilityAdaptive : MKFeatureVisibilityHidden;
+    }
     if ([MKMapView instancesRespondToSelector:@selector(setShowsCompass:)]) {
         [super setShowsCompass:showsCompass];
     }
@@ -702,15 +707,29 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)layoutSubviews {
     [super layoutSubviews];
     [self cacheViewIfNeeded];
-    NSUInteger index = [[self subviews] indexOfObjectPassingTest:^BOOL(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        NSString *str = NSStringFromClass([obj class]);
-        return [str containsString:@"MKCompassView"];
-    }];
-    if (index != NSNotFound) {
-        UIView* compassButton;
-        compassButton = [self.subviews objectAtIndex:index];
-        compassButton.frame = CGRectMake(compassButton.frame.origin.x + _compassOffset.x, compassButton.frame.origin.y + _compassOffset.y, compassButton.frame.size.width, compassButton.frame.size.height);
+
+    if (self.overlayCompassButton == nil) {
+        for (UIView *subview in self.subviews) {
+            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
+            self.overlayCompassButton = [MKCompassButton compassButtonWithMapView:self];
+            [subview addSubview:self.overlayCompassButton];
+            self.overlayCompassButton.frame = CGRectMake(self.overlayCompassButton.frame.origin.x + _compassOffset.x, self.overlayCompassButton.frame.origin.y + _compassOffset.y, self.overlayCompassButton.frame.size.width, self.overlayCompassButton.frame.size.height);
+            break;
+        }
     }
+    
+    if (self.defaultCompassButton == nil) {
+        for (UIView *subview in self.subviews) {
+            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
+            for (UIView *subview2 in subview.subviews) {
+                if (![NSStringFromClass(subview2.class) isEqualToString:@"MKCompassView"]) continue;
+                self.defaultCompassButton = subview2;
+                self.defaultCompassButton.hidden = YES;
+            }
+            break;
+        }
+    }
+    
 }
 
 // based on https://medium.com/@dmytrobabych/getting-actual-rotation-and-zoom-level-for-mapkit-mkmapview-e7f03f430aa9

package/lib/Geojson.d.ts

@@ -55,7 +55,7 @@ export type GeojsonProps = {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    lineDashPattern?: PolylineProps['lineDashPattern'];
+    lineDashPattern?: PolygonProps['lineDashPattern'] | PolylineProps['lineDashPattern'];
     /**
      * The offset (in points) at which to start drawing the dash pattern.
      *

package/lib/MapPolygon.d.ts

@@ -51,7 +51,7 @@ export type MapPolygonProps = ViewProps & {
      * followed by the first gap length, followed by the second line segment length, and so on.
      *
      * @platform iOS: Apple Maps only
-     * @platform Android: Not supported
+     * @platform Android: Supported
      */
     lineDashPattern?: number[];
     /**

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.15.7",
+  "version": "1.17.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",