flet-map 0.1.0.dev2__py3-none-any.whl → 0.2.0.dev45__py3-none-any.whl

flutter/flet_map/lib/src/marker_layer.dart

@@ -6,45 +6,33 @@ import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'utils/map.dart';
 
 class MarkerLayerControl extends StatelessWidget with FletStoreMixin {
-  final Control? parent;
   final Control control;
-  final List<Control> children;
-  final bool parentDisabled;
 
-  const MarkerLayerControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.children,
-      required this.parentDisabled});
+  const MarkerLayerControl({super.key, required this.control});
 
   @override
   Widget build(BuildContext context) {
     debugPrint("MarkerLayerControl build: ${control.id}");
+    var markers = control
+        .children("markers")
+        .where((c) => c.type == "Marker")
+        .map((marker) {
+      return AnimatedMarker(
+          point: parseLatLng(marker.get("coordinates"))!,
+          rotate: marker.getBool("rotate"),
+          height: marker.getDouble("height", 30.0)!,
+          width: marker.getDouble("width", 30.0)!,
+          alignment: marker.getAlignment("alignment"),
+          builder: (BuildContext context, Animation<double> animation) {
+            return marker.buildWidget("content") ??
+                const ErrorControl("content must be provided and visible");
+          });
+    }).toList();
 
-    return withControls(control.childIds, (context, markersView) {
-      debugPrint("MarkerLayerControlState build: ${control.id}");
-
-      var markers = markersView.controlViews
-          .where((c) => c.control.type == "map_marker" && c.control.isVisible)
-          .map((marker) {
-        return AnimatedMarker(
-            point: parseLatLng(marker.control, "coordinates")!,
-            rotate: marker.control.attrBool("rotate"),
-            height: marker.control.attrDouble("height", 30)!,
-            width: marker.control.attrDouble("width", 30)!,
-            alignment: parseAlignment(marker.control, "alignment"),
-            builder: (BuildContext context, Animation<double> animation) {
-              return createControl(
-                  control, marker.control.childIds.first, parentDisabled);
-            });
-      }).toList();
-
-      return AnimatedMarkerLayer(
-        markers: markers,
-        rotate: control.attrBool("rotate", false)!,
-        alignment: parseAlignment(control, "alignment", Alignment.center)!,
-      );
-    });
+    return AnimatedMarkerLayer(
+      markers: markers,
+      rotate: control.getBool("rotate", false)!,
+      alignment: control.getAlignment("alignment", Alignment.center)!,
+    );
   }
 }

flutter/flet_map/lib/src/polygon_layer.dart

