Fix bounding box value on low zoom level

Author: DantSu

docs/classes/DantSu/OpenStreetMapStaticAPI/MapData.md

@@ -19,8 +19,6 @@ DantSu\OpenStreetMapStaticAPI\MapData convert latitude and longitude to image pi
 - *(static)* [latToYTile](#lattoytile) 
 - *(static)* [xTileToLng](#xtiletolng) 
 - *(static)* [yTileToLat](#ytiletolat) 
-- *(static)* [tilePxToLat](#tilepxtolat) 
-- *(static)* [tilePxToLng](#tilepxtolng) 
 - [__construct](#-__construct) 
 - [getLatLngTopLeft](#-getlatlngtopleft) 
 - [getLatLngTopRight](#-getlatlngtopright) 
@@ -101,7 +99,8 @@ Convert horizontal OpenStreetMap tile number ad zoom to longitude.
 
 | Parameter | Type | Description |
 |-----------|------|-------------|
-| `x` | **int** | Horizontal OpenStreetMap tile id |
+| `id` | **int** | Horizontal OpenStreetMap tile id |
+| `position` | **int** | Horizontal pixel position on tile |
 | `zoom` | **int** | Zoom |
 
 
@@ -127,7 +126,8 @@ Convert vertical OpenStreetMap tile number and zoom to latitude.
 
 | Parameter | Type | Description |
 |-----------|------|-------------|
-| `y` | **int** | Vertical OpenStreetMap tile id |
+| `id` | **int** | Vertical OpenStreetMap tile id |
+| `position` | **int** | Vertical pixel position on tile |
 | `zoom` | **int** | Zoom |
 
 
@@ -137,60 +137,6 @@ Convert vertical OpenStreetMap tile number and zoom to latitude.
 
 
 
----
-### ::tilePxToLat
-
-Convert pixel position from top of the tile to latitude.
-
-
-
-* This method is **static**.
-
-
-
-
-#### Parameters:
-
-| Parameter | Type | Description |
-|-----------|------|-------------|
-| `pxPosition` | **float** | y pixel position from top of the tile |
-| `tile` | **int** | Y tile id |
-| `zoom` | **int** | Zoom |
-
-
-#### Return Value:
-
- **float** : latitude
-
-
-
----
-### ::tilePxToLng
-
-Convert pixel position from left of the tile to longitude.
-
-
-
-* This method is **static**.
-
-
-
-
-#### Parameters:
-
-| Parameter | Type | Description |
-|-----------|------|-------------|
-| `pxPosition` | **float** | x pixel position from left of the tile |
-| `tile` | **int** | X tile id |
-| `zoom` | **int** | Zoom |
-
-
-#### Return Value:
-
- **float** : longitude
-
-
-
 ---
 ### ->__construct
 

src/MapData.php

@@ -26,7 +26,7 @@ public static function lngToXTile(float $lon, int $zoom): array
         $tile = \floor($x);
         return [
             'id' => $tile,
-            'position' => 256 * ($x - $tile)
+            'position' => \round(256 * ($x - $tile))
         ];
     }
 
@@ -42,30 +42,32 @@ public static function latToYTile(float $lat, int $zoom): array
         $tile = \floor($y);
         return [
             'id' => $tile,
-            'position' => 256 * ($y - $tile)
+            'position' => \round(256 * ($y - $tile))
         ];
     }
 
     /**
      * Convert horizontal OpenStreetMap tile number ad zoom to longitude.
-     * @param int $x Horizontal OpenStreetMap tile id
+     * @param int $id Horizontal OpenStreetMap tile id
+     * @param int $position Horizontal pixel position on tile
      * @param int $zoom Zoom
      * @return float Longitude of the given OpenStreetMap tile id and zoom
      */
-    public static function xTileToLng(int $x, int $zoom): float
+    public static function xTileToLng(int $id, int $position, int $zoom): float
     {
-        return $x / \pow(2, $zoom) * 360 - 180;
+        return ($id + $position / 256) / \pow(2, $zoom) * 360 - 180;
     }
 
     /**
      * Convert vertical OpenStreetMap tile number and zoom to latitude.
-     * @param int $y Vertical OpenStreetMap tile id
+     * @param int $id Vertical OpenStreetMap tile id
+     * @param int $position Vertical pixel position on tile
      * @param int $zoom Zoom
      * @return float Latitude of the given OpenStreetMap tile id and zoom
      */
-    public static function yTileToLat(int $y, int $zoom): float
+    public static function yTileToLat(int $id, int $position, int $zoom): float
     {
-        return \rad2deg(\atan(\sinh(M_PI * (1 - 2 * $y / \pow(2, $zoom)))));
+        return \rad2deg(\atan(\sinh(M_PI * (1 - 2 * ($id + $position / 256) / \pow(2, $zoom)))));
     }
 
 
@@ -76,11 +78,11 @@ public static function yTileToLat(int $y, int $zoom): float
      * @param int $zoom Zoom
      * @return float latitude
      */
-    public static function tilePxToLat(float $pxPosition, int $tile, int $zoom): float
+    /*public static function tilePxToLat(float $pxPosition, int $tile, int $zoom): float
     {
         $tileLat = static::yTileToLat($tile, $zoom);
         return $tileLat - \abs(($tileLat - static::yTileToLat($tile + 1, $zoom)) * $pxPosition / 256);
-    }
+    }*/
 
     /**
      * Convert pixel position from left of the tile to longitude.
@@ -89,11 +91,11 @@ public static function tilePxToLat(float $pxPosition, int $tile, int $zoom): flo
      * @param int $zoom Zoom
      * @return float longitude
      */
-    public static function tilePxToLng(float $pxPosition, int $tile, int $zoom): float
+    /*public static function tilePxToLng(float $pxPosition, int $tile, int $zoom): float
     {
         $tileLng = static::xTileToLng($tile, $zoom);
         return $tileLng + \abs(($tileLng - static::xTileToLng($tile + 1, $zoom)) * $pxPosition / 256);
-    }
+    }*/
 
     /**
      * @var int zoom
@@ -169,20 +171,20 @@ public function __construct(LatLng $centerMap, int $zoom, XY $outputSize)
         );
 
         $this->latLngTopLeft = new LatLng(
-            static::tilePxToLat($this->mapCropTopLeft->getY(), $this->tileTopLeft->getY(), $zoom),
-            static::tilePxToLng($this->mapCropTopLeft->getX(), $this->tileTopLeft->getX(), $zoom)
+            static::yTileToLat($this->tileTopLeft->getY(), $this->mapCropTopLeft->getY(), $zoom),
+            static::xTileToLng($this->tileTopLeft->getX(), $this->mapCropTopLeft->getX(), $zoom)
         );
         $this->latLngTopRight = new LatLng(
-            static::tilePxToLat($this->mapCropTopLeft->getY(), $this->tileTopLeft->getY(), $zoom),
-            static::tilePxToLng(256 - $this->mapCropBottomRight->getX(), $this->tileBottomRight->getX(), $zoom)
+            static::yTileToLat($this->tileTopLeft->getY(), $this->mapCropTopLeft->getY(), $zoom),
+            static::xTileToLng($this->tileBottomRight->getX(), 256 - $this->mapCropBottomRight->getX(), $zoom)
         );
         $this->latLngBottomLeft = new LatLng(
-            static::tilePxToLat(256 - $this->mapCropBottomRight->getY(), $this->tileBottomRight->getY(), $zoom),
-            static::tilePxToLng($this->mapCropTopLeft->getX(), $this->tileTopLeft->getX(), $zoom)
+            static::yTileToLat($this->tileBottomRight->getY(), 256 - $this->mapCropBottomRight->getY(), $zoom),
+            static::xTileToLng($this->tileTopLeft->getX(), $this->mapCropTopLeft->getX(), $zoom)
         );
         $this->latLngBottomRight = new LatLng(
-            static::tilePxToLat(256 - $this->mapCropBottomRight->getY(), $this->tileBottomRight->getY(), $zoom),
-            static::tilePxToLng(256 - $this->mapCropBottomRight->getX(), $this->tileBottomRight->getX(), $zoom)
+            static::yTileToLat($this->tileBottomRight->getY(), 256 - $this->mapCropBottomRight->getY(), $zoom),
+            static::xTileToLng($this->tileBottomRight->getX(), 256 - $this->mapCropBottomRight->getX(), $zoom)
         );
     }
 

src/samples/sample2.php

@@ -14,7 +14,7 @@
 use \DantSu\OpenStreetMapStaticAPI\Markers;
 
 \header('Content-type: image/png');
-(new OpenStreetMap(new LatLng(44.351933, 2.568113), 7, 4096, 4096))
+(new OpenStreetMap(new LatLng(44.351933, 2.568113), 5, 1024, 1024))
     ->addMarkers(
         (new Markers(__DIR__ . '/resources/marker.png'))
             ->setAnchor(Markers::ANCHOR_CENTER, Markers::ANCHOR_BOTTOM)