diff --git a/index.html b/index.html index c61052b..fccaee8 100644 --- a/index.html +++ b/index.html @@ -70,10 +70,10 @@

staticMapLite - simple map for your website

-

+

This image was created using the following simple <img> tag: -

<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=865x512&maptype=mapnik" />
+
<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=865x512&maptype=standard" />


@@ -83,7 +83,7 @@

- +

Add markers by appending them to the image URL:

markers=40.702147,-74.015794,lightblue1|40.711614,-74.012318,lightblue2|40.718217,-73.998284,lightblue3

@@ -96,12 +96,8 @@

- -
maptype=mapnik
-
-
- -
maptype=osmarenderer
+ +
maptype=standard
@@ -119,4 +115,4 @@

- \ No newline at end of file + diff --git a/staticmap.php b/staticmap.php index a9855e5..52e6b29 100644 --- a/staticmap.php +++ b/staticmap.php @@ -21,7 +21,7 @@ * * USAGE: * - * staticmap.php?center=40.714728,-73.998672&zoom=14&size=512x512&maptype=mapnik&markers=40.702147,-74.015794,blues|40.711614,-74.012318,greeng|40.718217,-73.998284,redc + * staticmap.php?center=40.714728,-73.998672&zoom=14&size=512x512&maptype=standrd&markers=40.702147,-74.015794,blues|40.711614,-74.012318,greeng|40.718217,-73.998284,redc * */ @@ -35,12 +35,18 @@ protected $maxHeight = 1024; protected $tileSize = 256; - protected $tileSrcUrl = array('mapnik' => 'http://tile.openstreetmap.org/{Z}/{X}/{Y}.png', - 'osmarenderer' => 'http://otile1.mqcdn.com/tiles/1.0.0/osm/{Z}/{X}/{Y}.png', + protected $tileSrcUrl = array( + 'standard' => 'http://tile.openstreetmap.org/{Z}/{X}/{Y}.png', 'cycle' => 'http://a.tile.opencyclemap.org/cycle/{Z}/{X}/{Y}.png', ); - protected $tileDefaultSrc = 'mapnik'; + // Deprecated map_type values still supported as aliases + protected $mapTypeAliases = array( + 'mapnik' => 'standard', + 'osmarender' => 'standard' + ); + + protected $tileDefaultSrc = 'standard'; protected $markerBaseDir = 'images/markers'; protected $osmLogo = 'images/osm_logo.png'; @@ -142,7 +148,9 @@ public function parseLiteParams() } if ($_GET['maptype']) { - if (array_key_exists($_GET['maptype'], $this->tileSrcUrl)) $this->maptype = $_GET['maptype']; + $mapTypeParam = $_GET['maptype']; + if (array_key_exists($mapTypeParam, $this->mapTypeAliases)) $mapTypeParam = $this->mapTypeAliases[$mapTypeParam]; + if (array_key_exists($mapTypeParam, $this->tileSrcUrl)) $this->maptype = $mapTypeParam; } }