@@ -1,6 +1,3 @@
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
@@ -8,61 +5,44 @@ import 'package:flutter_map/flutter_map.dart';
 import 'utils/map.dart';
 
 class PolygonLayerControl extends StatelessWidget with FletStoreMixin {
-  final Control? parent;
   final Control control;
 
-  const PolygonLayerControl(
-      {super.key, required this.parent, required this.control});
+  const PolygonLayerControl({super.key, required this.control});
 
   @override
   Widget build(BuildContext context) {
     debugPrint("PolygonLayerControl build: ${control.id}");
 
-    return withControls(control.childIds, (context, polygonsView) {
-      debugPrint("PolygonLayerControlState build: ${control.id}");
-
-      var polygons = polygonsView.controlViews
-          .where((c) =>
-              c.control.type == "map_polygon_marker" && c.control.isVisible)
-          .map((polygon) {
-        var strokeCap = parseStrokeCap(
-            polygon.control.attrString("strokeCap"), StrokeCap.round)!;
-        var strokeJoin = parseStrokeJoin(
-            polygon.control.attrString("strokeJoin"), StrokeJoin.round)!;
-        var coordinates = polygon.control.attrString("coordinates");
-        return Polygon(
-            borderStrokeWidth:
-                polygon.control.attrDouble("borderStrokeWidth", 0)!,
-            borderColor: polygon.control.attrColor("borderColor", context) ??
-                const Color(0xFFFFFF00),
-            color: polygon.control.attrColor("color", context) ??
-                const Color(0xFF00FF00),
-            disableHolesBorder:
-                polygon.control.attrBool("disableHolesBorder", false)!,
-            rotateLabel: polygon.control.attrBool("rotateLabel", false)!,
-            label: polygon.control.attrString("label"),
-            labelStyle: parseTextStyle(
-                    Theme.of(context), polygon.control, "labelTextStyle") ??
-                const TextStyle(),
-            strokeCap: strokeCap,
-            strokeJoin: strokeJoin,
-            points: coordinates != null
-                ? (jsonDecode(coordinates) as List)
-                    .map((e) => latLngFromJson(e))
-                    .whereNotNull()
-                    .toList()
-                : []);
-      }).toList();
-
-      return PolygonLayer(
-        polygons: polygons,
-        polygonCulling: control.attrBool("polygonCulling", false)!,
-        polygonLabels: control.attrBool("polygonLabels", true)!,
-        drawLabelsLast: control.attrBool("drawLabelsLast", false)!,
-        simplificationTolerance:
-            control.attrDouble("simplificationTolerance", 0.5)!,
-        useAltRendering: control.attrBool("useAlternativeRendering", false)!,
-      );
-    });
+    var polygons = control
+        .children("polygons")
+        .where((c) => c.type == "PolygonMarker")
+        .map((polygon) {
+      return Polygon(
+          borderStrokeWidth: polygon.getDouble("border_stroke_width", 0)!,
+          borderColor: polygon.getColor("border_color", context, Colors.green)!,
+          color: polygon.getColor("color", context, Colors.green)!,
+          disableHolesBorder: polygon.getBool("disable_holes_border", false)!,
+          rotateLabel: polygon.getBool("rotate_label", false)!,
+          label: polygon.getString("label"),
+          labelStyle: polygon.getTextStyle(
+              "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());
+    }).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)!,
+    );
   }
 }

flutter/flet_map/lib/src/polyline_layer.dart

@@ -1,6 +1,3 @@
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
@@ -8,73 +5,53 @@ import 'package:flutter_map/flutter_map.dart';
 import 'utils/map.dart';
 
 class PolylineLayerControl extends StatelessWidget with FletStoreMixin {
-  final Control? parent;
   final Control control;
-  final List<Control> children;
 
-  const PolylineLayerControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.children});
+  const PolylineLayerControl({super.key, required this.control});
 
   @override
   Widget build(BuildContext context) {
     debugPrint("PolylineLayerControl build: ${control.id}");
 
-    return withControls(control.childIds, (context, polylinesView) {
-      debugPrint("PolylineLayerControlState build: ${control.id}");
-
-      var polylines = polylinesView.controlViews
-          .where((c) =>
-              c.control.type == "map_polyline_marker" && c.control.isVisible)
-          .map<Polyline>((polyline) {
-        var coordinates = polyline.control.attrString("coordinates");
-        var colorsStop = polyline.control.attrString("colorsStop");
-        var gradientColors = polyline.control.attrString("gradientColors");
-        return Polyline(
-            borderStrokeWidth:
-                polyline.control.attrDouble("borderStrokeWidth", 0)!,
-            borderColor: polyline.control
-                .attrColor("borderColor", context, const Color(0xFFFFFF00))!,
-            color: polyline.control
-                .attrColor("color", context, const Color(0xFF00FF00))!,
-            pattern: parseStrokePattern(polyline.control, "strokePattern") ??
-                const StrokePattern.solid(),
-            strokeCap: parseStrokeCap(
-                polyline.control.attrString("strokeCap"), StrokeCap.round)!,
-            strokeJoin: parseStrokeJoin(
-                polyline.control.attrString("strokeJoin"), StrokeJoin.round)!,
-            strokeWidth: polyline.control.attrDouble("strokeWidth", 1.0)!,
-            useStrokeWidthInMeter:
-                polyline.control.attrBool("useStrokeWidthInMeter", false)!,
-            colorsStop: colorsStop != null
-                ? (jsonDecode(colorsStop) as List)
-                    .map((e) => parseDouble(e))
-                    .whereNotNull()
-                    .toList()
-                : null,
-            gradientColors: gradientColors != null
-                ? (jsonDecode(gradientColors) as List)
-                    .map((e) => parseColor(Theme.of(context), e))
-                    .whereNotNull()
-                    .toList()
-                : null,
-            points: coordinates != null
-                ? (jsonDecode(coordinates) as List)
-                    .map((e) => latLngFromJson(e))
-                    .whereNotNull()
-                    .toList()
-                : []);
-      }).toList();
-
-      return PolylineLayer(
-        polylines: polylines,
-        cullingMargin: control.attrDouble("cullingMargin", 10)!,
-        minimumHitbox: control.attrDouble("minHittableRadius", 10)!,
-        simplificationTolerance:
-            control.attrDouble("simplificationTolerance", 0.4)!,
-      );
-    });
+    var polylines = control
+        .children("polygons")
+        .where((c) => c.type == "PolygonMarker")
+        .map((polyline) {
+      return Polyline(
+          borderStrokeWidth: polyline.getDouble("border_stroke_width", 0)!,
+          borderColor:
+              polyline.getColor("border_color", context, Colors.yellow)!,
+          color: polyline.getColor("color", context, Colors.yellow)!,
+          pattern: parseStrokePattern(
+              polyline.get("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)!,
+          useStrokeWidthInMeter:
+              polyline.getBool("use_stroke_width_in_meter", false)!,
+          colorsStop: polyline
+              .get("colors_stop", [])!
+              .map((e) => parseDouble(e))
+              .nonNulls
+              .toList(),
+          gradientColors: polyline
+              .get("gradient_colors", [])!
+              .map((e) => parseColor(e, Theme.of(context)))
+              .nonNulls
+              .toList(),
+          points: polyline
+              .get("coordinates", [])!
+              .map((c) => parseLatLng(c))
+              .nonNulls
+              .toList());
+    }).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)!,
+    );
   }
 }

