react-native-maps 1.21.0-alpha.135 → 1.21.0-alpha.137

package/android/src/main/java/com/rnmaps/fabric/UrlTileManager.java

@@ -0,0 +1,124 @@
+package com.rnmaps.fabric;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsUrlTileManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsUrlTileManagerInterface;
+import com.rnmaps.maps.MapPolyline;
+import com.rnmaps.maps.MapUrlTile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = UrlTileManager.REACT_CLASS)
+public class UrlTileManager extends ViewGroupManager<MapUrlTile> implements RNMapsUrlTileManagerInterface<MapUrlTile> {
+    public static final String REACT_CLASS = "RNMapsUrlTile";
+
+    public UrlTileManager(ReactApplicationContext context) {
+        super(context);
+    }
+
+    private final RNMapsUrlTileManagerDelegate<MapUrlTile, UrlTileManager> delegate =
+            new RNMapsUrlTileManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapUrlTile> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapUrlTile createViewInstance(ThemedReactContext context) {
+        return new MapUrlTile(context);
+    }
+
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+    @Override
+    public void setDoubleTileSize(MapUrlTile view, boolean value) {
+        view.setDoubleTileSize(value);
+    }
+
+    @Override
+    public void setFlipY(MapUrlTile view, boolean value) {
+        view.setFlipY(value);
+    }
+
+    @Override
+    public void setMaximumNativeZ(MapUrlTile view, int value) {
+        view.setMaximumNativeZ(value);
+    }
+
+    @Override
+    public void setMaximumZ(MapUrlTile view, int value) {
+        view.setMaximumZ(value);
+    }
+
+    @Override
+    public void setMinimumZ(MapUrlTile view, int value) {
+        view.setMinimumZ(value);
+    }
+
+    @Override
+    public void setOfflineMode(MapUrlTile view, boolean value) {
+        view.setOfflineMode(value);
+    }
+
+    @Override
+    public void setShouldReplaceMapContent(MapUrlTile view, boolean value) {
+        // not supported
+
+    }
+    @Override
+    public void setZIndex(@NonNull MapUrlTile view, float zIndex) {
+       super.setZIndex(view, zIndex);
+       view.setZIndex(zIndex);
+    }
+
+    @Override
+    public void setOpacity(@NonNull MapUrlTile view, float opacity) {
+        super.setOpacity(view, opacity);
+        view.setOpacity(opacity);
+    }
+
+    @Override
+    public void setTileCacheMaxAge(MapUrlTile view, int value) {
+        view.setTileCacheMaxAge(value);
+    }
+
+    @Override
+    public void setTileCachePath(MapUrlTile view, @Nullable String value) {
+        view.setTileCachePath(value);
+    }
+
+    @Override
+    public void setTileSize(MapUrlTile view, int value) {
+        view.setTileSize(value);
+    }
+
+    @Override
+    public void setUrlTemplate(MapUrlTile view, @Nullable String value) {
+        view.setUrlTemplate(value);
+    }
+}

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

@@ -17,6 +17,7 @@ import com.rnmaps.fabric.NativeAirMapsModule;
 import com.rnmaps.fabric.OverlayManager;
 import com.rnmaps.fabric.PolygonManager;
 import com.rnmaps.fabric.PolylineManager;
+import com.rnmaps.fabric.UrlTileManager;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +27,14 @@ public class MapAirModulePackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext), new PolygonManager(reactContext), new PolylineManager(reactContext), new CircleManager(reactContext), new OverlayManager(reactContext));
+        return List.of(new MapViewManager(reactContext),
+                new MarkerManager(reactContext),
+                new CalloutManager(reactContext),
+                new PolygonManager(reactContext),
+                new PolylineManager(reactContext),
+                new CircleManager(reactContext),
+                new OverlayManager(reactContext),
+                new UrlTileManager(reactContext));
     }
 
 
