feat: add minZoom, maxZoom (#374)

josxha · web-flow · commit 6ad84444e45d · 2025-10-16T11:19:28.000Z
- #371
diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart
@@ -13,6 +13,8 @@ class CircleLayer extends Layer<Feature<Point>> {
     this.blur = 0,
     this.strokeWidth = 0,
     this.strokeColor = const Color(0xFF000000),
+    super.minZoom = 0,
+    super.maxZoom = 24,
   }) : super._(list: points);
 
   /// Circle radius in pixels. Defaults to 5px.
@@ -43,6 +45,8 @@ class CircleLayer extends Layer<Feature<Point>> {
     sourceId: getSourceId(index),
     paint: getPaint(),
     layout: getLayout(),
+    minZoom: minZoom,
+    maxZoom: maxZoom,
   );
 
   @override
diff --git a/lib/src/layer/layer.dart b/lib/src/layer/layer.dart
@@ -15,11 +15,17 @@ part 'polyline_layer.dart';
 /// {@category Layers}
 @immutable
 sealed class Layer<G extends Feature<Geometry>> {
-  const Layer._({required this.list});
+  const Layer._({required this.list, this.minZoom = 0, this.maxZoom = 24});
 
-  /// The [List] of layers.
+  /// The [List] of geometry features.
   final List<G> list;
 
+  /// The minimum zoom level that the [Layer] is displayed.
+  final double minZoom;
+
+  /// The maximum zoom level that the [Layer] is displayed.
+  final double maxZoom;
+
   /// Get a unique source id.
   String getSourceId(int index) => 'maplibre-source-$index';
 
@@ -38,8 +44,12 @@ sealed class Layer<G extends Feature<Geometry>> {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      other is Layer && runtimeType == other.runtimeType && list == other.list;
+      other is Layer &&
+          runtimeType == other.runtimeType &&
+          list == other.list &&
+          minZoom == other.minZoom &&
+          maxZoom == other.maxZoom;
 
   @override
-  int get hashCode => list.hashCode;
+  int get hashCode => Object.hash(minZoom, maxZoom, list);
 }
diff --git a/lib/src/layer/marker_layer.dart b/lib/src/layer/marker_layer.dart
@@ -45,6 +45,8 @@ class MarkerLayer extends Layer<Feature<Point>> {
     this.textHaloBlur = 0,
     this.textTranslate = const [0, 0],
     this.iconAnchor = IconAnchor.center,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   }) : super._(list: points);
 
   /// If true, the icon will be visible even if it collides with other
@@ -236,6 +238,8 @@ class MarkerLayer extends Layer<Feature<Point>> {
     sourceId: getSourceId(index),
     paint: getPaint(),
     layout: getLayout(),
+    minZoom: minZoom,
+    maxZoom: maxZoom,
   );
 
   @override
diff --git a/lib/src/layer/polygon_layer.dart b/lib/src/layer/polygon_layer.dart
@@ -10,6 +10,8 @@ class PolygonLayer extends Layer<Feature<Polygon>> {
     required List<Feature<Polygon>> polygons,
     this.color = const Color(0xFF000000),
     this.outlineColor = const Color(0xFF000000),
+    super.minZoom = 0,
+    super.maxZoom = 24,
   }) : super._(list: polygons);
 
   /// The color of the polygon. Defaults to black.
@@ -37,6 +39,8 @@ class PolygonLayer extends Layer<Feature<Polygon>> {
     sourceId: getSourceId(index),
     paint: getPaint(),
     layout: getLayout(),
+    minZoom: minZoom,
+    maxZoom: maxZoom,
   );
 
   @override
diff --git a/lib/src/layer/polyline_layer.dart b/lib/src/layer/polyline_layer.dart
@@ -13,6 +13,8 @@ class PolylineLayer extends Layer<Feature<LineString>> {
     this.gapWidth = 0,
     this.blur = 0,
     this.dashArray,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   }) : super._(list: polylines);
 
   /// The color of the polyline. Defaults to black
@@ -52,6 +54,8 @@ class PolylineLayer extends Layer<Feature<LineString>> {
     sourceId: getSourceId(index),
     paint: getPaint(),
     layout: getLayout(),
+    minZoom: minZoom,
+    maxZoom: maxZoom,
   );
 
   @override
diff --git a/lib/src/platform/android/style_controller.dart b/lib/src/platform/android/style_controller.dart
@@ -48,6 +48,8 @@ class StyleControllerAndroid implements StyleController {
             'The Layer is not supported: ${layer.runtimeType}',
           ),
         };
+        jLayer.setMinZoom(layer.minZoom);
+        jLayer.setMaxZoom(layer.maxZoom);
 
         // paint and layout properties
         final layoutEntries = layer.layout.entries.toList(growable: false);
