flet-map 0.85.0.dev0__tar.gz → 0.85.0.dev1__tar.gz

{flet_map-0.85.0.dev0/src/flet_map.egg-info → flet_map-0.85.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-map
-Version: 0.85.0.dev0
+Version: 0.85.0.dev1
 Summary: Interactive map controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.85.0.dev0
+Requires-Dist: flet==0.85.0.dev1
 Dynamic: license-file
 
 # flet-map
@@ -55,4 +55,4 @@ To install the `flet-map` package and add it to your project dependencies:
 
 ### Examples
 
-For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/controls/map).
+For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/extensions/map).

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/README.md

@@ -39,4 +39,4 @@ To install the `flet-map` package and add it to your project dependencies:
 
 ### Examples
 
-For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/controls/map).
+For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/extensions/map).

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-map"
-version = "0.85.0.dev0"
+version = "0.85.0.dev1"
 description = "Interactive map controls for Flet apps."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==0.85.0.dev0",
+    "flet==0.85.0.dev1",
 ]
 
 [project.urls]

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/__init__.py

@@ -2,6 +2,12 @@ from flet_map.circle_layer import CircleLayer, CircleMarker
 from flet_map.map import Map
 from flet_map.map_layer import MapLayer
 from flet_map.marker_layer import Marker, MarkerLayer
+from flet_map.overlay_image_layer import (
+    BaseOverlayImage,
+    OverlayImage,
+    OverlayImageLayer,
+    RotatedOverlayImage,
+)
 from flet_map.polygon_layer import PolygonLayer, PolygonMarker
 from flet_map.polyline_layer import PolylineLayer, PolylineMarker
 from flet_map.rich_attribution import RichAttribution
@@ -45,6 +51,7 @@ from flet_map.types import (
 
 __all__ = [
     "AttributionAlignment",
+    "BaseOverlayImage",
     "Camera",
     "CameraFit",
     "CircleLayer",
@@ -73,12 +80,15 @@ __all__ = [
     "Marker",
     "MarkerLayer",
     "MultiFingerGesture",
+    "OverlayImage",
+    "OverlayImageLayer",
     "PatternFit",
     "PolygonLayer",
     "PolygonMarker",
     "PolylineLayer",
     "PolylineMarker",
     "RichAttribution",
+    "RotatedOverlayImage",
     "SimpleAttribution",
     "SolidStrokePattern",
     "SourceAttribution",

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/circle_layer.py

@@ -8,7 +8,7 @@ __all__ = ["CircleLayer", "CircleMarker"]
 
 
 @ft.control("CircleMarker")
-class CircleMarker(ft.Control):
+class CircleMarker(ft.BaseControl):
     """
     A circular marker displayed on the Map at the specified
     location through the :class:`~flet_map.CircleLayer`.
@@ -45,6 +45,11 @@ class CircleMarker(ft.Control):
     Whether the :attr:`radius` should use the unit meters.
     """
 
+    visible: bool = True
+    """
+    Whether this marker is rendered on the map.
+    """
+
     def before_update(self):
         super().before_update()
         if self.border_stroke_width < 0:

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/map.py

@@ -45,7 +45,8 @@ class Map(ft.LayoutControl):
     initial_zoom: ft.Number = 13.0
     """
     The zoom when the map is first loaded.
-    If initial_camera_fit is defined this has no effect.
+
+    If :attr:`initial_camera_fit` is non-`None` this has no effect.
     """
 
     interaction_configuration: InteractionConfiguration = field(
@@ -224,9 +225,8 @@ class Map(ft.LayoutControl):
         Args:
             animation_curve: The curve of the animation. If None (the default),
                 :attr:`flet_map.Map.animation_curve` will be used.
-            animation_duration: The duration of the animation.
-                If None (the default), :attr:`flet_map.Map.animation_duration` will be \
-                used.
+            animation_duration: The duration of the animation. If None (the default),
+                :attr:`flet_map.Map.animation_duration` will be used.
             cancel_ongoing_animations: Whether to cancel/stop all
                 ongoing map-animations before starting this new one.
         """
@@ -379,7 +379,7 @@ class Map(ft.LayoutControl):
         Gets the current camera snapshot of the map.
 
         Returns:
-            Current :class:`~flet_map.Camera` state.
+            The current camera state.
         """
         camera = await self._invoke_method("get_camera")
         return from_dict(Camera, camera)

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/map_layer.py

@@ -12,6 +12,7 @@ class MapLayer(ft.Control):
 
     - :class:`~flet_map.CircleLayer`
     - :class:`~flet_map.MarkerLayer`
+    - :class:`~flet_map.OverlayImageLayer`
     - :class:`~flet_map.PolygonLayer`
     - :class:`~flet_map.PolylineLayer`
     - :class:`~flet_map.RichAttribution`

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/marker_layer.py

@@ -9,7 +9,7 @@ __all__ = ["Marker", "MarkerLayer"]
 
 
 @ft.control("Marker")
-class Marker(ft.Control):
+class Marker(ft.BaseControl):
     """
     A marker displayed on the Map at the specified location
     through the :class:`~flet_map.MarkerLayer`.
@@ -68,6 +68,11 @@ class Marker(ft.Control):
     Defaults to the value of the parent :attr:`flet_map.MarkerLayer.alignment`.
     """
 
+    visible: bool = True
+    """
+    Whether this marker is rendered on the map.
+    """
+
     def before_update(self):
         super().before_update()
         if not self.content.visible:

flet_map-0.85.0.dev1/src/flet_map/overlay_image_layer.py

@@ -0,0 +1,116 @@
+from typing import Annotated, Union
+
+import flet as ft
+from flet.utils.validation import V
+from flet_map.map_layer import MapLayer
+from flet_map.types import MapLatitudeLongitude, MapLatitudeLongitudeBounds
+
+__all__ = [
+    "BaseOverlayImage",
+    "OverlayImage",
+    "OverlayImageLayer",
+    "RotatedOverlayImage",
+]
+
+
+@ft.control("BaseOverlayImage", kw_only=True)
+class BaseOverlayImage(ft.BaseControl):
+    """
+    Abstract class for image overlays displayed through
+    :class:`~flet_map.OverlayImageLayer`.
+
+    The following overlay image types are available:
+
+    - :class:`~flet_map.OverlayImage`
+    - :class:`~flet_map.RotatedOverlayImage`
+    """
+
+    src: Union[str, bytes]
+    """
+    The image source.
+
+    It can be one of the following:
+    - A URL or local [asset file](https://flet.dev/docs/cookbook/assets) path;
+    - A base64 string;
+    - Raw bytes.
+    """
+
+    opacity: Annotated[
+        ft.Number,
+        V.between(0.0, 1.0),
+    ] = 1.0
+    """
+    The opacity in which the image should get rendered on the map.
+
+    Raises:
+        ValueError: If it is not between `0.0` and `1.0`, inclusive.
+    """
+
+    gapless_playback: bool = False
+    """
+    Whether to continue showing the old image (`True`), or briefly show nothing
+    (`False`), when the image provider changes.
+    """
+
+    filter_quality: ft.FilterQuality = ft.FilterQuality.MEDIUM
+    """
+    The rendering quality of the image.
+    """
+
+    visible: bool = True
+    """
+    Whether this overlay image is rendered on the map.
+    """
+
+
+@ft.control("OverlayImage", kw_only=True)
+class OverlayImage(BaseOverlayImage):
+    """
+    An unrotated image overlay that spans between a given bounding box.
+    """
+
+    bounds: MapLatitudeLongitudeBounds
+    """
+    The latitude and longitude bounds where this image will be displayed.
+    """
+
+
+@ft.control("RotatedOverlayImage", kw_only=True)
+class RotatedOverlayImage(BaseOverlayImage):
+    """
+    An image overlay transformed across three corner points.
+
+    The top-right corner is derived from :attr:`top_left_corner`,
+    :attr:`bottom_left_corner`, and :attr:`bottom_right_corner`.
+    """
+
+    top_left_corner: MapLatitudeLongitude
+    """
+    The coordinates of the top-left corner of the image.
+    """
+
+    bottom_left_corner: MapLatitudeLongitude
+    """
+    The coordinates of the bottom-left corner of the image.
+    """
+
+    bottom_right_corner: MapLatitudeLongitude
+    """
+    The coordinates of the bottom-right corner of the image.
+    """
+
+
+@ft.control("OverlayImageLayer", kw_only=True)
+class OverlayImageLayer(MapLayer):
+    """
+    A layer to display image overlays.
+
+    Tip:
+        Place this layer after every non-translucent layer that should appear
+        below it. Layers rendered after this one may cover its overlay images.
+    """
+
+    overlay_images: list[BaseOverlayImage]
+    """
+    A list of image overlays to display.
+    """

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/polygon_layer.py

@@ -8,7 +8,7 @@ __all__ = ["PolygonLayer", "PolygonMarker"]
 
 
 @ft.control("PolygonMarker")
-class PolygonMarker(ft.Control):
+class PolygonMarker(ft.BaseControl):
     """
     A marker for the :class:`~flet_map.PolygonLayer`.
     """
@@ -74,6 +74,11 @@ class PolygonMarker(ft.Control):
     Style to use for line segment joins.
     """
 
+    visible: bool = True
+    """
+    Whether this marker is rendered on the map.
+    """
+
     def before_update(self):
         super().before_update()
         if self.border_stroke_width < 0:

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map/polyline_layer.py

@@ -9,7 +9,7 @@ __all__ = ["PolylineLayer", "PolylineMarker"]
 
 
 @ft.control("PolylineMarker")
-class PolylineMarker(ft.Control):
+class PolylineMarker(ft.BaseControl):
     """
     A marker for the :class:`~flet_map.PolylineLayer`.
     """
@@ -76,6 +76,11 @@ class PolylineMarker(ft.Control):
     Style to use for line segment joins.
     """
 
+    visible: bool = True
+    """
+    Whether this marker is rendered on the map.
+    """
+
     def before_update(self):
         super().before_update()
         if self.border_stroke_width < 0:

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1/src/flet_map.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-map
-Version: 0.85.0.dev0
+Version: 0.85.0.dev1
 Summary: Interactive map controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.85.0.dev0
+Requires-Dist: flet==0.85.0.dev1
 Dynamic: license-file
 
 # flet-map
@@ -55,4 +55,4 @@ To install the `flet-map` package and add it to your project dependencies:
 
 ### Examples
 
-For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/controls/map).
+For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/examples/extensions/map).

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flet_map.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/flet_map/circle_layer.py
 src/flet_map/map.py
 src/flet_map/map_layer.py
 src/flet_map/marker_layer.py
+src/flet_map/overlay_image_layer.py
 src/flet_map/polygon_layer.py
 src/flet_map/polyline_layer.py
 src/flet_map/rich_attribution.py
@@ -24,6 +25,7 @@ src/flutter/flet_map/lib/src/circle_layer.dart
 src/flutter/flet_map/lib/src/extension.dart
 src/flutter/flet_map/lib/src/map.dart
 src/flutter/flet_map/lib/src/marker_layer.dart
+src/flutter/flet_map/lib/src/overlay_image_layer.dart
 src/flutter/flet_map/lib/src/polygon_layer.dart
 src/flutter/flet_map/lib/src/polyline_layer.dart
 src/flutter/flet_map/lib/src/rich_attribution.dart

flet_map-0.85.0.dev1/src/flet_map.egg-info/requires.txt

@@ -0,0 +1 @@
+flet==0.85.0.dev1

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/circle_layer.dart

@@ -20,7 +20,7 @@ class CircleLayerControl extends StatelessWidget with FletStoreMixin {
         .map((circle) {
       circle.notifyParent = true;
       return CircleMarker(
-          point: parseLatLng(circle.get("coordinates"))!,
+          point: circle.getLatLng("coordinates")!,
           color: circle.getColor("color", context, const Color(0xFF00FF00))!,
           borderColor: circle.getColor(
               "border_color", context, const Color(0xFFFFFF00))!,
@@ -29,6 +29,6 @@ class CircleLayerControl extends StatelessWidget with FletStoreMixin {
           radius: circle.getDouble("radius", 10)!);
     }).toList();
 
-    return CircleLayer(circles: circles);
+    return BaseControl(control: control, child: CircleLayer(circles: circles));
   }
 }

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/extension.dart

@@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
 import 'circle_layer.dart';
 import 'map.dart';
 import 'marker_layer.dart';
+import 'overlay_image_layer.dart';
 import 'polygon_layer.dart';
 import 'polyline_layer.dart';
 import 'rich_attribution.dart';
@@ -24,6 +25,8 @@ class Extension extends FletExtension {
         return TileLayerControl(key: key, control: control);
       case "MarkerLayer":
         return MarkerLayerControl(key: key, control: control);
+      case "OverlayImageLayer":
+        return OverlayImageLayerControl(key: key, control: control);
       case "CircleLayer":
         return CircleLayerControl(key: key, control: control);
       case "PolygonLayer":

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/marker_layer.dart

@@ -19,7 +19,7 @@ class MarkerLayerControl extends StatelessWidget with FletStoreMixin {
         .map((marker) {
       marker.notifyParent = true;
       return AnimatedMarker(
-          point: parseLatLng(marker.get("coordinates"))!,
+          point: marker.getLatLng("coordinates")!,
           rotate: marker.getBool("rotate"),
           height: marker.getDouble("height", 30.0)!,
           width: marker.getDouble("width", 30.0)!,
@@ -30,10 +30,13 @@ class MarkerLayerControl extends StatelessWidget with FletStoreMixin {
           });
     }).toList();
 
-    return AnimatedMarkerLayer(
-      markers: markers,
-      rotate: control.getBool("rotate", false)!,
-      alignment: control.getAlignment("alignment", Alignment.center)!,
+    return BaseControl(
+      control: control,
+      child: AnimatedMarkerLayer(
+        markers: markers,
+        rotate: control.getBool("rotate", false)!,
+        alignment: control.getAlignment("alignment", Alignment.center)!,
+      ),
     );
   }
 }

flet_map-0.85.0.dev1/src/flutter/flet_map/lib/src/overlay_image_layer.dart

@@ -0,0 +1,73 @@
+import 'package:flet/flet.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+
+import 'utils/map.dart';
+
+class OverlayImageLayerControl extends StatelessWidget {
+  final Control control;
+
+  const OverlayImageLayerControl({super.key, required this.control});
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("OverlayImageLayerControl build: ${control.id}");
+
+    final overlayImages = control
+        .children("overlay_images")
+        .map((overlayImage) {
+          overlayImage.notifyParent = true;
+
+          final imageProvider = overlayImage.getImageProvider("src", context);
+          if (imageProvider == null) return null;
+
+          final opacity = overlayImage.getDouble("opacity", 1.0)!;
+          final gaplessPlayback =
+              overlayImage.getBool("gapless_playback", false)!;
+          final filterQuality = overlayImage.getFilterQuality(
+              "filter_quality", FilterQuality.medium)!;
+
+          switch (overlayImage.type) {
+            case "OverlayImage":
+              final bounds = overlayImage.getLatLngBounds("bounds");
+              if (bounds == null) return null;
+              return OverlayImage(
+                imageProvider: imageProvider,
+                bounds: bounds,
+                opacity: opacity,
+                gaplessPlayback: gaplessPlayback,
+                filterQuality: filterQuality,
+              );
+            case "RotatedOverlayImage":
+              final topLeftCorner = overlayImage.getLatLng("top_left_corner");
+              final bottomLeftCorner =
+                  overlayImage.getLatLng("bottom_left_corner");
+              final bottomRightCorner =
+                  overlayImage.getLatLng("bottom_right_corner");
+              if (topLeftCorner == null ||
+                  bottomLeftCorner == null ||
+                  bottomRightCorner == null) {
+                return null;
+              }
+              return RotatedOverlayImage(
+                imageProvider: imageProvider,
+                topLeftCorner: topLeftCorner,
+                bottomLeftCorner: bottomLeftCorner,
+                bottomRightCorner: bottomRightCorner,
+                opacity: opacity,
+                gaplessPlayback: gaplessPlayback,
+                filterQuality: filterQuality,
+              );
+            default:
+              return null;
+          }
+        })
+        .nonNulls
+        .toList();
+
+    return BaseControl(
+      control: control,
+      child: OverlayImageLayer(overlayImages: overlayImages),
+    );
+  }
+}

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/polygon_layer.dart

@@ -29,21 +29,20 @@ class PolygonLayerControl extends StatelessWidget with FletStoreMixin {
               "label_text_style", Theme.of(context), const TextStyle())!,
           strokeCap: polygon.getStrokeCap("stroke_cap", StrokeCap.round)!,
           strokeJoin: polygon.getStrokeJoin("stroke_join", StrokeJoin.round)!,
-          points: polygon
-              .get("coordinates", [])!
-              .map((c) => parseLatLng(c))
-              .nonNulls
-              .toList());
+          points: polygon.getLatLngList("coordinates"));
     }).toList();
 
-    return PolygonLayer(
-      polygons: polygons,
-      polygonCulling: control.getBool("polygon_culling", true)!,
-      polygonLabels: control.getBool("polygon_labels", true)!,
-      drawLabelsLast: control.getBool("draw_labels_last", false)!,
-      simplificationTolerance:
-          control.getDouble("simplification_tolerance", 0.3)!,
-      useAltRendering: control.getBool("use_alternative_rendering", false)!,
+    return BaseControl(
+      control: control,
+      child: PolygonLayer(
+        polygons: polygons,
+        polygonCulling: control.getBool("polygon_culling", true)!,
+        polygonLabels: control.getBool("polygon_labels", true)!,
+        drawLabelsLast: control.getBool("draw_labels_last", false)!,
+        simplificationTolerance:
+            control.getDouble("simplification_tolerance", 0.3)!,
+        useAltRendering: control.getBool("use_alternative_rendering", false)!,
+      ),
     );
   }
 }

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/polyline_layer.dart

@@ -23,8 +23,8 @@ class PolylineLayerControl extends StatelessWidget with FletStoreMixin {
           borderColor:
               polyline.getColor("border_color", context, Colors.yellow)!,
           color: polyline.getColor("color", context, Colors.yellow)!,
-          pattern: parseStrokePattern(
-              polyline.get("stroke_pattern"), const StrokePattern.solid())!,
+          pattern: polyline.getStrokePattern(
+              "stroke_pattern", const StrokePattern.solid())!,
           strokeCap: polyline.getStrokeCap("stroke_cap", StrokeCap.round)!,
           strokeJoin: polyline.getStrokeJoin("stroke_join", StrokeJoin.round)!,
           strokeWidth: polyline.getDouble("stroke_width", 1.0)!,
@@ -40,19 +40,18 @@ class PolylineLayerControl extends StatelessWidget with FletStoreMixin {
               .map((e) => parseColor(e, Theme.of(context)))
               .nonNulls
               .toList(),
-          points: polyline
-              .get("coordinates", [])!
-              .map((c) => parseLatLng(c))
-              .nonNulls
-              .toList());
+          points: polyline.getLatLngList("coordinates"));
     }).toList();
 