@@ -53,8 +61,11 @@ public class MapAirModulePackage extends TurboReactPackage {
         if (MapViewManager.REACT_CLASS.equals(name)) {
             return new MapViewManager(reactContext);
         }
+        if (UrlTileManager.REACT_CLASS.equals(name)) {
+            return new UrlTileManager(reactContext);
+        }
         if (NativeAirMapsModuleSpec.NAME.equals(name)) {
-            return (NativeModule) new NativeAirMapsModule(reactContext);
+            return new NativeAirMapsModule(reactContext);
         } else {
             return null;
         }

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

@@ -176,7 +176,7 @@ public class MapUrlTile extends MapFeature {
     if (tileProvider != null) {
       tileProvider.setCustomMode();
     }
-  } 
+  }
 
   protected TileOverlayOptions createTileOverlayOptions() {
     Log.d("urlTile ", "creating TileProvider");

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

@@ -13,10 +13,6 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
 
   public MapUrlTileManager(ReactApplicationContext reactContext) {
     super();
-    DisplayMetrics metrics = new DisplayMetrics();
-    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-        .getDefaultDisplay()
-        .getRealMetrics(metrics);
   }
 
   @Override

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.cpp

@@ -24,6 +24,7 @@ registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescript
 registry->add(concreteComponentDescriptorProvider<RNMapsMarkerComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsOverlayComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsPolylineComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsUrlTileComponentDescriptor>());
 }
 
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.h

@@ -24,6 +24,7 @@ using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapVi
 using RNMapsMarkerComponentDescriptor = ConcreteComponentDescriptor<RNMapsMarkerShadowNode>;
 using RNMapsOverlayComponentDescriptor = ConcreteComponentDescriptor<RNMapsOverlayShadowNode>;
 using RNMapsPolylineComponentDescriptor = ConcreteComponentDescriptor<RNMapsPolylineShadowNode>;
+using RNMapsUrlTileComponentDescriptor = ConcreteComponentDescriptor<RNMapsUrlTileShadowNode>;
 
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
   std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/EventEmitters.cpp

@@ -974,4 +974,5 @@ $payload.setProperty(runtime, "id", $event.id);
   });
 }
 
+
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/EventEmitters.h

@@ -842,5 +842,12 @@ class RNMapsPolylineEventEmitter : public ViewEventEmitter {
     OnPressPosition position;
     };
   void onPress(OnPress value) const;