flutter/flet_map/lib/src/rich_attribution.dart

@@ -5,15 +5,9 @@ import 'package:flutter_map/flutter_map.dart';
 import 'utils/attribution_alignment.dart';
 
 class RichAttributionControl extends StatefulWidget {
-  final Control? parent;
   final Control control;
-  final FletControlBackend backend;
 
-  const RichAttributionControl(
-      {super.key,
-      this.parent,
-      required this.control,
-      required this.backend});
+  const RichAttributionControl({super.key, required this.control});
 
   @override
   State<RichAttributionControl> createState() => _RichAttributionControlState();
@@ -25,37 +19,43 @@ class _RichAttributionControlState extends State<RichAttributionControl>
   Widget build(BuildContext context) {
     debugPrint("RichAttributionControl build: ${widget.control.id}");
 
-    return withControls(widget.control.childIds, (context, attributionsView) {
-      debugPrint("RichAttributionControlState build: ${widget.control.id}");
-
-      var attributions = attributionsView.controlViews
-          .map((v) => v.control)
-          .where((c) => c.type == "map_text_source_attribution" && c.isVisible)
-          .map((Control itemCtrl) {
-        return TextSourceAttribution(
-          itemCtrl.attrs["text"] ?? "Placeholder Text",
-          textStyle: parseTextStyle(Theme.of(context), itemCtrl, "textStyle"),
-          onTap: () {
-            widget.backend.triggerControlEvent(itemCtrl.id, "click");
-          },
-          prependCopyright: itemCtrl.attrBool("prependCopyright", true)!,
-        );
-      }).toList();
-
-      return RichAttributionWidget(
+    var attributions = widget.control
+        .children("attributions")
+        .map((Control c) {
+          if (c.type == "TextSourceAttribution") {
+            return TextSourceAttribution(
+              c.getString("text", "Placeholder Text")!,
+              textStyle: c.getTextStyle("text_style", Theme.of(context)),
+              onTap: () => c.triggerEvent("click"),
+              prependCopyright: c.getBool("prepend_copyright", true)!,
+            );
+          } else if (c.type == "ImageSourceAttribution") {
+            var image = c.buildWidget("image");
+            if (image == null) return null;
+            return LogoSourceAttribution(
+              image,
+              height: c.getDouble("height", 24.0)!,
+              tooltip: c.getString("tooltip"),
+              onTap: () => c.triggerEvent("click"),
+            );
+          }
+        })
+        .nonNulls
+        .toList();
+
+    return RichAttributionWidget(
         attributions: attributions,
-        permanentHeight: widget.control.attrDouble("permanentHeight", 24)!,
-        popupBackgroundColor: widget.control.attrColor("popupBgColor", context),
+        permanentHeight: widget.control.getDouble("permanent_height", 24.0)!,
+        popupBackgroundColor: widget.control.getColor(
+            "popup_bgcolor", context, Theme.of(context).colorScheme.surface),
         showFlutterMapAttribution:
-            widget.control.attrBool("showFlutterMapAttribution", true)!,
+            widget.control.getBool("show_flutter_map_attribution", true)!,
         alignment: parseAttributionAlignment(
-            widget.control.attrString("alignment"),
+            widget.control.getString("alignment"),
             AttributionAlignment.bottomRight)!,
         popupBorderRadius:
-            parseBorderRadius(widget.control, "popupBorderRadius"),
-        popupInitialDisplayDuration: Duration(
-            seconds: widget.control.attrInt("popupInitialDisplayDuration", 0)!),
-      );
-    });
+            widget.control.getBorderRadius("popup_border_radius"),
+        popupInitialDisplayDuration: widget.control
+            .getDuration("popup_initial_display_duration", Duration.zero)!);
   }
 }

