@lugg/maps 0.2.0-alpha.23 → 0.2.0-alpha.24

package/android/src/main/java/com/luggmaps/LuggMapView.kt

@@ -4,8 +4,10 @@ import android.annotation.SuppressLint
 import android.view.View
 import android.view.View.VISIBLE
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.gms.maps.model.LatLng
+import com.luggmaps.core.EdgeInsets
 import com.luggmaps.core.GoogleMapProvider
 import com.luggmaps.core.MapProvider
 import com.luggmaps.core.MapProviderDelegate
@@ -37,11 +39,20 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
   private var provider: MapProvider? = null
   private var mapWrapperView: LuggMapWrapperView? = null
 
-  // Cached initial props
+  // Cached props (applied during initializeProvider)
   private var mapId: String = GoogleMapProvider.DEMO_MAP_ID
   private var initialLatitude: Double = 37.78
   private var initialLongitude: Double = -122.43
   private var initialZoom: Float = 14f
+  private var theme: String = "system"
+  private var zoomEnabled: Boolean = true
+  private var scrollEnabled: Boolean = true
+  private var rotateEnabled: Boolean = true
+  private var pitchEnabled: Boolean = true
+  private var userLocationEnabled: Boolean = false
+  private var minZoom: Double? = null
+  private var maxZoom: Double? = null
+  private var padding: EdgeInsets = EdgeInsets()
 
   // region View Lifecycle
 
@@ -97,6 +108,8 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
     google.delegate = this
     provider = google
 
+    applyProps()
+
     google.initializeMap(mapWrapperView!!, initialLatitude, initialLongitude, initialZoom)
 
     // Flush children mounted before provider was created
@@ -128,6 +141,24 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
 
   // region Property Setters
 
+  private fun applyProps() {
+    provider?.setZoomEnabled(zoomEnabled)
+    provider?.setScrollEnabled(scrollEnabled)
+    provider?.setRotateEnabled(rotateEnabled)
+    provider?.setPitchEnabled(pitchEnabled)
+    provider?.setUserLocationEnabled(userLocationEnabled)
+    provider?.setTheme(theme)
+    minZoom?.let { provider?.setMinZoom(it) }
+    maxZoom?.let { provider?.setMaxZoom(it) }
+    provider?.setPadding(padding)
+  }
+
+  fun setProvider(value: String?) {
+    if (value != null && value != "google") {
+      RNLog.w(reactContext, "LuggMapView: Only Google Maps is supported on Android")
+    }
+  }
+
   fun setMapId(value: String?) {
     if (value.isNullOrEmpty()) return
     mapId = value
@@ -143,39 +174,48 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
   }
 
   fun setZoomEnabled(enabled: Boolean) {
+    zoomEnabled = enabled
     provider?.setZoomEnabled(enabled)
   }
 
   fun setScrollEnabled(enabled: Boolean) {
+    scrollEnabled = enabled
     provider?.setScrollEnabled(enabled)
   }
 
   fun setRotateEnabled(enabled: Boolean) {
+    rotateEnabled = enabled
     provider?.setRotateEnabled(enabled)
   }
 
   fun setPitchEnabled(enabled: Boolean) {
+    pitchEnabled = enabled
     provider?.setPitchEnabled(enabled)
   }
 
   fun setUserLocationEnabled(enabled: Boolean) {
+    userLocationEnabled = enabled
     provider?.setUserLocationEnabled(enabled)
   }
 
   fun setMinZoom(zoom: Double) {
+    minZoom = zoom
     provider?.setMinZoom(zoom)
   }
 
   fun setMaxZoom(zoom: Double) {
+    maxZoom = zoom
     provider?.setMaxZoom(zoom)
   }
 
   fun setTheme(value: String) {
+    theme = value
     provider?.setTheme(value)
   }
 
-  fun setMapPadding(top: Int, left: Int, bottom: Int, right: Int) {
-    provider?.setMapPadding(top, left, bottom, right)
+  fun setPadding(top: Int, left: Int, bottom: Int, right: Int) {
+    padding = EdgeInsets(top, left, bottom, right)
+    provider?.setPadding(padding)
   }
 
   // endregion

package/android/src/main/java/com/luggmaps/LuggMapViewManager.kt

@@ -66,7 +66,7 @@ class LuggMapViewManager :
 
   @ReactProp(name = "provider")
   override fun setProvider(view: LuggMapView, value: String?) {
-    // No-op on Android — always Google Maps
+    view.setProvider(value)
   }
 
   @ReactProp(name = "mapId")
@@ -135,7 +135,7 @@ class LuggMapViewManager :
       val left = if (it.hasKey("left")) it.getDouble("left").toFloat().dpToPx().toInt() else 0
       val bottom = if (it.hasKey("bottom")) it.getDouble("bottom").toFloat().dpToPx().toInt() else 0
       val right = if (it.hasKey("right")) it.getDouble("right").toFloat().dpToPx().toInt() else 0
-      view.setMapPadding(top, left, bottom, right)
+      view.setPadding(top, left, bottom, right)
     }
   }
 

