fix issue with map rotation in raster mode

avoid double-rotating raster map layer fixes #188
greensopinion · Dec 9, 2023 · 23bcd47 · 23bcd47
1 parent e63982a
commit 23bcd47
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.0.1
+
+* fix [issue 188](https://github.com/greensopinion/flutter-vector-map-tiles/issues/188) where raster mode map would be rotated incorrectly
+
 ## 7.0.0
 
 * update `flutter_map` dependency to 6.1.0

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -374,7 +374,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "6.0.2"
+    version: "7.0.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/lib/src/grid/grid_layer.dart b/lib/src/grid/grid_layer.dart
@@ -124,7 +124,6 @@ class _VectorTileCompositeLayerState extends State<VectorTileCompositeLayer>
   Widget build(BuildContext context) {
     final options = widget.options;
     final backgroundTheme = options.backgroundTheme;
-    final layers = <Widget>[];
     if (options.layerMode == VectorTileLayerMode.raster) {
       final maxZoom = options.maximumZoom ?? 18;
 
@@ -138,52 +137,51 @@ class _VectorTileCompositeLayerState extends State<VectorTileCompositeLayer>
               options.tileDelay,
               options.concurrency);
       _tileProvider = tileProvider;
-      layers.add(TileLayer(
+      return TileLayer(
           key: Key("${theme.id}_v${theme.version}_VectorTileLayer"),
           maxZoom: maxZoom,
           maxNativeZoom: maxZoom.ceil(),
           evictErrorTileStrategy: EvictErrorTileStrategy.notVisible,
-          tileProvider: tileProvider));
+          tileProvider: tileProvider);
     }
-    if (options.layerMode == VectorTileLayerMode.vector) {
-      layers.add(_VectorTileLayer(
-          Key("${theme.id}_v${theme.version}_VectorTileLayer"),
-          _LayerOptions(theme,
+    final layers = <Widget>[];
+    if (backgroundTheme != null) {
+      final background = _VectorTileLayer(
+          Key(
+              "${backgroundTheme.id}_v${theme.version}_background_VectorTileLayer"),
+          _LayerOptions(backgroundTheme,
               caches: _caches,
-              symbolTheme: symbolTheme,
-              sprites: options.sprites,
               showTileDebugInfo: options.showTileDebugInfo,
-              paintBackground: backgroundTheme == null,
-              maxSubstitutionDifference:
-                  options.maximumTileSubstitutionDifference,
-              paintNoDataTiles: false,
+              paintBackground: true,
+              maxSubstitutionDifference: 0,
+              paintNoDataTiles: true,
               tileOffset: widget.options.tileOffset,
-              tileZoomSubstitutionOffset: 0,
+              tileZoomSubstitutionOffset: 4,
               mapZoom: _zoom,
               rotation: _rotation),
           widget.mapCamera,
           _mapChanged.stream,
-          _tileSupplier));
-      if (backgroundTheme != null) {
-        final background = _VectorTileLayer(
-            Key(
-                "${backgroundTheme.id}_v${theme.version}_background_VectorTileLayer"),
-            _LayerOptions(backgroundTheme,
-                caches: _caches,
-                showTileDebugInfo: options.showTileDebugInfo,
-                paintBackground: true,
-                maxSubstitutionDifference: 0,
-                paintNoDataTiles: true,
-                tileOffset: widget.options.tileOffset,
-                tileZoomSubstitutionOffset: 4,
-                mapZoom: _zoom,
-                rotation: _rotation),
-            widget.mapCamera,
-            _mapChanged.stream,
-            _tileSupplier);
-        layers.insert(0, background);
-      }
+          _tileSupplier);
+      layers.add(background);
     }
+    layers.add(_VectorTileLayer(
+        Key("${theme.id}_v${theme.version}_VectorTileLayer"),
+        _LayerOptions(theme,
+            caches: _caches,
+            symbolTheme: symbolTheme,
+            sprites: options.sprites,
+            showTileDebugInfo: options.showTileDebugInfo,
+            paintBackground: backgroundTheme == null,
+            maxSubstitutionDifference:
+                options.maximumTileSubstitutionDifference,
+            paintNoDataTiles: false,
+            tileOffset: widget.options.tileOffset,
+            tileZoomSubstitutionOffset: 0,
+            mapZoom: _zoom,
+            rotation: _rotation),
+        widget.mapCamera,
+        _mapChanged.stream,
+        _tileSupplier));
     return MobileLayerTransformer(child: Stack(children: layers));
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: vector_map_tiles
 description: A plugin for `flutter_map` that enables the use of vector tiles.
-version: 7.0.0
+version: 7.0.1
 homepage: https://github.com/greensopinion/flutter-vector-map-tiles
 
 environment: