Fixes for polar projection

fleaflet · Jun 30, 2022 · 9f1f77a · 9f1f77a
1 parent bee620c
commit 9f1f77a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 32 deletions.
diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/map/map.dart';
@@ -66,18 +68,12 @@ class CircleLayer extends StatelessWidget {
       builder: (BuildContext context, _) {
         final circleWidgets = <Widget>[];
         for (final circle in circleOpts.circles) {
-          var pos = map.project(circle.point);
-          pos = pos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
-              map.getPixelOrigin();
-          circle.offset = Offset(pos.x.toDouble(), pos.y.toDouble());
+          circle.offset = map.getOffset(circle.point);
 
           if (circle.useRadiusInMeter) {
             final r = const Distance().offset(circle.point, circle.radius, 180);
-            var rpos = map.project(r);
-            rpos = rpos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
-                map.getPixelOrigin();
-
-            circle.realRadius = rpos.y - pos.y;
+            final delta = circle.offset - map.getOffset(r);
+            circle.realRadius = delta.distance;
           }
 
           circleWidgets.add(

diff --git a/lib/src/layer/overlay_image_layer.dart b/lib/src/layer/overlay_image_layer.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/map/map.dart';
+import 'package:flutter_map/src/core/bounds.dart';
 
 class OverlayImageLayerOptions extends LayerOptions {
   final List<OverlayImage> overlayImages;
@@ -67,20 +68,17 @@ class OverlayImageLayer extends StatelessWidget {
   }
 
   Positioned _positionedForOverlay(OverlayImage overlayImage) {
-    final zoomScale =
-        map.getZoomScale(map.zoom, map.zoom); // TODO replace with 1?
-    final pixelOrigin = map.getPixelOrigin();
-    final upperLeftPixel =
-        map.project(overlayImage.bounds.northWest).multiplyBy(zoomScale) -
-            pixelOrigin;
-    final bottomRightPixel =
-        map.project(overlayImage.bounds.southEast).multiplyBy(zoomScale) -
-            pixelOrigin;
+    // northWest is not necessarily upperLeft depending on projection
+    final bounds = Bounds<num>(
+      map.project(overlayImage.bounds.northWest) - map.getPixelOrigin(),
+      map.project(overlayImage.bounds.southEast) - map.getPixelOrigin(),
+    );
+
     return Positioned(
-      left: upperLeftPixel.x.toDouble(),
-      top: upperLeftPixel.y.toDouble(),
-      width: (bottomRightPixel.x - upperLeftPixel.x).toDouble(),
-      height: (bottomRightPixel.y - upperLeftPixel.y).toDouble(),
+      left: bounds.topLeft.x.toDouble(),
+      top: bounds.topLeft.y.toDouble(),
+      width: bounds.size.x.toDouble(),
+      height: bounds.size.y.toDouble(),
       child: Image(
         image: overlayImage.imageProvider,
         fit: BoxFit.fill,

diff --git a/lib/src/layer/polygon_layer.dart b/lib/src/layer/polygon_layer.dart
@@ -144,12 +144,10 @@ class PolygonLayer extends StatelessWidget {
     for (var i = 0; i < len; ++i) {
       final point = points[i];
 
-      var pos = map.project(point);
-      pos = pos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
-          map.getPixelOrigin();
-      offsets.add(Offset(pos.x.toDouble(), pos.y.toDouble()));
+      final offset = map.getOffset(point);
+      offsets.add(offset);
       if (i > 0) {
-        offsets.add(Offset(pos.x.toDouble(), pos.y.toDouble()));
+        offsets.add(offset);
       }
     }
   }

diff --git a/lib/src/layer/polyline_layer.dart b/lib/src/layer/polyline_layer.dart
@@ -131,12 +131,10 @@ class PolylineLayer extends StatelessWidget {
     for (var i = 0; i < len; ++i) {
       final point = points[i];
 
-      var pos = map.project(point);
-      pos = pos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
-          map.getPixelOrigin();
-      offsets.add(Offset(pos.x.toDouble(), pos.y.toDouble()));
+      final offset = map.getOffset(point);
+      offsets.add(offset);
       if (i > 0) {
-        offsets.add(Offset(pos.x.toDouble(), pos.y.toDouble()));
+        offsets.add(offset);
       }
     }
   }

diff --git a/lib/src/map/map.dart b/lib/src/map/map.dart
@@ -567,6 +567,11 @@ class MapState {
     return _pixelOrigin;
   }
 
+  Offset getOffset(LatLng pos) {
+    final delta = project(pos) - getPixelOrigin();
+    return Offset(delta.x.toDouble(), delta.y.toDouble());
+  }
+
   CustomPoint getNewPixelOrigin(LatLng center, [double? zoom]) {
     final viewHalf = size / 2.0;
     return (project(center, zoom) - viewHalf).round();