Merge remote-tracking branch 'upstream/master' into move_gesture

Author: ReinisSprogis

example/lib/pages/tile_builder.dart

@@ -32,23 +32,27 @@ class TileBuilderPageState extends State<TileBuilderPage> {
         children: [
           tileWidget,
           if (showLoadingTime || showCoordinates)
-            Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                if (showCoordinates)
-                  Text(
-                    '${coords.x} : ${coords.y} : ${coords.z}',
-                    style: Theme.of(context).textTheme.headlineSmall,
-                  ),
-                if (showLoadingTime)
-                  Text(
-                    tile.loadFinishedAt == null
-                        ? 'Loading'
-                        // sometimes result is negative which shouldn't happen, abs() corrects it
-                        : '${(tile.loadFinishedAt!.millisecond - tile.loadStarted!.millisecond).abs()} ms',
-                    style: Theme.of(context).textTheme.headlineSmall,
-                  ),
-              ],
+            FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.center,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  if (showCoordinates)
+                    Text(
+                      '${coords.x} : ${coords.y} : ${coords.z}',
+                      style: Theme.of(context).textTheme.headlineSmall,
+                    ),
+                  if (showLoadingTime)
+                    Text(
+                      tile.loadFinishedAt == null
+                          ? 'Loading'
+                          // sometimes result is negative which shouldn't happen, abs() corrects it
+                          : '${(tile.loadFinishedAt!.millisecond - tile.loadStarted!.millisecond).abs()} ms',
+                      style: Theme.of(context).textTheme.headlineSmall,
+                    ),
+                ],
+              ),
             ),
         ],
       ),

lib/src/layer/tile_layer/tile_coordinates.dart

@@ -77,10 +77,11 @@ class TileCoordinatesResolver {
     if (!replicatesWorldLongitude) {
       return positionCoordinates;
     }
-    if (positionCoordinates.z < 0) {
+    final z = positionCoordinates.z + zoomOffset;
+    if (z < 0) {
       return positionCoordinates;
     }
-    final modulo = 1 << (positionCoordinates.z + zoomOffset);
+    final modulo = 1 << z;
     int x = positionCoordinates.x;
     while (x < 0) {
       x += modulo;