@@ -49,11 +49,11 @@ class Google_Maps_Coordinate extends Google_Maps_Location { return new Google_Maps_Point($x, $y); } - public function getLat($format='%01.2f') { + public function getLat($format='%01.8f') { return sprintf($format, $this->lat); } - public function getLon($format='%01.2f') { + public function getLon($format='%01.8f') { return sprintf($format, $this->lon); } Google/Maps/Coordinate.php @@ -25,6 +25,8 @@ class Google_Maps_Marker extends Google_Maps_Location { protected $character; protected $infowindow; + protected $format = '%01.8f,%01.8f,%s%s%s'; + protected $visible = false; protected $id; static private $counter = 1; @@ -109,7 +111,8 @@ class Google_Maps_Marker extends Google_Maps_Location { } public function __toString() { - $retval = $this->getLat() . ',' . $this->getLon() . ','. $this->getSize() . $this->getColor() . $this->getCharacter(); + $retval = sprintf($this->getFormat(), $this->getLat(), $this->getLon(), + $this->getSize(), $this->getColor(), $this->getCharacter()); return preg_replace('/,$/', '', $retval); } Google/Maps/Marker.php @@ -114,7 +114,8 @@ class Google_Maps_Marker_Cluster extends Google_Maps_Marker { } public function __toString() { - $retval = $this->getLat() . ',' . $this->getLon() . ','. $this->getSize() . $this->getColor() . $this->getCharacter(); + $retval = sprintf($this->getFormat(), $this->getLat(), $this->getLon(), + $this->getSize(), $this->getColor(), $this->getCharacter()); return preg_replace('/,$/', '', $retval); } Google/Maps/Marker/Cluster.php @@ -35,9 +35,20 @@ class Google_Maps_Static extends Google_Maps_Overload { protected $controls = array(); protected $min_zoom = 1; protected $max_zoom = 21; + protected $clusterer = false; protected $url_max_length = 2046; /* TODO: implement URL length protection. */ - + protected $marker_formats = array('%01.2f,%01.2f,%s%s%s', '%01.2f,%01.2f,%s%s%s', + '%01.3f,%01.3f,%s%s%s', '%01.3f,%01.3f,%s%s%s', + '%01.4f,%01.4f,%s%s%s', '%01.4f,%01.4f,%s%s%s', + '%01.5f,%01.5f,%s%s%s', '%01.5f,%01.5f,%s%s%s', + '%01.6f,%01.6f,%s%s%s', '%01.6f,%01.6f,%s%s%s', + '%01.7f,%01.7f,%s%s%s', '%01.7f,%01.7f,%s%s%s', + '%01.8f,%01.8f,%s%s%s', '%01.8f,%01.8f,%s%s%s', + '%01.8f,%01.8f,%s%s%s', '%01.8f,%01.8f,%s%s%s', + '%01.8f,%01.8f,%s%s%s', '%01.8f,%01.8f,%s%s%s', + '%01.8f,%01.8f,%s%s%s', '%01.8f,%01.8f,%s%s%s', + '%01.8f,%01.8f,%s%s%s'); /** * Class constructor. @@ -239,9 +250,12 @@ class Google_Maps_Static extends Google_Maps_Overload { $markers = $this->markers; } if ('string' == $type) { + $format = $this->marker_formats[$this->getZoom() - 1]; $retval = ''; if (is_array($markers)) { foreach ($markers as $marker) { + $marker->setFormat($format); + print $marker; $retval .= $marker; $retval .= '|'; } @@ -295,9 +309,12 @@ class Google_Maps_Static extends Google_Maps_Overload { $markers = $this->getClusterer()->process($markers, $this); if ('string' == $type) { + $format = $this->marker_formats[$this->getZoom() - 1]; $retval = ''; if (is_array($markers)) { foreach ($markers as $marker) { + $marker->setFormat($format); + print $marker; $retval .= $marker; $retval .= '|'; } Google/Maps/Static.php ffc96941466b4fa6a9ef4d535c336bdc22e0cb53 Mika Tuupola tuupola@appelsiini.net http://github.com/tuupola/php_google_maps/commit/c585213e67d4ce8970186298efaaa7860dd605e6 c585213e67d4ce8970186298efaaa7860dd605e6 2008-11-08T14:32:35-08:00 2008-11-08T14:32:35-08:00 Automatically shorten lat,lon decimals depending on zoom level. First working version. Using array here might not be the most elegant choise. This way it stays user configurable. acc19d07cf9a85db2fff1e1c93009dbb225c1b61 Mika Tuupola tuupola@appelsiini.net