Modifications/Enhancements to MapView.UrlTile (react-native-maps#2136)

* 1. Allow canReplaceMapContent to be set on the JS side (via prop shouldReplaceMapContent) for iOS, MapKit only 2. Allow GoogleMaps on iOS to obey maximumZ 3. Added prop minimumZ for MapKit and GoogleMaps on iOS and Android * Removed debug NSLogs * MaximumZ was not being obeyed correctly for google maps (convert to long to compare). Get rid of compiler warnings (accidentally wrote NSUInteger instead of NSInteger) * Typings for v0.21.0 (react-native-maps#2165) * Update mapview.md (react-native-maps#2171) Add 'none' option to docs for mapType * Fixed crash for Android API level below 18 on isFromMockProvider (react-native-maps#2172) * Add Mock Provider boolean on each location update * Update mapview.md Update docs to specify that coordinate includes mock provider boolean * Check API is 18 or above for isFromMockProvider * Update docs to mention API * 1. Allow canReplaceMapContent to be set on the JS side (via prop shouldReplaceMapContent) for iOS, MapKit only 2. Allow GoogleMaps on iOS to obey maximumZ 3. Added prop minimumZ for MapKit and GoogleMaps on iOS and Android * Removed debug NSLogs * MaximumZ was not being obeyed correctly for google maps (convert to long to compare). Get rid of compiler warnings (accidentally wrote NSUInteger instead of NSInteger)
Kammeh · Apr 9, 2018 · 67d63ef · 67d63ef
1 parent bacb33b
commit 67d63ef
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 7 deletions.
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTile.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTile.java
@@ -28,6 +28,15 @@ public synchronized URL getTileUrl(int x, int y, int zoom) {
           .replace("{y}", Integer.toString(y))
           .replace("{z}", Integer.toString(zoom));
       URL url = null;
+
+      if(this.maximumZ && zoom > maximumZ) {
+        return url;
+      }
+
+      if(this.minimumZ && zoom < minimumZ) {
+        return url;
+      }
+
       try {
         url = new URL(s);
       } catch (MalformedURLException e) {
@@ -47,6 +56,8 @@ public void setUrlTemplate(String urlTemplate) {
 
   private String urlTemplate;
   private float zIndex;
+  private float maximumZ;
+  private float minimumZ;
 
   public AirMapUrlTile(Context context) {
     super(context);
@@ -69,6 +80,20 @@ public void setZIndex(float zIndex) {
     }
   }
 
+  public void setMaximumZ(float maximumZ) {
+    this.maximumZ = maximumZ;
+    if (tileOverlay != null) {
+      tileOverlay.clearTileCache();
+    }
+  }
+
+  public void setMinimumZ(float minimumZ) {
+    this.minimumZ = minimumZ;
+    if (tileOverlay != null) {
+      tileOverlay.clearTileCache();
+    }
+  }  
+
   public TileOverlayOptions getTileOverlayOptions() {
     if (tileOverlayOptions == null) {
       tileOverlayOptions = createTileOverlayOptions();

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTileManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTileManager.java
@@ -45,4 +45,14 @@ public void setZIndex(AirMapUrlTile view, float zIndex) {
     view.setZIndex(zIndex);
   }
 
+  @ReactProp(name = "minimumZ", defaultFloat = 0.0f)
+  public void setMinimumZ(AirMapUrlTile view, float minimumZ) {
+    view.setMinimumZ(minimumZ)
+  }
+
+  @ReactProp(name = "maximumZ", defaultFloat = 100.0f)
+  public void setMaximumZ(AirMapUrlTile view, float maximumZ) {
+    view.setMaximumZ(maximumZ);
+  }
+
 }
diff --git a/lib/components/MapUrlTile.js b/lib/components/MapUrlTile.js
@@ -32,12 +32,23 @@ const propTypes = {
    */
   zIndex: PropTypes.number,
   /**
-   * The maximum zoom level for this tile overlay. Corresponds to the maximumZ setting in
-   * MKTileOverlay. iOS only.
+   * The maximum zoom level for this tile overlay.
    *
-   * @platform ios
    */
   maximumZ: PropTypes.number,
+
+  /**
+   * The minimum zoom level for this tile overlay.
+   *
+   */
+  minimumZ: PropTypes.number,
+
+  /**
+   * Corresponds to MKTileOverlay canReplaceMapContent.
+   *
+   * @platform ios
+   */
+  shouldReplaceMapContent: PropTypes.bool,
 };
 
 class MapUrlTile extends React.Component {

diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m
@@ -22,5 +22,7 @@ - (UIView *)view
 
 RCT_EXPORT_VIEW_PROPERTY(urlTemplate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(zIndex, int)
+RCT_EXPORT_VIEW_PROPERTY(maximumZ, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(minimumZ, NSInteger)
 
 @end
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h
@@ -11,5 +11,7 @@
 @property (nonatomic, strong) GMSURLTileLayer *tileLayer;
 @property (nonatomic, assign) NSString *urlTemplate;
 @property (nonatomic, assign) int zIndex;
+@property NSInteger *maximumZ;
+@property NSInteger *minimumZ;
 
 @end
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m
@@ -22,13 +22,25 @@ - (void)setUrlTemplate:(NSString *)urlTemplate
 - (GMSTileURLConstructor)_getTileURLConstructor
 {
   NSString *urlTemplate = self.urlTemplate;
-  GMSTileURLConstructor urls = ^(NSUInteger x, NSUInteger y, NSUInteger zoom) {
+  NSInteger *maximumZ = self.maximumZ;
+  NSInteger *minimumZ = self.minimumZ;
+  GMSTileURLConstructor urls = ^NSURL* _Nullable (NSUInteger x, NSUInteger y, NSUInteger zoom) {
     NSString *url = urlTemplate;
     url = [url stringByReplacingOccurrencesOfString:@"{x}" withString:[NSString stringWithFormat: @"%ld", (long)x]];
     url = [url stringByReplacingOccurrencesOfString:@"{y}" withString:[NSString stringWithFormat: @"%ld", (long)y]];
     url = [url stringByReplacingOccurrencesOfString:@"{z}" withString:[NSString stringWithFormat: @"%ld", (long)zoom]];
+
+   if(maximumZ && (long)zoom > (long)maximumZ) {
+      return nil;
+    }
+
+    if(minimumZ && (long)zoom < (long)minimumZ) {
+      return nil;
+    }
+
     return [NSURL URLWithString:url];
   };
   return urls;
 }
-@end
+
+@end
diff --git a/lib/ios/AirMaps/AIRMapUrlTile.h b/lib/ios/AirMaps/AIRMapUrlTile.h
@@ -22,9 +22,10 @@
 
 @property (nonatomic, strong) MKTileOverlay *tileOverlay;
 @property (nonatomic, strong) MKTileOverlayRenderer *renderer;
-
 @property (nonatomic, copy) NSString *urlTemplate;
 @property NSInteger maximumZ;
+@property NSInteger minimumZ;
+@property BOOL shouldReplaceMapContent;
 
 #pragma mark MKOverlay protocol
 

diff --git a/lib/ios/AirMaps/AIRMapUrlTile.m b/lib/ios/AirMaps/AIRMapUrlTile.m
@@ -13,6 +13,32 @@ @implementation AIRMapUrlTile {
     BOOL _urlTemplateSet;
 }
 
+- (void)setShouldReplaceMapContent:(BOOL)shouldReplaceMapContent
+{
+  _shouldReplaceMapContent = shouldReplaceMapContent;
+  if(self.tileOverlay) {
+    self.tileOverlay.canReplaceMapContent = _shouldReplaceMapContent;
+  }
+  [self update];
+}
+
+- (void)setMaximumZ:(NSUInteger)maximumZ
+{
+  _maximumZ = maximumZ;
+  if(self.tileOverlay) {
+    self.tileOverlay.maximumZ = _maximumZ;
+  }
+  [self update];
+}
+
+- (void)setMinimumZ:(NSUInteger)minimumZ
+{
+  _minimumZ = minimumZ;
+  if(self.tileOverlay) {
+    self.tileOverlay.minimumZ = _minimumZ;
+  }
+  [self update];
+}
 
 - (void)setUrlTemplate:(NSString *)urlTemplate{
     _urlTemplate = urlTemplate;
@@ -25,7 +51,12 @@ - (void) createTileOverlayAndRendererIfPossible
 {
     if (!_urlTemplateSet) return;
     self.tileOverlay = [[MKTileOverlay alloc] initWithURLTemplate:self.urlTemplate];
-    self.tileOverlay.canReplaceMapContent = YES;
+
+    self.tileOverlay.canReplaceMapContent = self.shouldReplaceMapContent;
+
+    if(self.minimumZ) {
+        self.tileOverlay.minimumZ = self.minimumZ;
+    }
     if (self.maximumZ) {
         self.tileOverlay.maximumZ = self.maximumZ;
     }

diff --git a/lib/ios/AirMaps/AIRMapUrlTileManager.m b/lib/ios/AirMaps/AIRMapUrlTileManager.m
@@ -34,5 +34,7 @@ - (UIView *)view
 
 RCT_EXPORT_VIEW_PROPERTY(urlTemplate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(maximumZ, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(minimumZ, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(shouldReplaceMapContent, BOOL)
 
 @end