-    return PolylineLayer(
-      polylines: polylines,
-      cullingMargin: control.getDouble("culling_margin", 10.0)!,
-      minimumHitbox: control.getDouble("min_hittable_radius", 10.0)!,
-      simplificationTolerance:
-          control.getDouble("simplification_tolerance", 0.3)!,
+    return BaseControl(
+      control: control,
+      child: PolylineLayer(
+        polylines: polylines,
+        cullingMargin: control.getDouble("culling_margin", 10.0)!,
+        minimumHitbox: control.getDouble("min_hittable_radius", 10.0)!,
+        simplificationTolerance:
+            control.getDouble("simplification_tolerance", 0.3)!,
+      ),
     );
   }
 }

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/rich_attribution.dart

@@ -44,19 +44,21 @@ class _RichAttributionControlState extends State<RichAttributionControl>
         .nonNulls
         .toList();
 
-    return RichAttributionWidget(
-        attributions: attributions,
-        permanentHeight: widget.control.getDouble("permanent_height", 24.0)!,
-        popupBackgroundColor: widget.control.getColor(
-            "popup_bgcolor", context, Theme.of(context).colorScheme.surface),
-        showFlutterMapAttribution:
-            widget.control.getBool("show_flutter_map_attribution", true)!,
-        alignment: parseAttributionAlignment(
-            widget.control.getString("alignment"),
-            AttributionAlignment.bottomRight)!,
-        popupBorderRadius:
-            widget.control.getBorderRadius("popup_border_radius"),
-        popupInitialDisplayDuration: widget.control
-            .getDuration("popup_initial_display_duration", Duration.zero)!);
+    return BaseControl(
+      control: widget.control,
+      child: RichAttributionWidget(
+          attributions: attributions,
+          permanentHeight: widget.control.getDouble("permanent_height", 24.0)!,
+          popupBackgroundColor: widget.control.getColor(
+              "popup_bgcolor", context, Theme.of(context).colorScheme.surface),
+          showFlutterMapAttribution:
+              widget.control.getBool("show_flutter_map_attribution", true)!,
+          alignment: widget.control.getAttributionAlignment(
+              "alignment", AttributionAlignment.bottomRight)!,
+          popupBorderRadius:
+              widget.control.getBorderRadius("popup_border_radius"),
+          popupInitialDisplayDuration: widget.control
+              .getDuration("popup_initial_display_duration", Duration.zero)!),
+    );
   }
 }

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/simple_attribution.dart

