move getCenter method

Author: DantSu

docs/classes/DantSu/OpenStreetMapStaticAPI/MapData.md

@@ -19,7 +19,6 @@ DantSu\OpenStreetMapStaticAPI\MapData convert latitude and longitude to image pi
 - *(static)* [latToYTile](#lattoytile) 
 - *(static)* [xTileToLng](#xtiletolng) 
 - *(static)* [yTileToLat](#ytiletolat) 
-- *(static)* [getCenter](#getcenter) 
 - *(static)* [getBoundingBoxFromPoints](#getboundingboxfrompoints) 
 - *(static)* [getCenterAndZoomFromBoundingBox](#getcenterandzoomfromboundingbox) 
 - [__construct](#-__construct) 
@@ -145,32 +144,6 @@ Convert vertical OpenStreetMap tile number and zoom to latitude.
 
 
 
----
-### ::getCenter
-
-Get center between two coordinates.
-
-
-
-* This method is **static**.
-
-
-
-
-#### Parameters:
-
-| Parameter | Type | Description |
-|-----------|------|-------------|
-| `point1` | **\DantSu\OpenStreetMapStaticAPI\LatLng** | Vertical OpenStreetMap tile id |
-| `point2` | **\DantSu\OpenStreetMapStaticAPI\LatLng** | Vertical pixel position on tile |
-
-
-#### Return Value:
-
- **\DantSu\OpenStreetMapStaticAPI\LatLng** : midpoint between the given coordinates
-
-
-
 ---
 ### ::getBoundingBoxFromPoints
 

docs/classes/DantSu/OpenStreetMapStaticAPI/Utils/GeographicConverter.md

@@ -14,6 +14,7 @@
 - *(static)* [earthRadiusAtLatitude](#earthradiusatlatitude) 
 - *(static)* [metersToLatLng](#meterstolatlng) 
 - *(static)* [latLngToMeters](#latlngtometers) 
+- *(static)* [getCenter](#getcenter) 
 
 ### ::earthRadiusAtLatitude
 
@@ -93,6 +94,32 @@ Get distance in meters between two points.
 
 
 
+---
+### ::getCenter
+
+Get center between two coordinates.
+
+
+
+* This method is **static**.
+
+
+
+
+#### Parameters:
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `point1` | **\DantSu\OpenStreetMapStaticAPI\LatLng** | Vertical OpenStreetMap tile id |
+| `point2` | **\DantSu\OpenStreetMapStaticAPI\LatLng** | Vertical pixel position on tile |
+
+
+#### Return Value:
+
+ **\DantSu\OpenStreetMapStaticAPI\LatLng** : midpoint between the given coordinates
+
+
+
 ---
 
 

src/MapData.php

@@ -3,6 +3,8 @@
 namespace DantSu\OpenStreetMapStaticAPI;
 
 
+use DantSu\OpenStreetMapStaticAPI\Utils\GeographicConverter;
+
 /**
  * DantSu\OpenStreetMapStaticAPI\MapData convert latitude and longitude to image pixel position.
  *
@@ -73,27 +75,6 @@ public static function yTileToLat(int $id, int $position, int $zoom, int $tileSi
         return \rad2deg(\atan(\sinh(M_PI * (1 - 2 * ($id + $position / $tileSize) / \pow(2, $zoom)))));
     }
 
-    /**
-     * Get center between two coordinates.
-     * @param LatLng $point1 Vertical OpenStreetMap tile id
-     * @param LatLng $point2 Vertical pixel position on tile
-     * @return LatLng midpoint between the given coordinates
-     */
-    public static function getCenter(LatLng $point1, LatLng $point2): LatLng
-    {
-        //return new LatLng(($point1->getLat() + $point2->getLat()) / 2, ($point1->getLng() + $point2->getLng()) / 2);
-        $dLng = \deg2rad($point2->getLng() - $point1->getLng());
-        $lat1 = \deg2rad($point1->getLat());
-        $lat2 = \deg2rad($point2->getLat());
-        $lng1 = \deg2rad($point1->getLng());
-        $bx = \cos($lat2) * \cos($dLng);
-        $by = \cos($lat2) * \sin($dLng);
-        return new LatLng(
-            \rad2deg(\atan2(\sin($lat1) + \sin($lat2), \sqrt(\pow(\cos($lat1) + $bx, 2) + \pow($by, 2)))),
-            \rad2deg($lng1 + \atan2($by, \cos($lat1) + $bx))
-        );
-    }
-
     /**
      * Transform array of LatLng to bounding box
      *
@@ -146,7 +127,7 @@ public static function getCenterAndZoomFromBoundingBox(LatLng $topLeft, LatLng $
         $pxZoneHeight = ($bottomTilePos['id'] - $topTilePos['id']) * $tileSize + $bottomTilePos['position'] - $topTilePos['position'];
 
         return [
-            'center' => MapData::getCenter($topLeft, $bottomRight),
+            'center' => GeographicConverter::getCenter($topLeft, $bottomRight),
             'zoom' => \intval(
                 \floor(
                     \log(

src/Utils/GeographicConverter.php

@@ -77,4 +77,25 @@ public static function latLngToMeters(LatLng $from, LatLng $end): float
         return \abs($earthRadius * 2 * \atan2(\sqrt($a), \sqrt(1 - $a)));
     }
 
+
+    /**
+     * Get center between two coordinates.
+     * @param LatLng $point1 Vertical OpenStreetMap tile id
+     * @param LatLng $point2 Vertical pixel position on tile
+     * @return LatLng midpoint between the given coordinates
+     */
+    public static function getCenter(LatLng $point1, LatLng $point2): LatLng
+    {
+        //return new LatLng(($point1->getLat() + $point2->getLat()) / 2, ($point1->getLng() + $point2->getLng()) / 2);
+        $dLng = \deg2rad($point2->getLng() - $point1->getLng());
+        $lat1 = \deg2rad($point1->getLat());
+        $lat2 = \deg2rad($point2->getLat());
+        $lng1 = \deg2rad($point1->getLng());
+        $bx = \cos($lat2) * \cos($dLng);
+        $by = \cos($lat2) * \sin($dLng);
+        return new LatLng(
+            \rad2deg(\atan2(\sin($lat1) + \sin($lat2), \sqrt(\pow(\cos($lat1) + $bx, 2) + \pow($by, 2)))),
+            \rad2deg($lng1 + \atan2($by, \cos($lat1) + $bx))
+        );
+    }
 }

src/samples/sample2.php

@@ -84,7 +84,6 @@
             ->addPoint(new LatLng(44.351933, 2.568113))
             ->addPoint(new LatLng(57.704334, 11.963886))
     )
-    ->fitToDraws(10)
     ->getImage()
     ->displayPNG();