diff --git a/lib/src/platform/ios/style_controller.dart b/lib/src/platform/ios/style_controller.dart
@@ -73,14 +73,10 @@ class StyleControllerIos implements StyleController {
         'The Layer is not supported: ${layer.runtimeType}',
       );
     }
+    ffiStyleLayer.minimumZoomLevel = layer.minZoom;
+    ffiStyleLayer.maximumZoomLevel = layer.maxZoom;
     ffiStyleLayer.setProperties(layer.paint);
     ffiStyleLayer.setProperties(layer.layout);
-    if (layer.minZoom case final double minZoom) {
-      ffiStyleLayer.minimumZoomLevel = minZoom;
-    }
-    if (layer.maxZoom case final double maxZoom) {
-      ffiStyleLayer.maximumZoomLevel = maxZoom;
-    }
     _ffiStyle.addLayer(ffiStyleLayer);
   }
 
diff --git a/lib/src/platform/web/interop/map.dart b/lib/src/platform/web/interop/map.dart
@@ -221,6 +221,8 @@ extension type LayerSpecification._(JSObject _) implements JSObject {
     required String? source,
     required JSAny layout,
     required JSAny paint,
+    required double? minzoom,
+    required double? maxzoom,
   });
 
   /// Get the layer id.
diff --git a/lib/src/platform/web/style_controller.dart b/lib/src/platform/web/style_controller.dart
@@ -80,6 +80,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -91,6 +93,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -102,6 +106,8 @@ class StyleControllerWeb implements StyleController {
             source: null,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -113,6 +119,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -124,6 +132,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -135,6 +145,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -146,6 +158,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -157,6 +171,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
@@ -168,6 +184,8 @@ class StyleControllerWeb implements StyleController {
             source: layer.sourceId,
             layout: layer.layout.jsify()!,
             paint: layer.paint.jsify()!,
+            minzoom: layer.minZoom,
+            maxzoom: layer.maxZoom,
           ),
           belowLayerId,
         );
diff --git a/lib/src/style/layers/background_style_layer.dart b/lib/src/style/layers/background_style_layer.dart
@@ -15,6 +15,8 @@ final class BackgroundStyleLayer extends StyleLayer {
     this.opacity = 1,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   /// Whether this layer is displayed.
diff --git a/lib/src/style/layers/circle_style_layer.dart b/lib/src/style/layers/circle_style_layer.dart
@@ -13,6 +13,8 @@ final class CircleStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/fill_extrusion_style_layer.dart b/lib/src/style/layers/fill_extrusion_style_layer.dart
@@ -13,6 +13,8 @@ final class FillExtrusionStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/fill_style_layer.dart b/lib/src/style/layers/fill_style_layer.dart
@@ -13,6 +13,8 @@ final class FillStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
   // TODO add properties
 }
diff --git a/lib/src/style/layers/heatmap_style_layer.dart b/lib/src/style/layers/heatmap_style_layer.dart
@@ -13,6 +13,8 @@ final class HeatmapStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/hillshade_style_layer.dart b/lib/src/style/layers/hillshade_style_layer.dart
@@ -13,6 +13,8 @@ final class HillshadeStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/line_style_layer.dart b/lib/src/style/layers/line_style_layer.dart
@@ -13,6 +13,8 @@ final class LineStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/raster_style_layer.dart b/lib/src/style/layers/raster_style_layer.dart
@@ -13,6 +13,8 @@ final class RasterStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
diff --git a/lib/src/style/layers/style_layer.dart b/lib/src/style/layers/style_layer.dart
@@ -23,8 +23,8 @@ interface class StyleLayer {
     this.layout = const {},
     this.paint = const {},
     this.metadata,
-    this.minZoom,
-    this.maxZoom,
+    this.minZoom = 0,
+    this.maxZoom = 24,
     this.filter,
   });
 
@@ -40,13 +40,13 @@ interface class StyleLayer {
   /// minzoom, the layer will be hidden.
   ///
   /// Needs to be in the range of [0,24].
-  final double? minZoom;
+  final double minZoom;
 
   /// The maximum zoom level for the layer. At zoom levels equal to or greater
   /// than the maxzoom, the layer will be hidden.
   ///
   /// Needs to be in the range of [0,24].
-  final double? maxZoom;
+  final double maxZoom;
 
   /// A expression specifying conditions on source features. Only features that
   /// match the filter are displayed. Zoom expressions in filters are only
diff --git a/lib/src/style/layers/symbol_style_layer.dart b/lib/src/style/layers/symbol_style_layer.dart
@@ -13,6 +13,8 @@ final class SymbolStyleLayer extends StyleLayerWithSource {
     required super.sourceId,
     super.layout,
     super.paint,
+    super.minZoom = 0,
+    super.maxZoom = 24,
   });
 
   // TODO add properties