@@ -12,12 +12,15 @@ class SimpleAttributionControl extends StatelessWidget {
     debugPrint("SimpleAttributionControl build: ${control.id}");
     var text = control.buildTextOrWidget("text");
 
-    return SimpleAttributionWidget(
-      source: text is Text ? text : const Text("Placeholder Text"),
-      onTap: () => control.triggerEvent("click"),
-      backgroundColor: control.getColor(
-          "bgcolor", context, Theme.of(context).colorScheme.surface)!,
-      alignment: control.getAlignment("alignment", Alignment.bottomRight)!,
+    return BaseControl(
+      control: control,
+      child: SimpleAttributionWidget(
+        source: text is Text ? text : const Text("Placeholder Text"),
+        onTap: () => control.triggerEvent("click"),
+        backgroundColor: control.getColor(
+            "bgcolor", context, Theme.of(context).colorScheme.surface)!,
+        alignment: control.getAlignment("alignment", Alignment.bottomRight)!,
+      ),
     );
   }
 }

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/tile_layer.dart

@@ -34,8 +34,8 @@ class TileLayerControl extends StatelessWidget {
           control.get<List>("subdomains")?.map((e) => e.toString()).toList() ??
               const ['a', 'b', 'c'],
       tileProvider: NetworkTileProvider(),
-      tileDisplay: parseTileDisplay(
-          control.get("display_mode"), const TileDisplay.fadeIn())!,
+      tileDisplay:
+          control.getTileDisplay("display_mode", const TileDisplay.fadeIn())!,
       tileDimension: control.getInt("tile_size", 256)!,
       userAgentPackageName:
           control.getString("user_agent_package_name", 'unknown')!,
@@ -46,13 +46,12 @@ class TileLayerControl extends StatelessWidget {
       keepBuffer: control.getInt("keep_buffer", 2)!,
       panBuffer: control.getInt("pan_buffer", 1)!,
       tms: control.getBool("enable_tms", false)!,
-      tileBounds: parseLatLngBounds(control.get("tile_bounds")),
+      tileBounds: control.getLatLngBounds("tile_bounds"),
       retinaMode: control.getBool("enable_retina_mode"),
       maxZoom: control.getDouble("max_zoom", double.infinity)!,
       minZoom: control.getDouble("min_zoom", 0)!,
-      evictErrorTileStrategy: parseEvictErrorTileStrategy(
-          control.getString("evict_error_tile_strategy"),
-          EvictErrorTileStrategy.none)!,
+      evictErrorTileStrategy: control.getEvictErrorTileStrategy(
+          "evict_error_tile_strategy", EvictErrorTileStrategy.none)!,
       errorImage: errorImage,
       errorTileCallback: (TileImage t, Object o, StackTrace? s) {
         control.triggerEvent("image_error", o.toString());
@@ -61,7 +60,7 @@ class TileLayerControl extends StatelessWidget {
               .get<Map>("additional_options")
               ?.map((k, v) => MapEntry(k.toString(), v.toString())) ??
           const {},
-      wmsOptions: parseWMSTileLayerOptions(control.get("wms_configuration")),
+      wmsOptions: control.getWMSTileLayerOptions("wms_configuration"),
     );
 
     return BaseControl(control: control, child: tileLayer);

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/utils/attribution_alignment.dart

@@ -5,3 +5,10 @@ AttributionAlignment? parseAttributionAlignment(String? value,
     [AttributionAlignment? defaultValue]) {
   return parseEnum(AttributionAlignment.values, value, defaultValue);
 }
+
+extension AttributionAlignmentControlExtension on Control {
+  AttributionAlignment? getAttributionAlignment(String propertyName,
+      [AttributionAlignment? defaultValue]) {
+    return parseAttributionAlignment(getString(propertyName), defaultValue);
+  }
+}

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/lib/src/utils/map.dart

@@ -153,10 +153,12 @@ KeyboardOptions? parseKeyboardOptions(dynamic value,
           parseDouble(value["rotate_leap_velocity_multiplier"], 3)!,
       zoomLeapVelocityMultiplier:
           parseDouble(value["zoom_leap_velocity_multiplier"], 3)!,
-      performLeapTriggerDuration:
-          parseDuration(value["perform_leap_trigger_duration"], const Duration(milliseconds: 100))!,
-      animationCurveReverseDuration:
-          parseDuration(value["animation_curve_reverse_duration"], const Duration(milliseconds: 600))!);
+      performLeapTriggerDuration: parseDuration(
+          value["perform_leap_trigger_duration"],
+          const Duration(milliseconds: 100))!,
+      animationCurveReverseDuration: parseDuration(
+          value["animation_curve_reverse_duration"],
+          const Duration(milliseconds: 600))!);
 }
 
 CursorRotationBehaviour? parseCursorRotationBehaviour(String? value,
@@ -257,16 +259,16 @@ MapOptions? parseConfiguration(Control control, BuildContext context,
     [MapOptions? defaultValue]) {
   return MapOptions(
     initialCenter:
-        parseLatLng(control.get("initial_center"), const LatLng(50.5, 30.51))!,
-    interactionOptions: parseInteractionOptions(
-        control.get("interaction_configuration"), const InteractionOptions())!,
+        control.getLatLng("initial_center", const LatLng(50.5, 30.51))!,
+    interactionOptions: control.getInteractionOptions(
+        "interaction_configuration", const InteractionOptions())!,
     backgroundColor: control.getColor("bgcolor", context, Colors.grey[300])!,
     initialRotation: control.getDouble("initial_rotation", 0.0)!,
     initialZoom: control.getDouble("initial_zoom", 13.0)!,
     keepAlive: control.getBool("keep_alive", false)!,
     maxZoom: control.getDouble("max_zoom"),
     minZoom: control.getDouble("min_zoom"),
-    initialCameraFit: parseCameraFit(control.get("initial_camera_fit")),
+    initialCameraFit: control.getCameraFit("initial_camera_fit"),
     onPointerHover: control.hasEventHandler("hover")
         ? (PointerHoverEvent e, LatLng latlng) {
             control.triggerEvent("hover", {
@@ -393,3 +395,63 @@ extension MapEventExtension on MapEvent {
     };
   }
 }
+
+extension MapParsersControlExtension on Control {
+  LatLng? getLatLng(String propertyName, [LatLng? defaultValue]) {
+    return parseLatLng(get(propertyName), defaultValue);
+  }
+
+  LatLngBounds? getLatLngBounds(String propertyName,
+      [LatLngBounds? defaultValue]) {
+    return parseLatLngBounds(get(propertyName), defaultValue);
+  }
+
+  List<LatLng> getLatLngList(String propertyName,
+      [List<LatLng> defaultValue = const []]) {
+    return get<List>(propertyName)
+            ?.map((c) => parseLatLng(c))
+            .nonNulls
+            .toList() ??
+        defaultValue;
+  }
+
+  StrokePattern? getStrokePattern(String propertyName,
+      [StrokePattern? defaultValue]) {
+    return parseStrokePattern(get(propertyName), defaultValue);
+  }
+
+  TileDisplay? getTileDisplay(String propertyName,
+      [TileDisplay? defaultValue]) {
+    return parseTileDisplay(get(propertyName), defaultValue);
+  }
+
+  InteractionOptions? getInteractionOptions(String propertyName,
+      [InteractionOptions? defaultValue]) {
+    return parseInteractionOptions(get(propertyName), defaultValue);
+  }
+
+  CameraFit? getCameraFit(String propertyName, [CameraFit? defaultValue]) {
+    return parseCameraFit(get(propertyName), defaultValue);
+  }
+
+  KeyboardOptions? getKeyboardOptions(String propertyName,
+      [KeyboardOptions? defaultValue]) {
+    return parseKeyboardOptions(get(propertyName), defaultValue);
+  }
+
+  CursorKeyboardRotationOptions? getCursorKeyboardRotationOptions(
+      String propertyName,
+      [CursorKeyboardRotationOptions? defaultValue]) {
+    return parseCursorKeyboardRotationOptions(get(propertyName), defaultValue);
+  }
+
+  EvictErrorTileStrategy? getEvictErrorTileStrategy(String propertyName,
+      [EvictErrorTileStrategy? defaultValue]) {
+    return parseEvictErrorTileStrategy(getString(propertyName), defaultValue);
+  }
+
+  WMSTileLayerOptions? getWMSTileLayerOptions(String propertyName,
+      [WMSTileLayerOptions? defaultValue]) {
+    return parseWMSTileLayerOptions(get(propertyName), defaultValue);
+  }
+}

{flet_map-0.85.0.dev0 → flet_map-0.85.0.dev1}/src/flutter/flet_map/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   collection: ^1.16.0
-  flutter_map: 8.2.2
+  flutter_map: ^8.3.0
   flutter_map_animations: 0.9.0
   latlong2: 0.9.1
 

flet_map-0.85.0.dev0/src/flet_map.egg-info/requires.txt

@@ -1 +0,0 @@
-flet==0.85.0.dev0