package/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt

@@ -62,10 +62,7 @@ class GoogleMapProvider(private val context: Context) :
   private var theme: String = "system"
 
   // Padding
-  private var paddingTop: Int = 0
-  private var paddingLeft: Int = 0
-  private var paddingBottom: Int = 0
-  private var paddingRight: Int = 0
+  private var padding: EdgeInsets = EdgeInsets()
 
   // region MapProvider
 
@@ -202,11 +199,8 @@ class GoogleMapProvider(private val context: Context) :
     }
   }
 
-  override fun setMapPadding(top: Int, left: Int, bottom: Int, right: Int) {
-    paddingTop = top
-    paddingLeft = left
-    paddingBottom = bottom
-    paddingRight = right
+  override fun setPadding(padding: EdgeInsets) {
+    this.padding = padding
     applyPadding()
   }
 
@@ -425,10 +419,10 @@ class GoogleMapProvider(private val context: Context) :
     val right = paddingRight.toFloat().dpToPx().toInt()
 
     map.setPadding(
-      this.paddingLeft + left,
-      this.paddingTop + top,
-      this.paddingRight + right,
-      this.paddingBottom + bottom
+      padding.left + left,
+      padding.top + top,
+      padding.right + right,
+      padding.bottom + bottom
     )
 
     val cameraUpdate = CameraUpdateFactory.newLatLngBounds(bounds, 0)
@@ -439,7 +433,7 @@ class GoogleMapProvider(private val context: Context) :
       else -> map.moveCamera(cameraUpdate)
     }
 
-    map.setPadding(this.paddingLeft, this.paddingTop, this.paddingRight, this.paddingBottom)
+    map.setPadding(padding.left, padding.top, padding.right, padding.bottom)
   }
 
   // endregion
