Changeset 17896

Timestamp:

05/03/09 17:55:52 (4 years ago)

Author:

fabriceb

Message:

[sfEasyGMapPlugin]
* Corrected the Mercator projections for the GMapCoord::fromPixToLat and GMapCoord::fromLatToPix functions
* Used PHP pi() and deg2rad functions for better precision
* Created tests for the Mercator projections
* Added the GMapBounds::getBoundsContainingMarkers($markers) function
* Added the GMap::centerAndZoomOnMarkers() function which enables to guess zoom and center of the map to fit the markers. Center is easy to guess. Zoom uses width and height of smallest bound, pixel width and height of the map and Mercator projection

Files:

• plugins/sfEasyGMapPlugin/trunk/lib/GMap.class.php (modified) (5 diffs)
• plugins/sfEasyGMapPlugin/trunk/lib/GMapBounds.class.php (modified) (2 diffs)
• plugins/sfEasyGMapPlugin/trunk/lib/GMapCoord.class.php (modified) (5 diffs)
• plugins/sfEasyGMapPlugin/trunk/lib/GMapMarker.class.php (modified) (6 diffs)
• plugins/sfEasyGMapPlugin/trunk/package.xml (modified) (4 diffs)
• plugins/sfEasyGMapPlugin/trunk/test/unit/GMapBoundsTest.php (modified) (2 diffs)
• plugins/sfEasyGMapPlugin/trunk/test/unit/GMapCoordTest.php (modified) (2 diffs)
• plugins/sfEasyGMapPlugin/trunk/test/unit/GMapTest.php (added)

plugins/sfEasyGMapPlugin/trunk/lib/GMap.class.php

@@ -38 +38 @@
-  // options
-  protected $options = array();
+  
+  protected $zoom = null;
+  protected $center_coord = null;
-
-  /**
@@ -111 +114 @@
-  {
-    $api_keys = sfConfig::get('app_google_maps_api_keys');
+    if (is_null($api_keys))
+    {
+      return '';
+    }
+    
-    if (is_array($api_keys) && array_key_exists($domain,$api_keys))
-    {
@@ -459 +467 @@
-  public function setCenter($lat=null,$lng=null)
-  {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public function getCenterLat()
-  {
-
-
-
+
+
+
+
+
+
+
+
-  public function getCenterLng()
-  {
-center_lng
+getCenterCoord()->getLongitude()
-  }
-  public function getZoom()
@@ -482 +507 @@
-    return $this->zoom;
-  }
+  
+  /**
+   * gets the width of the map in pixels according to container style
+   * @return integer
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public function getWidth()
+  {
+  
+    return intval(substr($this->getContainerStyle('width'),0,-2));
+  }
+  
+  /**
+   * gets the width of the map in pixels according to container style
+   * @return integer
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public function getHeight()
+  {
+  
+    return intval(substr($this->getContainerStyle('height'),0,-2));
+  }
+  
+  /**
+   * sets the width of the map in pixels
+   * 
+   * @param integer
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public function setWidth($width)
+  {
+    $this->setContainerStyle('width',$width.'px');
+  }
+  
+  /**
+   * sets the width of the map in pixels
+   * 
+   * @param integer
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public function setHeight($height)
+  {
+    $this->setContainerStyle('height',$height.'px');
+  }
+  
-
-  /**
@@ -526 +600 @@
-    return implode('|',$markers_code);
-  }
+  
+  /**
+   * 
+   * calculates the center of the markers linked to the map
+   * 
+   * @return GMapCoord
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function getMarkersCenterCoord()
+  {
+    
+    return GMapMarker::getCenterCoord($this->markers);
+  }
+  
+  /**
+   * sets the center of the map at the center of the markers
+   * 
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function centerOnMarkers()
+  {
+    $center = $this->getMarkersCenterCoord();
+  
+    $this->setCenter($center->getLatitude(), $center->getLongitude());
+  }
+  
+  /**
+   * 
+   * calculates the zoom which fits the markers on the map
+   * 
+   * @param integer $margin a scaling factor around the smallest bound
+   * @return integer $zoom
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function getMarkersFittingZoom($margin = 0)
+  {
+    $bounds = GMapBounds::getBoundsContainingMarkers($this->markers, $margin);
+    
+    return $bounds->getZoom(min($this->getWidth(),$this->getHeight()));
+  }
+  
+  /**
+   * sets the zoom of the map to fit the markers (uses mercator projection to guess the size in pixels of the bounds)
+   * WARNING : this depends on the width in pixels of the resulting map
+   * 
+   * @param integer $margin a scaling factor around the smallest bound
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function zoomOnMarkers($margin = 0)
+  {
+    $this->setZoom($this->getMarkersFittingZoom($margin));
+  }
+
+   /**
+   * sets the zoom and center of the map to fit the markers (uses mercator projection to guess the size in pixels of the bounds)
+   * 
+   * @param integer $margin a scaling factor around the smallest bound
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function centerAndZoomOnMarkers($margin = 0)
+  {
+    $this->zoomOnMarkers($margin);
+    $this->centerOnMarkers();
+  }
-
-}

plugins/sfEasyGMapPlugin/trunk/lib/GMapBounds.class.php

@@ -223 +223 @@
-  
-  /**
-ax(width,height) = $max
-
-ax
+in(width,height) = $min
+
+in
-   * @return integer
-   * @author fabriceb
-   * @since Feb 18, 2009 fabriceb
-   */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    $pix_h = abs($sw_lat_pix-$ne_lat_pix);
-ax
-
-1
-1
+in
+
+0
+0
-    $pix_w = abs($sw_lng_pix-$ne_lng_pix);
-ax
-
-ax 
-
-+1
+in
+
+in
+
+
-  }
-  
@@ -317 +324 @@
-    return $bounds;
-  }
+  
+  
+  /**
+  *
+  * @param GMapMarker[] $markers array of MArkers
+  * @param float $margin margin factor for the bounds
+  * @return GMapBounds
+  * @author fabriceb
+  * @since 2009-05-02
+  *
+  **/
+  public static function getBoundsContainingMarkers($markers, $margin = 0)
+  {
+    $coords = array();
+    foreach($markers as $marker)
+    {
+      array_push($coords, $marker->getGMapCoord());
+    }
+   
+    return GMapBounds::getBoundsContainingCoords($coords, $margin);
+  }
-
-  

plugins/sfEasyGMapPlugin/trunk/lib/GMapCoord.class.php

@@ -22 +22 @@
-  protected $longitude;
-  
+  const EARTH_RADIUS = 6380;
+  
-  public function __construct($latitude = null, $longitude = null)
-  {
@@ -72 +74 @@
-  public static function fromLngToPix($lng,$zoom)
-  {
-$lng / 180 * 3.14159
+deg2rad($lng)
-    $mercx = $lngrad;
-3.14159
-3.14159
+pi()
+pi()
-    $pixelx_zoom =  $pixelx * pow(2,$zoom);    
-    
@@ -93 +95 @@
-  public static function fromLatToPix($lat,$zoom)
-  {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $pixely_zoom = $pixely * pow(2,$zoom);
-    
@@ -115 +130 @@
-  {
-    $pixelx = $pixelx_zoom / pow(2,$zoom);    
-3.14159
-3.14159
+pi()
+pi()
-    $lngrad = $mercx;
-180 * $lngrad / 3.14159
+rad2deg($lngrad)
-    
-    return $lng;
@@ -134 +149 @@
-   */
-  public static function fromPixToLat($pixely_zoom,$zoom)
-
+    
-    $pixely = $pixely_zoom / pow(2,$zoom);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-    return $lat;
-  }
+  
+  /**
+   * Calculates the center of an array of coordiantes
+   * 
+   * @param GMapCoord[] $coords
+   * @return GMapCoord
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public static function getCenterCoord($coords)  
+  {
+    if (count($coords)==0)
+    {
+      
+      return null;
+    }
+    $center_lat = 0;
+    $center_lng = 0;
+    foreach($coords as $coord)
+    {
+      /* @var $coord GMapCoord */
+      $center_lat += $coord->getLatitude();
+      $center_lng += $coord->getLongitude();
+    }
+  
+    return new GMapCoord($center_lat/count($coords),$center_lng/count($coords));
+  }
+  
+  /**
+   * toString method
+   * @return string
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function __toString()
+  {
+    
+    return $this->getLatitude().', '.$this->getLongitude();
+  }
+  
+  /**
+   * very approximate calculation of the distance in kilometers between two coordinates
+   * @param GMapCoord $coord2
+   * @return float
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public function distanceFrom($coord2)
+  {
+    $lat_dist = abs($this->getLatitude()-$coord2->getLatitude());
+    $lng_dist = abs($this->getLongitude()-$coord2->getLongitude());
+    
+    $rad_dist = deg2rad(sqrt(pow($lat_dist,2)+pow($lng_dist,2)));
+  
+    return $rad_dist * self::EARTH_RADIUS;
+  }
+  
+    /**
+   * very approximate calculation of the distance in kilometers between two coordinates
+   * @param GMapCoord $coord1
+   * @param GMapCoord $coord2
+   * @return float
+   * @author fabriceb
+   * @since 2009-05-03
+   */
+  public static function distance($coord1, $coord2)
+  {
+  
+    return $coord1->distanceFrom($coord2);
+  }
-}

plugins/sfEasyGMapPlugin/trunk/lib/GMapMarker.class.php

@@ -9 +9 @@
-class GMapMarker
-{
+   /**
+   * javascript name of the marker
+   *
+   * @var string
+   */
-  private $js_name        = null;
+  /**
+   * Latitude - deprecated
+   *
+   * @var float
+   */
-  private $lat            = null;
+  /**
+   * Longitude - deprecated
+   *
+   * @var float
+   */
-  private $lng            = null;
+  /**
+   * Coordinates
+   *
+   * @var GMapCoord
+   */
+  private $coord          = null;
-  private $icon           = null;
-  private $events         = array();
@@ -27 +48 @@
-  {
-    $this->js_name = $js_name;
-
-
+
-    $this->icon    = $icon;
-    $this->events  = $events;    
@@ -65 +85 @@
-    return $this->icon;
-  }
+  
+  /**
+   * returns the coordinates object of the marker
+   * 
+   * @return GMapCoord
+   * @author fabriceb
+   * @since 2009-05-02
+   */
+  public function getGMapCoord()
+  {
+  
+    return $this->coord;
+  }
+  
-  /**
-  * @return float $lat Javascript latitude  
@@ -71 +105 @@
-  {
-    
-lat
+getGMapCoord()->getLatitude()
-  }
-  /**
@@ -79 +113 @@
-  {
-    
-lng
+getGMapCoord()->getLongitude()
-  }
-  
@@ -175 +209 @@
-    $this->custom_properties[$name] = $value;
-  }
+  
+  /**
+  *
+  * @param GMapMarker[] $markers array of MArkers
+  * @return GMapCoord
+  * @author fabriceb
+  * @since 2009-05-02
+  *
+  **/
+  public static function getCenterCoord($markers)
+  {
+    $coords = array();
+    foreach($markers as $marker)
+    {
+      array_push($coords, $marker->getGMapCoord());
+    }
+   
+    return GMapCoord::getCenterCoord($coords);
+  }
-  
-}

plugins/sfEasyGMapPlugin/trunk/package.xml

@@ -23 +23 @@
-  <active>yes</active>  
- </developer>
-3-1
-6:0
+5-0
+7:5
- <version>
-0
-0
+2
+2
- </version>
- <stability>
@@ -108 +108 @@
-    <channel>pear.symfony-project.com</channel>
-    <min>1.0.0</min>
-
+
+
-   </package>
-  </required>
@@ -134 +135 @@
-   </version>
-   <stability>
-beta
-beta
+stable
+stable
-   </stability>
-   <license uri="http://www.symfony-project.org/license">MIT license</license>
@@ -145 +146 @@
-* added some very interesting functions concerning coordinates : you can now transform lat/lng into Google Map' pixels coordinates system and vice-versa. This enables one to calculate the bounds around a coordinate for example, knowing only the Google Map's height/width in pixels    
-   </notes>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- </changelog>
-</package>

plugins/sfEasyGMapPlugin/trunk/test/unit/GMapBoundsTest.php

@@ -25 +25 @@
-$bounds = new GMapBounds(new GMapCoord($sw_lat,$sw_lng),new GMapCoord($ne_lat,$ne_lng));
-
-0
+3
-
-$t->diag('GMapBounds test');
-
-$t->diag('->__toString Test');
-
-
-
-
+
-
-$t->diag('->getZoom Test');
-
+
+
+
+
+
+
+
+
+
-
-$t->diag('->createFromString Test');
-91008609205045, -4.833984375), (51.37178037591737, 8.3496093
+2606244456202, -4.921875), (51.31688050404585, 8.261718
-$t->is($bounds_france->getZoom(300),5,'Pour voir la France sur une largeur/hauteur de 300 pix, il faut un zoom 5');
-
@@ -66 +71 @@
-$t->is($bounds_123->__toString(),'((48.7887996681, 2.23631017383), (48.9243326339, 2.44230382617))', 'The minimal bounds containing the coords is the rectangle containing the three coords');
-
+
+$t->diag('->getBoundsContainingMarkers Test');
+$marker_1 = new GMapMarker(48.7887996681, 2.23631017383);
+$marker_2 = new GMapMarker(48.9243326339, 2.44230382617);
+$marker_3 = new GMapMarker(48.8, 2.4);
+$bounds_12 = GMapBounds::getBoundsContainingMarkers(array($marker_1,$marker_2));
+$bounds_123 = GMapBounds::getBoundsContainingMarkers(array($marker_1,$marker_2,$marker_3));
+$t->is($bounds_12->__toString(),'((48.7887996681, 2.23631017383), (48.9243326339, 2.44230382617))', 'The minimal bounds containing the markers is the rectangle containing the two markers');
+$t->is($bounds_123->__toString(),'((48.7887996681, 2.23631017383), (48.9243326339, 2.44230382617))', 'The minimal bounds containing the markers is the rectangle containing the three markers');
+
-$t->diag('Fin du test');

plugins/sfEasyGMapPlugin/trunk/test/unit/GMapCoordTest.php

@@ -10 +10 @@
-
-
-4
+286
-
-$t->diag('GMapCoords Tests');
+
+for ($zoom=0; $zoom<15;$zoom += 3)
+{
+  for($lat=90; $lat>=-90; $lat-=10)
+  {
+    $t->is(GMapCoord::fromPixToLat(GMapCoord::fromLatToPix($lat, $zoom),$zoom),(float)$lat,'les projections mercator sur les latitudes marchent');
+  }
+  for($lng=-180; $lng<=180; $lng+=10)
+  {
+    $t->is(GMapCoord::fromPixToLng(GMapCoord::fromLngToPix($lng, $zoom),$zoom),(float)$lng,'les projections mercator sur les longitudes marchent');
+  }
+}
-
-$lat = 0;
-$lng =  0;
-$zoom = 0;
+
-$pix = GMapCoord::fromLatToPix($lat, $zoom);
-$t->is($pix,128,'Latitude 0 is at the middle of the map for zoom 0');
@@ -31 +44 @@
-$t->is($pix,0,'Longitude -180 is at the left of the map whathever the zoom');
-
+
+$coord_paris = new GMapCoord(48.857939,2.346611);
+$coord_le_mans = new GMapCoord(48.007381,0.202131);
+$t->is(round(GMapCoord::distance($coord_le_mans, $coord_paris)),257,'Approximate distance between Le Mans and Paris is 257');
+
+$coord_luxembourg = new GMapCoord(48.846559,2.340689);
+$coord_saint_michel = new GMapCoord(48.853717,2.344015);
+$t->is(round(GMapCoord::distance($coord_luxembourg, $coord_saint_michel)*1000),879,'Approximate distance between RER Luxembourg and Saint-Michel is 879 meters');