fix: Rollback styleString from MapLibreMapOptions and update related methods.

Author: gabbopalma

CHANGELOG.md

@@ -13,7 +13,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Changed
 * Rollback maplibre-gl to `4.7.1` version. (#660)
-* Removed `styleString` from internal MapLibreMapOptions class. (#660)
 
 ### Added
 * Added `onCameraMove` callback in the controller and in MapLibreMap class. (#643)

maplibre_gl/CHANGELOG.md

@@ -8,7 +8,6 @@
 
 ### Changed
 * Rollback maplibre-gl to `4.7.1` version. (#660)
-* Removed `styleString` from internal MapLibreMapOptions class. (#660)
 
 ### Added
 * Added `onCameraMove` callback in the controller and in MapLibreMap class. (#643)

maplibre_gl/lib/src/maplibre_map.dart

@@ -378,6 +378,7 @@ class _MapLibreMapOptions {
   _MapLibreMapOptions(
       {this.compassEnabled,
       this.cameraTargetBounds,
+      this.styleString,
       this.minMaxZoomPreference,
       required this.rotateGesturesEnabled,
       required this.scrollGesturesEnabled,
@@ -402,6 +403,7 @@ class _MapLibreMapOptions {
           locationEnginePlatforms: map.locationEnginePlatforms,
           compassEnabled: map.compassEnabled,
           cameraTargetBounds: map.cameraTargetBounds,
+          styleString: map.styleString,
           minMaxZoomPreference: map.minMaxZoomPreference,
           rotateGesturesEnabled: map.rotateGesturesEnabled,
           scrollGesturesEnabled: map.scrollGesturesEnabled,
@@ -426,6 +428,8 @@ class _MapLibreMapOptions {
 
   final CameraTargetBounds? cameraTargetBounds;
 
+  final String? styleString;
+
   final MinMaxZoomPreference? minMaxZoomPreference;
 
   final bool rotateGesturesEnabled;
@@ -489,6 +493,7 @@ class _MapLibreMapOptions {
 
     addIfNonNull('compassEnabled', compassEnabled);
     addIfNonNull('cameraTargetBounds', cameraTargetBounds?.toJson());
+    addIfNonNull('styleString', styleString);
     addIfNonNull('minMaxZoomPreference', minMaxZoomPreference?.toJson());
 
     addIfNonNull('rotateGesturesEnabled', rotateGesturesEnabled);

maplibre_gl_web/CHANGELOG.md

@@ -3,7 +3,6 @@ See top-level [CHANGELOG.md](../CHANGELOG.md) for full details.
 ## [0.24.1](https://github.com/maplibre/flutter-maplibre-gl/compare/v0.24.0...v0.24.1)
 
 * Rollback maplibre-gl to `4.7.1` version. (#660)
-* Removed `styleString` from internal MapLibreMapOptions class. (#660)
 
 ## 0.24.0
 

maplibre_gl_web/lib/src/convert.dart

@@ -1,8 +1,15 @@
 part of '../maplibre_gl_web.dart';
 
 class Convert {
+  /// Interprets the map options and applies them to the sink.
+  /// 
+  /// [ignoreStyle] if true, will not apply styleString changes.
+  /// This is useful when the style is handled separately (like MapLibreMap initialization).
   static void interpretMapLibreMapOptions(
-      Map<String, dynamic> options, MapLibreMapOptionsSink sink) {
+    Map<String, dynamic> options,
+    MapLibreMapOptionsSink sink, {
+    bool ignoreStyle = false,
+  }) {
     if (options.containsKey('cameraTargetBounds')) {
       final bounds = options['cameraTargetBounds'][0];
       if (bounds == null) {
@@ -19,6 +26,12 @@ class Convert {
     if (options.containsKey('compassEnabled')) {
       sink.setCompassEnabled(options['compassEnabled']);
     }
+    if (options.containsKey('styleString') && !ignoreStyle) {
+      final styleString = options['styleString'];
+      if (styleString == null) return;
+
+      sink.setStyle(styleString);
+    }
     if (options.containsKey('minMaxZoomPreference')) {
       sink.setMinMaxZoomPreference(options['minMaxZoomPreference'][0],
           options['minMaxZoomPreference'][1]);

maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart

@@ -93,7 +93,7 @@ class MapLibreMapController extends MapLibrePlatform
     _initResizeObserver();
 
     final options = _creationParams['options'] ?? {};
-    Convert.interpretMapLibreMapOptions(options, this);
+    Convert.interpretMapLibreMapOptions(options, this, ignoreStyle: true);
   }
 
   void _initResizeObserver() {
@@ -178,8 +178,8 @@ class MapLibreMapController extends MapLibrePlatform
 
   @override
   Future<CameraPosition?> updateMapOptions(
-      Map<String, dynamic> optionsUpdate) async {
-    // FIX: why is called indefinitely? (map_ui page)
+    Map<String, dynamic> optionsUpdate,
+  ) async {
     Convert.interpretMapLibreMapOptions(optionsUpdate, this);
     return _getCameraPosition();
   }
@@ -444,7 +444,7 @@ class MapLibreMapController extends MapLibrePlatform
     if (filter != null) {
       parameters['filter'] = filter;
     }
-    print(parameters);
+    print('Query source features parameters: $parameters');
 
     return _map
         .querySourceFeatures(sourceId, parameters)

maplibre_gl_web/lib/src/options_sink.dart

@@ -6,6 +6,9 @@ abstract class MapLibreMapOptionsSink {
 
   void setCompassEnabled(bool compassEnabled);
 
+  // TODO: styleString is not actually a part of options. consider moving
+  void setStyle(dynamic styleObject);
+
   void setMinMaxZoomPreference(num? min, num? max);
 
   void setGestures({

maplibre_gl_web/lib/src/ui/map.dart

@@ -143,7 +143,7 @@ class MapLibreMap extends Camera {
   ///  var mapDiv = document.getElementById('map');
   ///  if (mapDiv.style.visibility === true) map.resize();
   MapLibreMap resize([dynamic eventData]) =>
-      MapLibreMap.fromJsObject(jsObject.resize());
+      MapLibreMap.fromJsObject(jsObject.resize(eventData));
 
   ///  Returns the map's geographical bounds. When the bearing or pitch is non-zero, the visible region is not
   ///  an axis-aligned rectangle, and the result is the smallest bounds that encompasses the visible region.
@@ -230,7 +230,7 @@ class MapLibreMap extends Camera {
   ///    If `null` or `undefined` is provided, the function removes the current minimum pitch (i.e. sets it to 0).
   ///  @returns {MapLibreMap} `this`
   MapLibreMap setMinPitch([num? minPitch]) =>
-      MapLibreMap.fromJsObject(jsObject.setMinPitch());
+      MapLibreMap.fromJsObject(jsObject.setMinPitch(minPitch));
 
   ///  Returns the map's minimum allowable pitch.
   ///
@@ -245,7 +245,7 @@ class MapLibreMap extends Camera {
   ///    If `null` or `undefined` is provided, the function removes the current maximum pitch (sets it to 60).
   ///  @returns {MapLibreMap} `this`
   MapLibreMap setMaxPitch([num? maxPitch]) =>
-      MapLibreMap.fromJsObject(jsObject.setMaxPitch());
+      MapLibreMap.fromJsObject(jsObject.setMaxPitch(maxPitch));
 
   ///  Returns the map's maximum allowable pitch.
   ///
@@ -1268,7 +1268,7 @@ class MapOptions extends JsObjectWrapper<MapOptionsJsImpl> {
         maxZoom: maxZoom,
         minPitch: minPitch,
         maxPitch: maxPitch,
-        style: style,
+        style: jsify(style),
         boxZoom: boxZoom,
         dragRotate: dragRotate,
         dragPan: dragPan ?? true,