flutter/flet_map/lib/src/simple_attribution.dart

@@ -1,37 +1,23 @@
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 
-class SimpleAttributionControl extends StatefulWidget {
-  final Control? parent;
+class SimpleAttributionControl extends StatelessWidget {
   final Control control;
-  final FletControlBackend backend;
 
-  const SimpleAttributionControl(
-      {super.key,
-      this.parent,
-      required this.control,
-      required this.backend});
+  const SimpleAttributionControl({super.key, required this.control});
 
-  @override
-  State<SimpleAttributionControl> createState() =>
-      _SimpleAttributionControlState();
-}
-
-class _SimpleAttributionControlState extends State<SimpleAttributionControl> {
   @override
   Widget build(BuildContext context) {
-    debugPrint("SimpleAttributionControl build: ${widget.control.id}");
+    debugPrint("SimpleAttributionControl build: ${control.id}");
+    var text = control.buildTextOrWidget("text");
 
     return SimpleAttributionWidget(
-      source: Text(widget.control.attrString("text", "Placeholder Text")!),
-      onTap: () {
-        widget.backend.triggerControlEvent(widget.control.id, "click");
-      },
-      backgroundColor: widget.control.attrColor("backgroundColor", context),
-      alignment:
-          parseAlignment(widget.control, "alignment", Alignment.bottomRight)!,
+      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)!,
     );
   }
 }

flutter/flet_map/lib/src/tile_layer.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -8,73 +6,62 @@ import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_ti
 
 import './utils/map.dart';
 