+};
+class RNMapsUrlTileEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+  
 };
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -191,5 +191,22 @@ RNMapsPolylineProps::RNMapsPolylineProps(
     strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
+RNMapsUrlTileProps::RNMapsUrlTileProps(
+    const PropsParserContext &context,
+    const RNMapsUrlTileProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    doubleTileSize(convertRawProp(context, rawProps, "doubleTileSize", sourceProps.doubleTileSize, {false})),
+    flipY(convertRawProp(context, rawProps, "flipY", sourceProps.flipY, {false})),
+    maximumNativeZ(convertRawProp(context, rawProps, "maximumNativeZ", sourceProps.maximumNativeZ, {0})),
+    maximumZ(convertRawProp(context, rawProps, "maximumZ", sourceProps.maximumZ, {0})),
+    minimumZ(convertRawProp(context, rawProps, "minimumZ", sourceProps.minimumZ, {0})),
+    offlineMode(convertRawProp(context, rawProps, "offlineMode", sourceProps.offlineMode, {false})),
+    shouldReplaceMapContent(convertRawProp(context, rawProps, "shouldReplaceMapContent", sourceProps.shouldReplaceMapContent, {false})),
+    tileCacheMaxAge(convertRawProp(context, rawProps, "tileCacheMaxAge", sourceProps.tileCacheMaxAge, {0})),
+    tileCachePath(convertRawProp(context, rawProps, "tileCachePath", sourceProps.tileCachePath, {})),
+    tileSize(convertRawProp(context, rawProps, "tileSize", sourceProps.tileSize, {0})),
+    urlTemplate(convertRawProp(context, rawProps, "urlTemplate", sourceProps.urlTemplate, {}))
+      {}
 
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -1222,4 +1222,24 @@ class RNMapsPolylineProps final : public ViewProps {
   bool tappable{false};
 };
 
+class RNMapsUrlTileProps final : public ViewProps {
+ public:
+  RNMapsUrlTileProps() = default;
+  RNMapsUrlTileProps(const PropsParserContext& context, const RNMapsUrlTileProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool doubleTileSize{false};
+  bool flipY{false};
+  int maximumNativeZ{0};
+  int maximumZ{0};
+  int minimumZ{0};
+  bool offlineMode{false};
+  bool shouldReplaceMapContent{false};
+  int tileCacheMaxAge{0};
+  std::string tileCachePath{};
+  int tileSize{0};
+  std::string urlTemplate{};
+};
+
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.cpp

@@ -20,5 +20,6 @@ extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
 extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
+extern const char RNMapsUrlTileComponentName[] = "RNMapsUrlTile";
 
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.h

@@ -106,4 +106,15 @@ using RNMapsPolylineShadowNode = ConcreteViewShadowNode<
     RNMapsPolylineEventEmitter,
     RNMapsPolylineState>;
 
+JSI_EXPORT extern const char RNMapsUrlTileComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsUrlTile> component.
+ */
+using RNMapsUrlTileShadowNode = ConcreteViewShadowNode<
+    RNMapsUrlTileComponentName,
+    RNMapsUrlTileProps,
+    RNMapsUrlTileEventEmitter,
+    RNMapsUrlTileState>;
+
 } // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/States.h

@@ -110,4 +110,16 @@ public:
 #endif
 };
 
+class RNMapsUrlTileState {
+public:
+  RNMapsUrlTileState() = default;
+
+#ifdef ANDROID
+  RNMapsUrlTileState(RNMapsUrlTileState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 } // namespace facebook::react

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -626,6 +626,9 @@ using namespace facebook::react;
             case RNMapsGoogleMapViewMapType::Hybrid:
                 _view.mapType = kGMSTypeHybrid;
                 break;
+            case RNMapsGoogleMapViewMapType::None:
+                _view.mapType = kGMSTypeNone;
+                break;
             default:
                 _view.mapType = kGMSTypeNormal;
                 break;

package/package.json

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

package/src/decorateMapComponent.ts

@@ -22,6 +22,7 @@ import {MapWMSTile} from './MapWMSTile';
 import {Commands} from './MapViewNativeComponent';
 import GooglePolygon from './specs/NativeComponentGooglePolygon';
 import FabricMarker from './specs/NativeComponentMarker';
+import FabricUrlTile from './specs/NativeComponentUrlTile';
 import FabricCallout from './specs/NativeComponentCallout';
 import FabricPolyline from './specs/NativeComponentPolyline';
 import FabricCircle from './specs/NativeComponentCircle';
@@ -104,6 +105,9 @@ export default function decorateMapComponent<Type extends Component>(
         } else if (componentName === 'Overlay') {
           // @ts-ignore
           return FabricOverlay;
+        } else if (componentName === 'UrlTile') {
+          // @ts-ignore
+          return FabricUrlTile;
         }
       }
       const key = provider || 'default';

package/src/specs/NativeComponentUrlTile.ts

@@ -0,0 +1,128 @@
+import type {HostComponent, ViewProps} from 'react-native';
+
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {Int32} from 'react-native/Libraries/Types/CodegenTypes';
+
+export interface UrlTileFabricNativeProps extends ViewProps {
+  /**
+   * Doubles tile size from 256 to 512 utilising higher zoom levels
+   * i.e loading 4 higher zoom level tiles and combining them for one high-resolution tile.
+   * iOS does this automatically, even if it is not desirable always.
+   * NB! using this makes text labels smaller than in the original map style.
+   *
+   * @platform iOS: Not supported
+   * @platform Android: Supported
+   */
+  doubleTileSize?: boolean;
+
+  /**
+   * Allow tiles using the TMS coordinate system (origin bottom left) to be used,
+   * and displayed at their correct coordinates.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  flipY?: boolean;
+
+  /**
+   * The maximum native zoom level for this tile overlay i.e. the highest zoom level that the tile server provides.
+   * Tiles are auto-scaled for higher zoom levels.
+   *
+   * @platform iOS: Apple Maps only
+   * @platform Android: Supported
+   */
+  maximumNativeZ?: Int32;
+
+  /**
+   * The maximum zoom level for this tile overlay.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  maximumZ?: Int32;
+
+  /**
+   * The minimum zoom level for this tile overlay.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  minimumZ?: Int32;
+
+  /**
+   * In offline-mode tiles are not fetched from the tile servers, rather only tiles stored in the cache directory are used.
+   * Furthermore, automated tile scaling is activated: if tile at a desired zoom level is not found from the cache directory,
+   * then lower zoom level tile is used (up to 4 levels lower) and scaled.
+   *
+   * @default false
+   * @platform iOS: Apple Maps only
+   * @platform Android: Supported
+   */
+  offlineMode?: boolean;
+
+  /**
+   * Corresponds to MKTileOverlay canReplaceMapContent i.e. if true then underlying iOS basemap is not shown.
+   *
+   * @default false
+   * @platform iOS: Apple Maps only
+   * @platform Android: Not supported
+   */
+  shouldReplaceMapContent?: boolean;
+
+  /**
+   * Defines maximum age in seconds for a cached tile before it's refreshed.
+   *
+   * NB! Refresh logic is "serve-stale-while-refresh"
+   * i.e. to ensure map availability a stale (over max age) tile is served
+   * while a tile refresh process is started in the background.
+   *
+   * @platform iOS: Apple Maps only
+   * @platform Android: Supported
+   */
+  tileCacheMaxAge?: Int32;
+
+  /**
+   * Enable caching of tiles in the specified directory.
+   * Directory can be specified either as a normal path or in URL format (`file://`).
+   *
+   * Tiles are stored in tileCachePath directory as `/{z}/{x}/{y}` i.e. in sub-directories 2-levels deep,
+   * filename is tile y-coordinate without any filetype-extension.
+   *
+   * NB! All cache management needs to be implemented by client e.g. deleting tiles to manage use of storage space etc.
+   *
+   * @platform iOS: Apple Maps only
+   * @platform Android: Supported
+   */
+  tileCachePath?: string;
+
+  /**
+   * Tile size, default size is 256 (for tiles of 256 _ 256 pixels).
+   * High-res (aka 'retina') tiles are 512 (tiles of 512 _ 512 pixels)
+   *
+   * @platform iOS: Apple Maps only
+   * @platform Android: Supported
+   */
+  tileSize?: Int32;
+
+  /**
+   * The url template of the map tileserver.
+   * (URLTile) The patterns {x} {y} {z} will be replaced at runtime.
+   * For example, http://c.tile.openstreetmap.org/{z}/{x}/{y}.png.
+   *
+   * It is also possible to refer to tiles in local filesystem with file:///top-level-directory/sub-directory/{z}/{x}/{y}.png URL-format.
+   * (WMSTile) The patterns {minX} {maxX} {minY} {maxY} {width} {height} will be replaced at runtime according to EPSG:900913 specification bounding box.
+   * For example, https://demo.geo-solutions.it/geoserver/tiger/wms?service=WMS&version=1.1.0&request=GetMap&layers=tiger:poi&styles=&bbox={minX},{minY},{maxX},{maxY}&width={width}&height={height}&srs=EPSG:900913&format=image/png&transparent=true&format_options=dpi:213.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+
+  urlTemplate: string;
+}
+
+export default codegenNativeComponent<UrlTileFabricNativeProps>(
+  'RNMapsUrlTile',
+  {
+    excludedPlatforms: ['iOS'],
+  },
+) as HostComponent<UrlTileFabricNativeProps>;