react-native-maps 0.29.4 → 0.30.0

package/lib/ios/AirMaps/AIRMapWMSTile.m

@@ -9,141 +9,108 @@
 #import "AIRMapWMSTile.h"
 #import <React/UIView+React.h>
 
-@implementation AIRMapWMSTile {
-    BOOL _urlTemplateSet;
-}
-
-- (void)setShouldReplaceMapContent:(BOOL)shouldReplaceMapContent
-{
-  _shouldReplaceMapContent = shouldReplaceMapContent;
-  if(self.tileOverlay) {
-    self.tileOverlay.canReplaceMapContent = _shouldReplaceMapContent;
-  }
-  [self update];
-}
-
-- (void)setMaximumZ:(NSUInteger)maximumZ
+@implementation AIRMapWMSTile
+ 
+- (void)createTileOverlayAndRendererIfPossible
 {
-  _maximumZ = maximumZ;
-  if(self.tileOverlay) {
-    self.tileOverlay.maximumZ = _maximumZ;
-  }
-  [self update];
-}
+    if (!_urlTemplateSet) return;
+    if (_tileCachePathSet || _maximumNativeZSet) {
+        NSLog(@"tileCache new overlay dir %@", self.tileCachePath);
+        NSLog(@"tileCache %d", _tileCachePathSet);
+        NSLog(@"tileCache %d", _maximumNativeZSet);
+        self.tileOverlay = [[AIRMapWMSTileCachedOverlay alloc] initWithURLTemplate:self.urlTemplate];
+        _cachedOverlayCreated = YES;
+        if (_tileCachePathSet) {
+            NSURL *urlPath = [NSURL URLWithString:[self.tileCachePath stringByAppendingString:@"/"]];
+            if (urlPath.fileURL) {
+                self.tileOverlay.tileCachePath = urlPath;
+            } else {
+                NSURL *filePath = [NSURL fileURLWithPath:self.tileCachePath isDirectory:YES];
+                self.tileOverlay.tileCachePath = filePath;
+            }
+
+            if (_tileCacheMaxAgeSet) {
+                self.tileOverlay.tileCacheMaxAge = self.tileCacheMaxAge;
+            }
+        }
+    } else {
+        NSLog(@"tileCache normal overlay");
+        self.tileOverlay = [[AIRMapWMSTileOverlay alloc] initWithURLTemplate:self.urlTemplate];
+        _cachedOverlayCreated = NO;
+    }
 
-- (void)setMinimumZ:(NSUInteger)minimumZ
-{
-  _minimumZ = minimumZ;
-  if(self.tileOverlay) {
-    self.tileOverlay.minimumZ = _minimumZ;
-  }
-  [self update];
-}
+    [self updateProperties];
 