@@ -463,7 +457,7 @@ class GoogleMapProvider(private val context: Context) :
   }
 
   private fun applyPadding() {
-    googleMap?.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom)
+    googleMap?.setPadding(padding.left, padding.top, padding.right, padding.bottom)
   }
 
   private fun applyTheme() {

package/android/src/main/java/com/luggmaps/core/MapProviderDelegate.kt

@@ -4,6 +4,8 @@ import android.view.View
 import com.luggmaps.LuggMarkerView
 import com.luggmaps.LuggPolylineView
 
+data class EdgeInsets(val top: Int = 0, val left: Int = 0, val bottom: Int = 0, val right: Int = 0)
+
 interface MapProviderDelegate {
   fun mapProviderDidReady()
   fun mapProviderDidMoveCamera(latitude: Double, longitude: Double, zoom: Float, gesture: Boolean)
@@ -26,7 +28,7 @@ interface MapProvider {
   fun setTheme(value: String)
   fun setMinZoom(zoom: Double)
   fun setMaxZoom(zoom: Double)
-  fun setMapPadding(top: Int, left: Int, bottom: Int, right: Int)
+  fun setPadding(padding: EdgeInsets)
 
   // Children
   fun addMarkerView(markerView: LuggMarkerView)

package/android/src/main/java/com/luggmaps/core/PolylineAnimator.kt

@@ -91,10 +91,10 @@ class PolylineAnimator {
     computeCumulativeDistances()
 
     val trailLength = animatedOptions.trailLength.coerceIn(0.01f, 1f)
-    val endValue = if (trailLength < 1f) 1f else 2.15f
+    val maxProgress = if (trailLength < 1f) 1f else 2.15f
 
-    animator = ValueAnimator.ofFloat(0f, endValue).apply {
-      duration = animatedOptions.duration
+    animator = ValueAnimator.ofFloat(0f, maxProgress).apply {
+      duration = (animatedOptions.duration * maxProgress).toLong()
       startDelay = animatedOptions.delay
       repeatCount = ValueAnimator.INFINITE
       interpolator = LinearInterpolator()
@@ -232,6 +232,8 @@ class PolylineAnimator {
       reusablePoints.add(endCoord)
     }
 
+    if (reusablePoints.size < 2) return
+
     poly.points = reusablePoints
 
     if (strokeColors.size <= 1) {

package/ios/LuggMapView.mm

@@ -107,7 +107,7 @@ using namespace luggmaps::events;
   [super didMoveToWindow];
   if (self.window) {
     if (!_provider && _mapWrapperView) {
-      [self initializeContent];
+      [self initializeProvider];
     }
     [_provider resumeAnimations];
   } else {
@@ -124,9 +124,9 @@ using namespace luggmaps::events;
   _initialized = NO;
 }
 
-#pragma mark - Content Initialization
+#pragma mark - Provider Initialization
 
-- (void)initializeContent {
+- (void)initializeProvider {
   if (_provider || !_mapWrapperView)
     return;
 
@@ -144,14 +144,7 @@ using namespace luggmaps::events;
   _provider.delegate = self;
 
   // Apply cached props before initialization
-  [_provider setZoomEnabled:_zoomEnabled];
-  [_provider setScrollEnabled:_scrollEnabled];
-  [_provider setRotateEnabled:_rotateEnabled];
-  [_provider setPitchEnabled:_pitchEnabled];
-  [_provider setUserLocationEnabled:_userLocationEnabled];
-  [_provider setTheme:_theme];
-  [_provider setMinZoom:_minZoom];
-  [_provider setMaxZoom:_maxZoom];
+  [self applyProps];
 
   CLLocationCoordinate2D coordinate =
       CLLocationCoordinate2DMake(viewProps.initialCoordinate.latitude,
@@ -199,6 +192,17 @@ using namespace luggmaps::events;
 
 #pragma mark - Property Setters
 
+- (void)applyProps {
+  [_provider setZoomEnabled:_zoomEnabled];
+  [_provider setScrollEnabled:_scrollEnabled];
+  [_provider setRotateEnabled:_rotateEnabled];
+  [_provider setPitchEnabled:_pitchEnabled];
+  [_provider setUserLocationEnabled:_userLocationEnabled];
+  [_provider setTheme:_theme];
+  [_provider setMinZoom:_minZoom];
+  [_provider setMaxZoom:_maxZoom];
+}
+
 - (void)updateProps:(Props::Shared const &)props
            oldProps:(Props::Shared const &)oldProps {
   const auto &oldViewProps =
@@ -206,7 +210,6 @@ using namespace luggmaps::events;
   const auto &newViewProps =
       *std::static_pointer_cast<LuggMapViewProps const>(props);
 
-  // Capture provider and mapId before content is created
   _providerType = newViewProps.provider;
 
   NSString *newMapId =
@@ -215,12 +218,22 @@ using namespace luggmaps::events;
     _mapId = newMapId;
   }
 
-  // Cache and forward props
+  // Cache props
   _zoomEnabled = newViewProps.zoomEnabled;
   _scrollEnabled = newViewProps.scrollEnabled;
   _rotateEnabled = newViewProps.rotateEnabled;
   _pitchEnabled = newViewProps.pitchEnabled;
   _userLocationEnabled = newViewProps.userLocationEnabled;
+  _minZoom = newViewProps.minZoom;
+  _maxZoom = newViewProps.maxZoom;
+
+  if (newViewProps.theme == LuggMapViewTheme::Dark) {
+    _theme = @"dark";
+  } else if (newViewProps.theme == LuggMapViewTheme::Light) {
+    _theme = @"light";
+  } else {
+    _theme = @"system";
+  }
 
   UIEdgeInsets oldPadding = _padding;
   _padding =
@@ -228,39 +241,8 @@ using namespace luggmaps::events;
                        newViewProps.padding.bottom, newViewProps.padding.right);
 
   if (_provider) {
-    [_provider setZoomEnabled:_zoomEnabled];
-    [_provider setScrollEnabled:_scrollEnabled];
-    [_provider setRotateEnabled:_rotateEnabled];
-    [_provider setPitchEnabled:_pitchEnabled];
-    [_provider setUserLocationEnabled:_userLocationEnabled];
-
-    if (oldViewProps.theme != newViewProps.theme) {
-      NSString *theme;
-      if (newViewProps.theme == LuggMapViewTheme::Dark) {
-        theme = @"dark";
-      } else if (newViewProps.theme == LuggMapViewTheme::Light) {
-        theme = @"light";
-      } else {
-        theme = @"system";
-      }
-      _theme = theme;
-      [_provider setTheme:_theme];
-    }
-
-    [_provider setMinZoom:newViewProps.minZoom];
-    [_provider setMaxZoom:newViewProps.maxZoom];
+    [self applyProps];
     [_provider setPadding:_padding oldPadding:oldPadding];
-  } else {
-    // Cache theme for later
-    if (newViewProps.theme == LuggMapViewTheme::Dark) {
-      _theme = @"dark";
-    } else if (newViewProps.theme == LuggMapViewTheme::Light) {
-      _theme = @"light";
-    } else {
-      _theme = @"system";
-    }
-    _minZoom = newViewProps.minZoom;
-    _maxZoom = newViewProps.maxZoom;
   }
 
   [super updateProps:props oldProps:oldProps];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "0.2.0-alpha.23",
+  "version": "0.2.0-alpha.24",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",