-class TileLayerControl extends StatelessWidget with FletStoreMixin {
-  final Control? parent;
+class TileLayerControl extends StatelessWidget {
   final Control control;
-  final FletControlBackend backend;
 
-  const TileLayerControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.backend});
+  const TileLayerControl({super.key, required this.control});
 
   @override
   Widget build(BuildContext context) {
     debugPrint("TileLayerControl build: ${control.id}");
 
-    return withPageArgs((context, pageArgs) {
-      var errorImageSrc = control.attrString("errorImageSrc");
-
-      ImageProvider<Object>? errorImage;
-
-      if (errorImageSrc != null) {
-        var assetSrc =
-            getAssetSrc((errorImageSrc), pageArgs.pageUri!, pageArgs.assetsDir);
+    var errorImageSrc = control.getString("errorImageSrc");
+    ImageProvider<Object>? errorImage;
 
-        if (assetSrc.isFile) {
-          // from File
-          errorImage = AssetImage(assetSrc.path);
-        } else {
-          // URL
-          errorImage = NetworkImage(assetSrc.path);
-        }
+    if (errorImageSrc != null) {
+      var assetSrc = control.backend.getAssetSource(errorImageSrc);
+      if (assetSrc.isFile) {
+        // from File
+        errorImage = AssetImage(assetSrc.path);
+      } else {
+        // URL
+        errorImage = NetworkImage(assetSrc.path);
       }
-      var subdomains = control.attrString("subdomains");
-      var additionalOptions = control.attrString("additionalOptions");
-      Widget tile = TileLayer(
-          urlTemplate: control.attrString("urlTemplate", "")!,
-          fallbackUrl: control.attrString("fallbackUrl", "")!,
-          subdomains: subdomains != null
-              ? jsonDecode(subdomains).cast<String>()
-              : ['a', 'b', 'c'],
-          tileProvider: CancellableNetworkTileProvider(),
-          tileDisplay: const TileDisplay.fadeIn(),
-          tileSize: control.attrDouble("tileSize", 256)!,
-          minNativeZoom: control.attrInt("minNativeZoom", 0)!,
-          maxNativeZoom: control.attrInt("maxNativeZoom", 19)!,
-          zoomReverse: control.attrBool("zoomReverse", false)!,
-          zoomOffset: control.attrDouble("zoomOffset", 0)!,
-          keepBuffer: control.attrInt("keepBuffer", 2)!,
-          panBuffer: control.attrInt("panBuffer", 1)!,
-          tms: control.attrBool("enableTms", false)!,
-          tileBounds: parseLatLngBounds(control, "tileBounds"),
-          retinaMode: control.attrBool("enableRetinaMode"),
-          maxZoom: control.attrDouble("maxZoom", double.infinity)!,
-          minZoom: control.attrDouble("minZoom", 0)!,
-          evictErrorTileStrategy: parseEvictErrorTileStrategy(
-              control.attrString("evictErrorTileStrategy"),
-              EvictErrorTileStrategy.none)!,
-          errorImage: errorImage,
-          errorTileCallback: (TileImage t, Object o, StackTrace? s) {
-            backend.triggerControlEvent(control.id, "imageError");
-          },
-          additionalOptions: additionalOptions != null
-              ? (jsonDecode(additionalOptions) as Map)
-                  .map((k, v) => MapEntry(k.toString(), v.toString()))
-              : const {});
+    }
+    Widget tileLayer = TileLayer(
+        urlTemplate: control.getString("url_template"),
+        fallbackUrl: control.getString("fallback_url"),
+        subdomains: control
+                .get<List>("subdomains")
+                ?.map((e) => e.toString())
+                .toList() ??
+            ['a', 'b', 'c'],
+        tileProvider: CancellableNetworkTileProvider(),
+        tileDisplay: parseTileDisplay(
+            control.get("display_mode"), const TileDisplay.fadeIn())!,
+        tileDimension: control.getInt("tile_size", 256)!,
+        userAgentPackageName:
+            control.getString("user_agent_package_name", 'unknown')!,
+        minNativeZoom: control.getInt("min_native_zoom", 0)!,
+        maxNativeZoom: control.getInt("max_native_zoom", 19)!,
+        zoomReverse: control.getBool("zoom_reverse", false)!,
+        zoomOffset: control.getDouble("zoom_offset", 0)!,
+        keepBuffer: control.getInt("keep_buffer", 2)!,
+        panBuffer: control.getInt("pan_buffer", 1)!,
+        tms: control.getBool("enable_tms", false)!,
+        tileBounds: parseLatLngBounds(control.get("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)!,
+        errorImage: errorImage,
+        errorTileCallback: (TileImage t, Object o, StackTrace? s) {
+          control.triggerEvent("image_error", o.toString());
+        },
+        additionalOptions: control.get("additional_options", {})!);
 
-      return constrainedControl(context, tile, parent, control);
-    });
+    return ConstrainedControl(control: control, child: tileLayer);
   }
 }

flutter/flet_map/lib/src/utils/attribution_alignment.dart

@@ -3,9 +3,7 @@ import 'package:flutter_map/flutter_map.dart';
 
 AttributionAlignment? parseAttributionAlignment(String? value,
     [AttributionAlignment? defValue]) {
-  if (value == null) {
-    return defValue;
-  }
+  if (value == null) return defValue;
   return AttributionAlignment.values.firstWhereOrNull(
           (e) => e.name.toLowerCase() == value.toLowerCase()) ??
       defValue;