-- (void)setTileSize:(NSInteger)tileSize
-{
-    _tileSize = tileSize;
-    if(self.tileOverlay) {
-        self.tileOverlay.tileSize = CGSizeMake(tileSize, tileSize);
+    self.renderer = [[MKTileOverlayRenderer alloc] initWithTileOverlay:self.tileOverlay];
+    if (_opacitySet) {
+        self.renderer.alpha = self.opacity;
     }
-    [self update];
-}
-- (void)setUrlTemplate:(NSString *)urlTemplate{
-    _urlTemplate = urlTemplate;
-    _urlTemplateSet = YES;
-    [self createTileOverlayAndRendererIfPossible];
-    [self update];
 }
 
-- (void) createTileOverlayAndRendererIfPossible
-{
-    if (!_urlTemplateSet) return;
-    self.tileOverlay  = [[TileOverlay alloc] initWithURLTemplate:self.urlTemplate];
-    self.tileOverlay.canReplaceMapContent = self.shouldReplaceMapContent;
+@end
 
-    if(self.minimumZ) {
-        self.tileOverlay.minimumZ = self.minimumZ;
-    }
-    if (self.maximumZ) {
-        self.tileOverlay.maximumZ = self.maximumZ;
-    }
-    if (self.tileSize) {
-        self.tileOverlay.tileSize = CGSizeMake(self.tileSize, self.tileSize);;
-    }
-    self.renderer = [[MKTileOverlayRenderer alloc] initWithTileOverlay:self.tileOverlay];
-}
 
-- (void) update
+@implementation AIRMapWMSTileOverlay
+
+- (id)initWithURLTemplate:(NSString *)URLTemplate 
 {
-    if (!_renderer) return;
-    
-    if (_map == nil) return;
-    [_map removeOverlay:self];
-    [_map addOverlay:self level:MKOverlayLevelAboveLabels];
-    for (id<MKOverlay> overlay in _map.overlays) {
-        if ([overlay isKindOfClass:[AIRMapWMSTile class]]) {
-            continue;
-        }
-        [_map removeOverlay:overlay];
-        [_map addOverlay:overlay];
-    }
+    self = [super initWithURLTemplate:URLTemplate];
+    return self;
 }
 
-#pragma mark MKOverlay implementation
-
-- (CLLocationCoordinate2D) coordinate
+- (NSURL *)URLForTilePath:(MKTileOverlayPath)path
 {
-    return self.tileOverlay.coordinate;
+   return [AIRMapWMSTileHelper URLForTilePath:path withURLTemplate:self.URLTemplate withTileSize:self.tileSize.width];
 }
 
-- (MKMapRect) boundingMapRect
+@end
+
+
+@implementation AIRMapWMSTileCachedOverlay
+
+- (id)initWithURLTemplate:(NSString *)URLTemplate 
 {
-    return self.tileOverlay.boundingMapRect;
+    self = [super initWithURLTemplate:URLTemplate];
+    return self;
 }
 
-- (BOOL)canReplaceMapContent
+- (NSURL *)URLForTilePath:(MKTileOverlayPath)path
 {
-    return self.tileOverlay.canReplaceMapContent;
+   return [AIRMapWMSTileHelper URLForTilePath:path withURLTemplate:self.URLTemplate withTileSize:self.tileSize.width];
 }
 
 @end
 
-@implementation TileOverlay
-@synthesize MapX;
-@synthesize MapY;
-@synthesize FULL;
-
--(id) initWithURLTemplate:(NSString *)URLTemplate {
-    self = [super initWithURLTemplate:URLTemplate];
-    MapX = -20037508.34789244;
-    MapY = 20037508.34789244;
-    FULL = 20037508.34789244 * 2;
-    return self ;
-}
 
--(NSURL *)URLForTilePath:(MKTileOverlayPath)path{
+@implementation AIRMapWMSTileHelper 
++ (NSURL *)URLForTilePath:(MKTileOverlayPath)path withURLTemplate:(NSString *)URLTemplate withTileSize:(NSInteger)tileSize
+{
     NSArray *bb = [self getBoundBox:path.x yAxis:path.y zoom:path.z];
-    NSMutableString *url = [self.URLTemplate mutableCopy];
+    NSMutableString *url = [URLTemplate mutableCopy];
     [url replaceOccurrencesOfString: @"{minX}" withString:[NSString stringWithFormat:@"%@", bb[0]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{minY}" withString:[NSString stringWithFormat:@"%@", bb[1]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{maxX}" withString:[NSString stringWithFormat:@"%@", bb[2]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{maxY}" withString:[NSString stringWithFormat:@"%@", bb[3]] options:0 range:NSMakeRange(0, url.length)];
-    [url replaceOccurrencesOfString: @"{width}" withString:[NSString stringWithFormat:@"%d", (int)self.tileSize.width] options:0 range:NSMakeRange(0, url.length)];
-    [url replaceOccurrencesOfString: @"{height}" withString:[NSString stringWithFormat:@"%d", (int)self.tileSize.height] options:0 range:NSMakeRange(0, url.length)];
+    [url replaceOccurrencesOfString: @"{width}" withString:[NSString stringWithFormat:@"%d", (int)tileSize] options:0 range:NSMakeRange(0, url.length)];
+    [url replaceOccurrencesOfString: @"{height}" withString:[NSString stringWithFormat:@"%d", (int)tileSize] options:0 range:NSMakeRange(0, url.length)];
     return [NSURL URLWithString:url];
 }
 
--(NSArray *)getBoundBox:(NSInteger)x yAxis:(NSInteger)y zoom:(NSInteger)zoom{
++ (NSArray *)getBoundBox:(NSInteger)x yAxis:(NSInteger)y zoom:(NSInteger)zoom
+{
+    double MapX = -20037508.34789244;
+    double MapY = 20037508.34789244;
+    double FULL = 20037508.34789244 * 2;
     double tile = FULL / pow(2.0, (double)zoom);
     
     NSArray *result  =[[NSArray alloc] initWithObjects:
-                       [NSNumber numberWithDouble:MapX + (double)x * tile ],
-                       [NSNumber numberWithDouble:MapY - (double)(y+1) * tile ],
-                       [NSNumber numberWithDouble:MapX + (double)(x+1) * tile ],
-                       [NSNumber numberWithDouble:MapY - (double)y * tile ],
+                       [NSNumber numberWithDouble:MapX + (double)x * tile],
+                       [NSNumber numberWithDouble:MapY - (double)(y + 1) * tile],
+                       [NSNumber numberWithDouble:MapX + (double)(x + 1) * tile],
+                       [NSNumber numberWithDouble:MapY - (double)y * tile],
                        nil];
     
-    return result;
-    
+    return result;   
 }
-@end
+
+@end

package/lib/ios/AirMaps/AIRMapWMSTileManager.m

@@ -35,8 +35,13 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_VIEW_PROPERTY(urlTemplate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(maximumZ, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(maximumNativeZ, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(minimumZ, NSInteger)
-RCT_EXPORT_VIEW_PROPERTY(tileSize, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(shouldReplaceMapContent, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(tileSize, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(tileCachePath, NSString)
+RCT_EXPORT_VIEW_PROPERTY(tileCacheMaxAge, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(offlineMode, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(opacity, CGFloat)
 
 @end

package/lib/ios/AirMaps.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		A8494E2E218891180092506D /* AIRGoogleMapWMSTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A8494E2A218891180092506D /* AIRGoogleMapWMSTileManager.m */; };
 		A8494E2F218891180092506D /* AIRGoogleMapWMSTile.m in Sources */ = {isa = PBXBuildFile; fileRef = A8494E2D218891180092506D /* AIRGoogleMapWMSTile.m */; };
 		B5EA3BA92098E22B000E7AFD /* AIRDummyView.m in Sources */ = {isa = PBXBuildFile; fileRef = B5EA3BA72098E22B000E7AFD /* AIRDummyView.m */; };
+		BE2E4EC92621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2E4EC82621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m */; };
 		DA6C26381C9E2AFE0035349F /* AIRMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */; };
 		DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C263D1C9E324A0035349F /* AIRMapUrlTileManager.m */; };
 /* End PBXBuildFile section */
@@ -175,6 +176,8 @@
 		A8494E2D218891180092506D /* AIRGoogleMapWMSTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRGoogleMapWMSTile.m; path = AirGoogleMaps/AIRGoogleMapWMSTile.m; sourceTree = "<group>"; };
 		B5EA3BA72098E22B000E7AFD /* AIRDummyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRDummyView.m; path = AirGoogleMaps/AIRDummyView.m; sourceTree = "<group>"; };
 		B5EA3BA82098E22B000E7AFD /* AIRDummyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRDummyView.h; path = AirGoogleMaps/AIRDummyView.h; sourceTree = "<group>"; };
+		BE2E4EC72621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRMapUrlTileCachedOverlay.h; path = AirMaps/AIRMapUrlTileCachedOverlay.h; sourceTree = SOURCE_ROOT; };
+		BE2E4EC82621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRMapUrlTileCachedOverlay.m; path = AirMaps/AIRMapUrlTileCachedOverlay.m; sourceTree = SOURCE_ROOT; };
 		DA6C26361C9E2AFE0035349F /* AIRMapUrlTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTile.h; sourceTree = "<group>"; };
 		DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapUrlTile.m; sourceTree = "<group>"; };
 		DA6C263C1C9E324A0035349F /* AIRMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTileManager.h; sourceTree = "<group>"; };
@@ -214,6 +217,8 @@
 		11FA5C531C4A1296003AC2EE /* AirMaps */ = {
 			isa = PBXGroup;
 			children = (
+				BE2E4EC72621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.h */,
+				BE2E4EC82621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m */,
 				1125B2BD1C4AD3DA007D0023 /* AIRMap.h */,
 				1125B2BE1C4AD3DA007D0023 /* AIRMap.m */,
 				1125B2BF1C4AD3DA007D0023 /* AIRMapCallout.h */,
@@ -402,7 +407,7 @@
 				9B9498CE2017EFB800158761 /* AIRGMSMarker.m in Sources */,
 				9B9498D72017EFB800158761 /* AIRGoogleMapManager.m in Sources */,
 				19DABC7F1E7C9D3C00F41150 /* RCTConvert+AirMap.m in Sources */,
-                A8494E2E218891180092506D /* AIRGoogleMapWMSTileManager.m in Sources */,
+				A8494E2E218891180092506D /* AIRGoogleMapWMSTileManager.m in Sources */,
 				8B19A3C82257BBDF00BB8735 /* AIRMapCalloutSubview.m in Sources */,
 				1125B2E51C4AD3DA007D0023 /* AIRMapPolyline.m in Sources */,
 				4C99C9E12226D8C400A8693E /* AIRWeakMapReference.m in Sources */,
@@ -410,6 +415,7 @@
 				9B9498CF2017EFB800158761 /* AIRGMSPolyline.m in Sources */,
 				9B9498D42017EFB800158761 /* RCTConvert+GMSMapViewType.m in Sources */,
 				9B9498D32017EFB800158761 /* AIRGoogleMap.m in Sources */,
+				BE2E4EC92621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m in Sources */,
 				DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */,
 				9B9498DB2017EFB800158761 /* AIRGoogleMapMarker.m in Sources */,
 				628F81201FD16DF80058313A /* AIRMapLocalTile.m in Sources */,

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native Mapview component for iOS + Android",
   "main": "index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.29.4",
+  "version": "0.30.0",
   "scripts": {
     "lint": "./node_modules/eslint/bin/eslint.js .",
     "ci": "npm run lint"
@@ -27,8 +27,9 @@
     "react-native-web": ">= 0.11"
   },
   "devDependencies": {
-    "@react-native-community/eslint-config": "0.0.5",
-    "eslint": "5.16.0"
+    "@react-native-community/eslint-config": "3.0.1",
+    "eslint": "7.32.0",
+    "typescript": "^4.4.3"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.7"

package/react-native-google-maps.podspec

@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
   s.compiler_flags = '-DHAVE_GOOGLE_MAPS=1', '-DHAVE_GOOGLE_MAPS_UTILS=1', '-fno-modules'
 
   s.dependency 'React-Core'
-  s.dependency 'GoogleMaps', '3.5.0'
-  s.dependency 'Google-Maps-iOS-Utils', '2.1.0'
+  s.dependency 'GoogleMaps', '5.1.0'
+  s.dependency 'Google-Maps-iOS-Utils', '3.10.3'
 end