mprins / dokuwiki-plugin-openlayersmap

StaticMap.php

Spacing +198 added lines, -198 removed lines

@@ -18,7 +18,7 @@ 
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-include_once (realpath ( dirname ( __FILE__ ) ) . '/../geophp/geoPHP/geoPHP.inc');
+include_once (realpath(dirname(__FILE__)).'/../geophp/geoPHP/geoPHP.inc');
 /**
  *
  * @author Mark C. Prins <mprins@users.sf.net>
@@ -32,40 +32,40 @@ 
 	// the final output
 	var $doc = '';
 
-	protected $tileInfo = array (
+	protected $tileInfo = array(
 			// OSM sources
-			'openstreetmap' => array (
+			'openstreetmap' => array(
 					'txt' => '(c) OpenStreetMap CC-BY-SA',
 					'logo' => 'osm_logo.png',
 					'url' => 'http://tile.openstreetmap.org/{Z}/{X}/{Y}.png'
 			),
 			// OCM sources
-			'cycle' => array (
+			'cycle' => array(
 					'txt' => 'OpenCycleMap tiles',
 					'logo' => 'cycle_logo.png',
 					'url' => 'https://tile.thunderforest.com/cycle/{Z}/{X}/{Y}.png?apikey='
 			),
-			'transport' => array (
+			'transport' => array(
 					'txt' => 'OpenCycleMap tiles',
 					'logo' => 'cycle_logo.png',
 					'url' => 'https://tile.thunderforest.com/transport/{Z}/{X}/{Y}.png?apikey='
 			),
-			'landscape' => array (
+			'landscape' => array(
 					'txt' => 'OpenCycleMap tiles',
 					'logo' => 'cycle_logo.png',
 					'url' => 'https://tile.thunderforest.com/landscape/{Z}/{X}/{Y}.png?apikey='
 			),
-			'outdoors' => array (
+			'outdoors' => array(
 					'txt' => 'OpenCycleMap tiles',
 					'logo' => 'cycle_logo.png',
 					'url' => 'https://tile.thunderforest.com/outdoors/{Z}/{X}/{Y}.png?apikey='
 			),
-			'toner-lite' => array (
+			'toner-lite' => array(
 					'txt' => 'Stamen tiles',
 					'logo' => 'stamen.png',
 					'url' => 'http://tile.stamen.com/toner-lite/{Z}/{X}/{Y}.png'
 			),
-			'terrain' => array (
+			'terrain' => array(
 					'txt' => 'Stamen tiles',
 					'logo' => 'stamen.png',
 					'url' => 'http://tile.stamen.com/terrain/{Z}/{X}/{Y}.png'
@@ -91,10 +91,10 @@ 
 	protected $tileDefaultSrc = 'openstreetmap';
 
 	// set up markers
-	protected $markerPrototypes = array (
+	protected $markerPrototypes = array(
 			// found at http://www.mapito.net/map-marker-icons.html
 			// these are 17x19 px with a pointer at the bottom left
-			'lightblue' => array (
+			'lightblue' => array(
 					'regex' => '/^lightblue([0-9]+)$/',
 					'extension' => '.png',
 					'shadow' => false,
@@ -102,7 +102,7 @@ 
 					'offsetShadow' => false
 			),
 			// openlayers std markers are 21x25px with shadow
-			'ol-marker' => array (
+			'ol-marker' => array(
 					'regex' => '/^marker(|-blue|-gold|-green|-red)+$/',
 					'extension' => '.png',
 					'shadow' => 'marker_shadow.png',
@@ -110,7 +110,7 @@ 
 					'offsetShadow' => '-1,-13'
 			),
 			// these are 16x16 px
-			'ww_icon' => array (
+			'ww_icon' => array(
 					'regex' => '/ww_\S+$/',
 					'extension' => '.png',
 					'shadow' => false,
@@ -118,7 +118,7 @@ 
 					'offsetShadow' => false
 			),
 			// assume these are 16x16 px
-			'rest' => array (
+			'rest' => array(
 					'regex' => '/^(?!lightblue([0-9]+)$)(?!(ww_\S+$))(?!marker(|-blue|-gold|-green|-red)+$)(.*)/',
 					'extension' => '.png',
 					'shadow' => 'marker_shadow.png',
@@ -172,7 +172,7 @@ 
 		$this->height = $height;
 		// validate + set maptype
 		$this->maptype = $this->tileDefaultSrc;
-		if (array_key_exists ( $maptype, $this->tileInfo )) {
+		if (array_key_exists($maptype, $this->tileInfo)) {
 			$this->maptype = $maptype;
 		}
 		$this->markers = $markers;
@@ -180,9 +180,9 @@ 
 		$this->gpxFileName = $gpx;
 		$this->geojsonFileName = $geojson;
 		$this->mediaBaseDir = $mediaDir;
-		$this->tileCacheBaseDir = $tileCacheBaseDir . '/olmaptiles';
+		$this->tileCacheBaseDir = $tileCacheBaseDir.'/olmaptiles';
 		$this->useTileCache = $this->tileCacheBaseDir !== '';
-		$this->mapCacheBaseDir = $mediaDir . '/olmapmaps';
+		$this->mapCacheBaseDir = $mediaDir.'/olmapmaps';
 		$this->autoZoomExtent = $autoZoomExtent;
 		$this->apikey = $apikey;
 	}
@@ -194,7 +194,7 @@ 
 	 * @return number
 	 */
 	public function lonToTile($long, $zoom) {
-		return (($long + 180) / 360) * pow ( 2, $zoom );
+		return (($long + 180) / 360) * pow(2, $zoom);
 	}
 	/**
 	 *
@@ -203,59 +203,59 @@ 
 	 * @return number
 	 */
 	public function latToTile($lat, $zoom) {
-		return (1 - log ( tan ( $lat * pi () / 180 ) + 1 / cos ( $lat * M_PI / 180 ) ) / M_PI) / 2 * pow ( 2, $zoom );
+		return (1 - log(tan($lat * pi() / 180) + 1 / cos($lat * M_PI / 180)) / M_PI) / 2 * pow(2, $zoom);
 	}
 
 	/**
 	 */
 	public function initCoords() {
-		$this->centerX = $this->lonToTile ( $this->lon, $this->zoom );
-		$this->centerY = $this->latToTile ( $this->lat, $this->zoom );
-		$this->offsetX = floor ( (floor ( $this->centerX ) - $this->centerX) * $this->tileSize );
-		$this->offsetY = floor ( (floor ( $this->centerY ) - $this->centerY) * $this->tileSize );
+		$this->centerX = $this->lonToTile($this->lon, $this->zoom);
+		$this->centerY = $this->latToTile($this->lat, $this->zoom);
+		$this->offsetX = floor((floor($this->centerX) - $this->centerX) * $this->tileSize);
+		$this->offsetY = floor((floor($this->centerY) - $this->centerY) * $this->tileSize);
 	}
 
 	/**
 	 * make basemap image.
 	 */
 	public function createBaseMap() {
-		$this->image = imagecreatetruecolor ( $this->width, $this->height );
-		$startX = floor ( $this->centerX - ($this->width / $this->tileSize) / 2 );
-		$startY = floor ( $this->centerY - ($this->height / $this->tileSize) / 2 );
-		$endX = ceil ( $this->centerX + ($this->width / $this->tileSize) / 2 );
-		$endY = ceil ( $this->centerY + ($this->height / $this->tileSize) / 2 );
-		$this->offsetX = - floor ( ($this->centerX - floor ( $this->centerX )) * $this->tileSize );
-		$this->offsetY = - floor ( ($this->centerY - floor ( $this->centerY )) * $this->tileSize );
-		$this->offsetX += floor ( $this->width / 2 );
-		$this->offsetY += floor ( $this->height / 2 );
-		$this->offsetX += floor ( $startX - floor ( $this->centerX ) ) * $this->tileSize;
-		$this->offsetY += floor ( $startY - floor ( $this->centerY ) ) * $this->tileSize;
-
-		for($x = $startX; $x <= $endX; $x ++) {
-			for($y = $startY; $y <= $endY; $y ++) {
-				$url = str_replace ( array (
+		$this->image = imagecreatetruecolor($this->width, $this->height);
+		$startX = floor($this->centerX - ($this->width / $this->tileSize) / 2);
+		$startY = floor($this->centerY - ($this->height / $this->tileSize) / 2);
+		$endX = ceil($this->centerX + ($this->width / $this->tileSize) / 2);
+		$endY = ceil($this->centerY + ($this->height / $this->tileSize) / 2);
+		$this->offsetX = - floor(($this->centerX - floor($this->centerX)) * $this->tileSize);
+		$this->offsetY = - floor(($this->centerY - floor($this->centerY)) * $this->tileSize);
+		$this->offsetX += floor($this->width / 2);
+		$this->offsetY += floor($this->height / 2);
+		$this->offsetX += floor($startX - floor($this->centerX)) * $this->tileSize;
+		$this->offsetY += floor($startY - floor($this->centerY)) * $this->tileSize;
+
+		for ($x = $startX; $x <= $endX; $x++) {
+			for ($y = $startY; $y <= $endY; $y++) {
+				$url = str_replace(array(
 						'{Z}',
 						'{X}',
 						'{Y}'
-				), array (
+				), array(
 						$this->zoom,
 						$x,
 						$y
-				), $this->tileInfo [$this->maptype] ['url'] );
+				), $this->tileInfo [$this->maptype] ['url']);
 				$url .= $this->apikey;
 				
-				$tileData = $this->fetchTile ( $url );
+				$tileData = $this->fetchTile($url);
 				if ($tileData) {
-					$tileImage = imagecreatefromstring ( $tileData );
+					$tileImage = imagecreatefromstring($tileData);
 				} else {
-					$tileImage = imagecreate ( $this->tileSize, $this->tileSize );
-					$color = imagecolorallocate ( $tileImage, 255, 255, 255 );
-					@imagestring ( $tileImage, 1, 127, 127, 'err', $color );
+					$tileImage = imagecreate($this->tileSize, $this->tileSize);
+					$color = imagecolorallocate($tileImage, 255, 255, 255);
+					@imagestring($tileImage, 1, 127, 127, 'err', $color);
 				}
 				$destX = ($x - $startX) * $this->tileSize + $this->offsetX;
 				$destY = ($y - $startY) * $this->tileSize + $this->offsetY;
-				dbglog($this->tileSize,"imagecopy tile into image: $destX, $destY");
-				imagecopy ( $this->image, $tileImage, $destX, $destY, 0, 0, $this->tileSize, $this->tileSize );
+				dbglog($this->tileSize, "imagecopy tile into image: $destX, $destY");
+				imagecopy($this->image, $tileImage, $destX, $destY, 0, 0, $this->tileSize, $this->tileSize);
 			}
 		}
 	}
@@ -265,11 +265,11 @@ 
 	 */
 	public function placeMarkers() {
 		$count = 0;
-		$color = imagecolorallocate ( $this->image, 0, 0, 0 );
-		$bgcolor = imagecolorallocate ( $this->image, 200, 200, 200 );
-		$markerBaseDir = dirname ( __FILE__ ) . '/icons';
+		$color = imagecolorallocate($this->image, 0, 0, 0);
+		$bgcolor = imagecolorallocate($this->image, 200, 200, 200);
+		$markerBaseDir = dirname(__FILE__).'/icons';
 		// loop thru marker array
-		foreach ( $this->markers as $marker ) {
+		foreach ($this->markers as $marker) {
 			// set some local variables
 			$markerLat = $marker ['lat'];
 			$markerLon = $marker ['lon'];
@@ -280,41 +280,41 @@ 
 			$matches = false;
 			// check for marker type, get settings from markerPrototypes
 			if ($markerType) {
-				foreach ( $this->markerPrototypes as $markerPrototype ) {
-					if (preg_match ( $markerPrototype ['regex'], $markerType, $matches )) {
-						$markerFilename = $matches [0] . $markerPrototype ['extension'];
+				foreach ($this->markerPrototypes as $markerPrototype) {
+					if (preg_match($markerPrototype ['regex'], $markerType, $matches)) {
+						$markerFilename = $matches [0].$markerPrototype ['extension'];
 						if ($markerPrototype ['offsetImage']) {
-							list ( $markerImageOffsetX, $markerImageOffsetY ) = explode ( ",", $markerPrototype ['offsetImage'] );
+							list ($markerImageOffsetX, $markerImageOffsetY) = explode(",", $markerPrototype ['offsetImage']);
 						}
 						$markerShadow = $markerPrototype ['shadow'];
 						if ($markerShadow) {
-							list ( $markerShadowOffsetX, $markerShadowOffsetY ) = explode ( ",", $markerPrototype ['offsetShadow'] );
+							list ($markerShadowOffsetX, $markerShadowOffsetY) = explode(",", $markerPrototype ['offsetShadow']);
 						}
 					}
 				}
 			}
 			// create img resource
-			if (file_exists ( $markerBaseDir . '/' . $markerFilename )) {
-				$markerImg = imagecreatefrompng ( $markerBaseDir . '/' . $markerFilename );
+			if (file_exists($markerBaseDir.'/'.$markerFilename)) {
+				$markerImg = imagecreatefrompng($markerBaseDir.'/'.$markerFilename);
 			} else {
-				$markerImg = imagecreatefrompng ( $markerBaseDir . '/marker.png' );
+				$markerImg = imagecreatefrompng($markerBaseDir.'/marker.png');
 			}
 			// check for shadow + create shadow recource
-			if ($markerShadow && file_exists ( $markerBaseDir . '/' . $markerShadow )) {
-				$markerShadowImg = imagecreatefrompng ( $markerBaseDir . '/' . $markerShadow );
+			if ($markerShadow && file_exists($markerBaseDir.'/'.$markerShadow)) {
+				$markerShadowImg = imagecreatefrompng($markerBaseDir.'/'.$markerShadow);
 			}
 			// calc position
-			$destX = floor ( ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile ( $markerLon, $this->zoom )) );
-			$destY = floor ( ($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile ( $markerLat, $this->zoom )) );
+			$destX = floor(($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($markerLon, $this->zoom)));
+			$destY = floor(($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile($markerLat, $this->zoom)));
 			// copy shadow on basemap
 			if ($markerShadow && $markerShadowImg) {
-				imagecopy ( $this->image, $markerShadowImg, $destX + intval ( $markerShadowOffsetX ), $destY + intval ( $markerShadowOffsetY ), 0, 0, imagesx ( $markerShadowImg ), imagesy ( $markerShadowImg ) );
+				imagecopy($this->image, $markerShadowImg, $destX + intval($markerShadowOffsetX), $destY + intval($markerShadowOffsetY), 0, 0, imagesx($markerShadowImg), imagesy($markerShadowImg));
 			}
 			// copy marker on basemap above shadow
-			imagecopy ( $this->image, $markerImg, $destX + intval ( $markerImageOffsetX ), $destY + intval ( $markerImageOffsetY ), 0, 0, imagesx ( $markerImg ), imagesy ( $markerImg ) );
+			imagecopy($this->image, $markerImg, $destX + intval($markerImageOffsetX), $destY + intval($markerImageOffsetY), 0, 0, imagesx($markerImg), imagesy($markerImg));
 			// add label
-			imagestring ( $this->image, 3, $destX - imagesx ( $markerImg ) + 1, $destY + intval ( $markerImageOffsetY ) + 1, ++ $count, $bgcolor );
-			imagestring ( $this->image, 3, $destX - imagesx ( $markerImg ), $destY + intval ( $markerImageOffsetY ), $count, $color );
+			imagestring($this->image, 3, $destX - imagesx($markerImg) + 1, $destY + intval($markerImageOffsetY) + 1, ++ $count, $bgcolor);
+			imagestring($this->image, 3, $destX - imagesx($markerImg), $destY + intval($markerImageOffsetY), $count, $color);
 		}
 		;
 	}
@@ -325,9 +325,9 @@ 
 	 * @return string
 	 */
 	public function tileUrlToFilename($url) {
-		return $this->tileCacheBaseDir . "/" . str_replace ( array (
+		return $this->tileCacheBaseDir."/".str_replace(array(
 				'http://'
-		), '', $url );
+		), '', $url);
 	}
 
 	/**
@@ -335,36 +335,36 @@ 
 	 * @param string $url
 	 */
 	public function checkTileCache($url) {
-		$filename = $this->tileUrlToFilename ( $url );
-		if (file_exists ( $filename )) {
-			return file_get_contents ( $filename );
+		$filename = $this->tileUrlToFilename($url);
+		if (file_exists($filename)) {
+			return file_get_contents($filename);
 		}
 	}
 	public function checkMapCache() {
-		$this->mapCacheID = md5 ( $this->serializeParams () );
-		$filename = $this->mapCacheIDToFilename ();
-		if (file_exists ( $filename ))
+		$this->mapCacheID = md5($this->serializeParams());
+		$filename = $this->mapCacheIDToFilename();
+		if (file_exists($filename))
 			return true;
 	}
 	public function serializeParams() {
-		return join ( "&", array (
+		return join("&", array(
 				$this->zoom,
 				$this->lat,
 				$this->lon,
 				$this->width,
 				$this->height,
-				serialize ( $this->markers ),
+				serialize($this->markers),
 				$this->maptype,
 				$this->kmlFileName,
 				$this->gpxFileName,
 				$this->geojsonFileName
-		) );
+		));
 	}
 	public function mapCacheIDToFilename() {
-		if (! $this->mapCacheFile) {
-			$this->mapCacheFile = $this->mapCacheBaseDir . "/" . $this->maptype . "/" . $this->zoom . "/cache_" . substr ( $this->mapCacheID, 0, 2 ) . "/" . substr ( $this->mapCacheID, 2, 2 ) . "/" . substr ( $this->mapCacheID, 4 );
+		if (!$this->mapCacheFile) {
+			$this->mapCacheFile = $this->mapCacheBaseDir."/".$this->maptype."/".$this->zoom."/cache_".substr($this->mapCacheID, 0, 2)."/".substr($this->mapCacheID, 2, 2)."/".substr($this->mapCacheID, 4);
 		}
-		return $this->mapCacheFile . "." . $this->mapCacheExtension;
+		return $this->mapCacheFile.".".$this->mapCacheExtension;
 	}
 
 	/**
@@ -376,8 +376,8 @@ 
 	 *        	File access mode. For more information on modes, read the details on the chmod manpage.
 	 */
 	public function mkdir_recursive($pathname, $mode) {
-		is_dir ( dirname ( $pathname ) ) || $this->mkdir_recursive ( dirname ( $pathname ), $mode );
-		return is_dir ( $pathname ) || @mkdir ( $pathname, $mode );
+		is_dir(dirname($pathname)) || $this->mkdir_recursive(dirname($pathname), $mode);
+		return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
 
 	/**
@@ -387,9 +387,9 @@ 
 	 * @param mixed $data
 	 */
 	public function writeTileToCache($url, $data) {
-		$filename = $this->tileUrlToFilename ( $url );
-		$this->mkdir_recursive ( dirname ( $filename ), 0777 );
-		file_put_contents ( $filename, $data );
+		$filename = $this->tileUrlToFilename($url);
+		$this->mkdir_recursive(dirname($filename), 0777);
+		file_put_contents($filename, $data);
 	}
 
 	/**
@@ -398,35 +398,35 @@ 
 	 * @param string $url
 	 */
 	public function fetchTile($url) {
-		if ($this->useTileCache && ($cached = $this->checkTileCache ( $url )))
+		if ($this->useTileCache && ($cached = $this->checkTileCache($url)))
 			return $cached;
 
-		$_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
-		if (function_exists ( "curl_init" )) {
+		$_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; '.PHP_OS.')';
+		if (function_exists("curl_init")) {
 			// use cUrl
-			$ch = curl_init ();
-			curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt ( $ch, CURLOPT_USERAGENT, $_UA );
-			curl_setopt ( $ch, CURLOPT_CONNECTTIMEOUT, 10 );
-			curl_setopt ( $ch, CURLOPT_URL, $url );
-			$tile = curl_exec ( $ch );
-			curl_close ( $ch );
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_USERAGENT, $_UA);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+			curl_setopt($ch, CURLOPT_URL, $url);
+			$tile = curl_exec($ch);
+			curl_close($ch);
 		} else {
 			// use file_get_contents
 			global $conf;
-			$opts = array (
-					'http' => array (
+			$opts = array(
+					'http' => array(
 							'method' => "GET",
-							'header' => "Accept-language: en\r\n" . "User-Agent: $_UA\r\n" . "accept: image/png\r\n",
-							'proxy' => "tcp://" . $conf ['proxy'] ['host'] . ":" . $conf ['proxy'] ['port'],
+							'header' => "Accept-language: en\r\n"."User-Agent: $_UA\r\n"."accept: image/png\r\n",
+							'proxy' => "tcp://".$conf ['proxy'] ['host'].":".$conf ['proxy'] ['port'],
 							'request_fulluri' => true
 					)
 			);
-			$context = stream_context_create ( $opts );
-			$tile = file_get_contents ( $url, false, $context );
+			$context = stream_context_create($opts);
+			$tile = file_get_contents($url, false, $context);
 		}
 		if ($tile && $this->useTileCache) {
-			$this->writeTileToCache ( $url, $tile );
+			$this->writeTileToCache($url, $tile);
 		}
 		return $tile;
 	}
@@ -435,18 +435,18 @@ 
 	 * Draw gpx trace on the map.
 	 */
 	public function drawGPX() {
-		$col = imagecolorallocatealpha ( $this->image, 0, 0, 255, .4 * 127 );
-		$gpxgeom = geoPHP::load ( file_get_contents ( $this->gpxFileName ), 'gpx' );
-		$this->drawGeometry ( $gpxgeom, $col );
+		$col = imagecolorallocatealpha($this->image, 0, 0, 255, .4 * 127);
+		$gpxgeom = geoPHP::load(file_get_contents($this->gpxFileName), 'gpx');
+		$this->drawGeometry($gpxgeom, $col);
 	}
 
 	/**
 	 * Draw geojson on the map.
 	 */
 	public function drawGeojson() {
-		$col = imagecolorallocatealpha ( $this->image, 255, 0, 255, .4 * 127 );
-		$gpxgeom = geoPHP::load ( file_get_contents ( $this->geojsonFileName ), 'json' );
-		$this->drawGeometry ( $gpxgeom, $col );
+		$col = imagecolorallocatealpha($this->image, 255, 0, 255, .4 * 127);
+		$gpxgeom = geoPHP::load(file_get_contents($this->geojsonFileName), 'json');
+		$this->drawGeometry($gpxgeom, $col);
 	}
 
 	/**
@@ -454,9 +454,9 @@ 
 	 */
 	public function drawKML() {
 		// TODO get colour from kml node (not currently supported in geoPHP)
-		$col = imagecolorallocatealpha ( $this->image, 255, 0, 0, .4 * 127 );
-		$kmlgeom = geoPHP::load ( file_get_contents ( $this->kmlFileName ), 'kml' );
-		$this->drawGeometry ( $kmlgeom, $col );
+		$col = imagecolorallocatealpha($this->image, 255, 0, 0, .4 * 127);
+		$kmlgeom = geoPHP::load(file_get_contents($this->kmlFileName), 'kml');
+		$this->drawGeometry($kmlgeom, $col);
 	}
 
 	/**
@@ -469,12 +469,12 @@ 
 	private function drawGeometry($geom, $colour) {
 		if (empty($geom)) return;
 		
-		switch ($geom->geometryType ()) {
+		switch ($geom->geometryType()) {
 			case 'GeometryCollection' :
 				// recursively draw part of the collection
-				for($i = 1; $i < $geom->numGeometries () + 1; $i ++) {
-					$_geom = $geom->geometryN ( $i );
-					$this->drawGeometry ( $_geom, $colour );
+				for ($i = 1; $i < $geom->numGeometries() + 1; $i++) {
+					$_geom = $geom->geometryN($i);
+					$this->drawGeometry($_geom, $colour);
 				}
 				break;
 			case 'MultiPolygon' :
@@ -487,13 +487,13 @@ 
 				// TODO implement / do nothing
 				break;
 			case 'Polygon' :
-				$this->drawPolygon ( $geom, $colour );
+				$this->drawPolygon($geom, $colour);
 				break;
 			case 'LineString' :
-				$this->drawLineString ( $geom, $colour );
+				$this->drawLineString($geom, $colour);
 				break;
 			case 'Point' :
-				$this->drawPoint ( $geom, $colour );
+				$this->drawPoint($geom, $colour);
 				break;
 			default :
 				// draw nothing
@@ -509,20 +509,20 @@ 
 	 *        	drawing colour
 	 */
 	private function drawLineString($line, $colour) {
-		imagesetthickness ( $this->image, 2 );
-		for($p = 1; $p < $line->numGeometries (); $p ++) {
+		imagesetthickness($this->image, 2);
+		for ($p = 1; $p < $line->numGeometries(); $p++) {
 			// get first pair of points
-			$p1 = $line->geometryN ( $p );
-			$p2 = $line->geometryN ( $p + 1 );
+			$p1 = $line->geometryN($p);
+			$p2 = $line->geometryN($p + 1);
 			// translate to paper space
-			$x1 = floor ( ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile ( $p1->x (), $this->zoom )) );
-			$y1 = floor ( ($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile ( $p1->y (), $this->zoom )) );
-			$x2 = floor ( ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile ( $p2->x (), $this->zoom )) );
-			$y2 = floor ( ($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile ( $p2->y (), $this->zoom )) );
+			$x1 = floor(($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($p1->x(), $this->zoom)));
+			$y1 = floor(($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile($p1->y(), $this->zoom)));
+			$x2 = floor(($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($p2->x(), $this->zoom)));
+			$y2 = floor(($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile($p2->y(), $this->zoom)));
 			// draw to image
-			imageline ( $this->image, $x1, $y1, $x2, $y2, $colour );
+			imageline($this->image, $x1, $y1, $x2, $y2, $colour);
 		}
-		imagesetthickness ( $this->image, 1 );
+		imagesetthickness($this->image, 1);
 	}
 
 	/**
@@ -533,18 +533,18 @@ 
 	 *        	drawing colour
 	 */
 	private function drawPoint($point, $colour) {
-		imagesetthickness ( $this->image, 2 );
+		imagesetthickness($this->image, 2);
 		// translate to paper space
-		$cx = floor ( ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile ( $point->x (), $this->zoom )) );
-		$cy = floor ( ($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile ( $point->y (), $this->zoom )) );
+		$cx = floor(($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($point->x(), $this->zoom)));
+		$cy = floor(($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile($point->y(), $this->zoom)));
 		$r = 5;
 		// draw to image
 		// imageellipse($this->image, $cx, $cy,$r, $r, $colour);
-		imagefilledellipse ( $this->image, $cx, $cy, $r, $r, $colour );
+		imagefilledellipse($this->image, $cx, $cy, $r, $r, $colour);
 		// don't use imageellipse because the imagesetthickness function has
 		// no effect. So the better workaround is to use imagearc.
-		imagearc ( $this->image, $cx, $cy, $r, $r, 0, 359, $colour );
-		imagesetthickness ( $this->image, 1 );
+		imagearc($this->image, $cx, $cy, $r, $r, 0, 359, $colour);
+		imagesetthickness($this->image, 1);
 	}
 
 	/**
@@ -560,42 +560,42 @@ 
 
 		// print_r('Polygon:<br />');
 		// print_r($polygon);
-		$extPoints = array ();
+		$extPoints = array();
 		// extring is a linestring actually..
-		$extRing = $polygon->exteriorRing ();
+		$extRing = $polygon->exteriorRing();
 
-		for($i = 1; $i < $extRing->numGeometries (); $i ++) {
-			$p1 = $extRing->geometryN ( $i );
-			$x = floor ( ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile ( $p1->x (), $this->zoom )) );
-			$y = floor ( ($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile ( $p1->y (), $this->zoom )) );
+		for ($i = 1; $i < $extRing->numGeometries(); $i++) {
+			$p1 = $extRing->geometryN($i);
+			$x = floor(($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($p1->x(), $this->zoom)));
+			$y = floor(($this->height / 2) - $this->tileSize * ($this->centerY - $this->latToTile($p1->y(), $this->zoom)));
 			$extPoints [] = $x;
 			$extPoints [] = $y;
 		}
 		// print_r('points:('.($i-1).')<br />');
 		// print_r($extPoints);
 		// imagepolygon ($this->image, $extPoints, $i-1, $colour );
-		imagefilledpolygon ( $this->image, $extPoints, $i - 1, $colour );
+		imagefilledpolygon($this->image, $extPoints, $i - 1, $colour);
 	}
 
 	/**
 	 * add copyright and origin notice and icons to the map.
 	 */
 	public function drawCopyright() {
-		$logoBaseDir = dirname ( __FILE__ ) . '/' . 'logo/';
-		$logoImg = imagecreatefrompng ( $logoBaseDir . $this->tileInfo ['openstreetmap'] ['logo'] );
-		$textcolor = imagecolorallocate ( $this->image, 0, 0, 0 );
-		$bgcolor = imagecolorallocate ( $this->image, 200, 200, 200 );
+		$logoBaseDir = dirname(__FILE__).'/'.'logo/';
+		$logoImg = imagecreatefrompng($logoBaseDir.$this->tileInfo ['openstreetmap'] ['logo']);
+		$textcolor = imagecolorallocate($this->image, 0, 0, 0);
+		$bgcolor = imagecolorallocate($this->image, 200, 200, 200);
 
-		imagecopy ( $this->image, $logoImg, 0, imagesy ( $this->image ) - imagesy ( $logoImg ), 0, 0, imagesx ( $logoImg ), imagesy ( $logoImg ) );
-		imagestring ( $this->image, 1, imagesx ( $logoImg ) + 2, imagesy ( $this->image ) - imagesy ( $logoImg ) + 1, $this->tileInfo ['openstreetmap'] ['txt'], $bgcolor );
-		imagestring ( $this->image, 1, imagesx ( $logoImg ) + 1, imagesy ( $this->image ) - imagesy ( $logoImg ), $this->tileInfo ['openstreetmap'] ['txt'], $textcolor );
+		imagecopy($this->image, $logoImg, 0, imagesy($this->image) - imagesy($logoImg), 0, 0, imagesx($logoImg), imagesy($logoImg));
+		imagestring($this->image, 1, imagesx($logoImg) + 2, imagesy($this->image) - imagesy($logoImg) + 1, $this->tileInfo ['openstreetmap'] ['txt'], $bgcolor);
+		imagestring($this->image, 1, imagesx($logoImg) + 1, imagesy($this->image) - imagesy($logoImg), $this->tileInfo ['openstreetmap'] ['txt'], $textcolor);
 
 		// additional tile source info, ie. who created/hosted the tiles
 		if ($this->maptype != 'openstreetmap') {
-			$iconImg = imagecreatefrompng ( $logoBaseDir . $this->tileInfo [$this->maptype] ['logo'] );
-			imagecopy ( $this->image, $iconImg, imagesx ( $logoImg ) + 1, imagesy ( $this->image ) - imagesy ( $iconImg ), 0, 0, imagesx ( $iconImg ), imagesy ( $iconImg ) );
-			imagestring ( $this->image, 1, imagesx ( $logoImg ) + imagesx ( $iconImg ) + 4, imagesy ( $this->image ) - ceil ( imagesy ( $logoImg ) / 2 ) + 1, $this->tileInfo [$this->maptype] ['txt'], $bgcolor );
-			imagestring ( $this->image, 1, imagesx ( $logoImg ) + imagesx ( $iconImg ) + 3, imagesy ( $this->image ) - ceil ( imagesy ( $logoImg ) / 2 ), $this->tileInfo [$this->maptype] ['txt'], $textcolor );
+			$iconImg = imagecreatefrompng($logoBaseDir.$this->tileInfo [$this->maptype] ['logo']);
+			imagecopy($this->image, $iconImg, imagesx($logoImg) + 1, imagesy($this->image) - imagesy($iconImg), 0, 0, imagesx($iconImg), imagesy($iconImg));
+			imagestring($this->image, 1, imagesx($logoImg) + imagesx($iconImg) + 4, imagesy($this->image) - ceil(imagesy($logoImg) / 2) + 1, $this->tileInfo [$this->maptype] ['txt'], $bgcolor);
+			imagestring($this->image, 1, imagesx($logoImg) + imagesx($iconImg) + 3, imagesy($this->image) - ceil(imagesy($logoImg) / 2), $this->tileInfo [$this->maptype] ['txt'], $textcolor);
 		}
 	}
 
@@ -603,18 +603,18 @@ 
 	 * make the map.
 	 */
 	public function makeMap() {
-		$this->initCoords ();
-		$this->createBaseMap ();
-		if (! empty ( $this->markers ))
-			$this->placeMarkers ();
-		if (file_exists ( $this->kmlFileName ))
-			$this->drawKML ();
-		if (file_exists ( $this->gpxFileName ))
-			$this->drawGPX ();
-		if (file_exists ( $this->geojsonFileName ))
-			$this->drawGeojson ();
-
-		$this->drawCopyright ();
+		$this->initCoords();
+		$this->createBaseMap();
+		if (!empty ($this->markers))
+			$this->placeMarkers();
+		if (file_exists($this->kmlFileName))
+			$this->drawKML();
+		if (file_exists($this->gpxFileName))
+			$this->drawGPX();
+		if (file_exists($this->geojsonFileName))
+			$this->drawGeojson();
+
+		$this->drawCopyright();
 	}
 
 	/**
@@ -627,59 +627,59 @@ 
 	 *        	buffer constant to enlarge (>1.0) the zoom level
 	 */
 	private function autoZoom($paddingFactor = 1.0) {
-		$geoms = array ();
-		$geoms [] = new Point ( $this->lon, $this->lat );
-		if (! empty ( $this->markers )) {
-			foreach ( $this->markers as $marker ) {
-				$geoms [] = new Point ( $marker ['lon'], $marker ['lat'] );
+		$geoms = array();
+		$geoms [] = new Point($this->lon, $this->lat);
+		if (!empty ($this->markers)) {
+			foreach ($this->markers as $marker) {
+				$geoms [] = new Point($marker ['lon'], $marker ['lat']);
 			}
 		}
 		$g = FALSE;
-		if (file_exists ( $this->kmlFileName )) {
-			$g = geoPHP::load ( file_get_contents ( $this->kmlFileName ), 'kml' );
-			if($g !== FALSE) {
+		if (file_exists($this->kmlFileName)) {
+			$g = geoPHP::load(file_get_contents($this->kmlFileName), 'kml');
+			if ($g !== FALSE) {
 				$geoms [] = $g;
 			}
 		}
-		if (file_exists ( $this->gpxFileName )) {
-			$g = geoPHP::load ( file_get_contents ( $this->gpxFileName ), 'gpx' );
-			if($g !== FALSE) {
+		if (file_exists($this->gpxFileName)) {
+			$g = geoPHP::load(file_get_contents($this->gpxFileName), 'gpx');
+			if ($g !== FALSE) {
 				$geoms [] = $g;
 			}
 		}
-		if (file_exists ( $this->geojsonFileName )) {
-			$g = geoPHP::load ( file_get_contents ( $this->geojsonFileName ), 'geojson' );
-			if($g !== FALSE) {
+		if (file_exists($this->geojsonFileName)) {
+			$g = geoPHP::load(file_get_contents($this->geojsonFileName), 'geojson');
+			if ($g !== FALSE) {
 				$geoms [] = $g;
 			}
 		}
 
-		if (count ( $geoms ) <= 1) {
-			dbglog($geoms,"StaticMap::autoZoom: Skip setting autozoom options");
+		if (count($geoms) <= 1) {
+			dbglog($geoms, "StaticMap::autoZoom: Skip setting autozoom options");
 			return;
 		}
 
-		$geom = new GeometryCollection ( $geoms );
-		$centroid = $geom->centroid ();
-		$bbox = $geom->getBBox ();
+		$geom = new GeometryCollection($geoms);
+		$centroid = $geom->centroid();
+		$bbox = $geom->getBBox();
 
 		// determine vertical resolution, this depends on the distance from the equator
 		// $vy00 = log(tan(M_PI*(0.25 + $centroid->getY()/360)));
-		$vy0 = log ( tan ( M_PI * (0.25 + $bbox ['miny'] / 360) ) );
-		$vy1 = log ( tan ( M_PI * (0.25 + $bbox ['maxy'] / 360) ) );
+		$vy0 = log(tan(M_PI * (0.25 + $bbox ['miny'] / 360)));
+		$vy1 = log(tan(M_PI * (0.25 + $bbox ['maxy'] / 360)));
 		dbglog("StaticMap::autoZoom: vertical resolution: $vy0, $vy1");
 		$zoomFactorPowered = ($this->height / 2) / (40.7436654315252 * ($vy1 - $vy0));
 		$resolutionVertical = 360 / ($zoomFactorPowered * $this->tileSize);
 		// determine horizontal resolution
 		$resolutionHorizontal = ($bbox ['maxx'] - $bbox ['minx']) / $this->width;
-		$resolution = max ( $resolutionHorizontal, $resolutionVertical ) * $paddingFactor;
-		$zoom = log ( 360 / ($resolution * $this->tileSize), 2 );
+		$resolution = max($resolutionHorizontal, $resolutionVertical) * $paddingFactor;
+		$zoom = log(360 / ($resolution * $this->tileSize), 2);
 
 		if (is_finite($zoom) && $zoom < 15 && $zoom > 2) {
-			$this->zoom = floor ( $zoom );
+			$this->zoom = floor($zoom);
 		}
-		$this->lon = $centroid->getX ();
-		$this->lat = $centroid->getY ();
+		$this->lon = $centroid->getX();
+		$this->lat = $centroid->getY();
 		dbglog("StaticMap::autoZoom: Set autozoom options to: z: $this->zoom, lon: $this->lon, lat: $this->lat");
 	}
 
@@ -691,21 +691,21 @@ 
 	public function getMap() {
 		try {
 			if ($this->autoZoomExtent) {
-				$this->autoZoom ();
+				$this->autoZoom();
 			}
 		} catch (Exception $e) {
 			dbglog($e);
 		}
 
 			// use map cache, so check cache for map
-		if (! $this->checkMapCache ()) {
+		if (!$this->checkMapCache()) {
 			// map is not in cache, needs to be build
-			$this->makeMap ();
-			$this->mkdir_recursive ( dirname ( $this->mapCacheIDToFilename () ), 0777 );
-			imagepng ( $this->image, $this->mapCacheIDToFilename (), 9 );
+			$this->makeMap();
+			$this->mkdir_recursive(dirname($this->mapCacheIDToFilename()), 0777);
+			imagepng($this->image, $this->mapCacheIDToFilename(), 9);
 		}
-		$this->doc = $this->mapCacheIDToFilename ();
+		$this->doc = $this->mapCacheIDToFilename();
 		// make url relative to media dir
-		return str_replace ( $this->mediaBaseDir, '', $this->doc );
+		return str_replace($this->mediaBaseDir, '', $this->doc);
 	}
 }

Braces +21 added lines, -13 removed lines

@@ -343,8 +343,9 @@ 
 	public function checkMapCache() {
 		$this->mapCacheID = md5 ( $this->serializeParams () );
 		$filename = $this->mapCacheIDToFilename ();
-		if (file_exists ( $filename ))
-			return true;
+		if (file_exists ( $filename )) {
+					return true;
+		}
 	}
 	public function serializeParams() {
 		return join ( "&", array (
@@ -398,8 +399,9 @@ 
 	 * @param string $url
 	 */
 	public function fetchTile($url) {
-		if ($this->useTileCache && ($cached = $this->checkTileCache ( $url )))
-			return $cached;
+		if ($this->useTileCache && ($cached = $this->checkTileCache ( $url ))) {
+					return $cached;
+		}
 
 		$_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
 		if (function_exists ( "curl_init" )) {
@@ -467,7 +469,9 @@ 
 	 *        	drawing colour
 	 */
 	private function drawGeometry($geom, $colour) {
-		if (empty($geom)) return;
+		if (empty($geom)) {
+			return;
+		}
 		
 		switch ($geom->geometryType ()) {
 			case 'GeometryCollection' :
@@ -605,14 +609,18 @@ 
 	public function makeMap() {
 		$this->initCoords ();
 		$this->createBaseMap ();
-		if (! empty ( $this->markers ))
-			$this->placeMarkers ();
-		if (file_exists ( $this->kmlFileName ))
-			$this->drawKML ();
-		if (file_exists ( $this->gpxFileName ))
-			$this->drawGPX ();
-		if (file_exists ( $this->geojsonFileName ))
-			$this->drawGeojson ();
+		if (! empty ( $this->markers )) {
+					$this->placeMarkers ();
+		}
+		if (file_exists ( $this->kmlFileName )) {
+					$this->drawKML ();
+		}
+		if (file_exists ( $this->gpxFileName )) {
+					$this->drawGPX ();
+		}
+		if (file_exists ( $this->geojsonFileName )) {
+					$this->drawGeojson ();
+		}
 
 		$this->drawCopyright ();
 	}

syntax/olmap.php

Spacing +195 added lines, -195 removed lines

@@ -14,11 +14,11 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
-	define ( 'DOKU_INC', realpath ( dirname ( __FILE__ ) . '/../../' ) . '/' );
-if (! defined ( 'DOKU_PLUGIN' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
-require_once (DOKU_PLUGIN . 'syntax.php');
+if (!defined('DOKU_INC'))
+	define('DOKU_INC', realpath(dirname(__FILE__).'/../../').'/');
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
+require_once (DOKU_PLUGIN.'syntax.php');
 
 /**
  * DokuWiki Plugin openlayersmap (Syntax Component).
@@ -31,7 +31,7 @@ 
 	/**
 	 * defaults of the known attributes of the olmap tag.
 	 */
-	private $dflt = array (
+	private $dflt = array(
 			'id' => 'olmap',
 			'width' => '550px',
 			'height' => '450px',
@@ -79,7 +79,7 @@ 
 	 * @see Doku_Parser_Mode::connectTo()
 	 */
 	function connectTo($mode) {
-		$this->Lexer->addSpecialPattern ( '<olmap ?[^>\n]*>.*?</olmap>', $mode, 'plugin_openlayersmap_olmap' );
+		$this->Lexer->addSpecialPattern('<olmap ?[^>\n]*>.*?</olmap>', $mode, 'plugin_openlayersmap_olmap');
 	}
 
 	/**
@@ -88,12 +88,12 @@ 
 	 */
 	function handle($match, $state, $pos, Doku_Handler $handler) {
 		// break matched cdata into its components
-		list ( $str_params, $str_points ) = explode ( '>', substr ( $match, 7, - 9 ), 2 );
+		list ($str_params, $str_points) = explode('>', substr($match, 7, - 9), 2);
 		// get the lat/lon for adding them to the metadata (used by geotag)
-		preg_match ( '(lat[:|=]\"-?\d*\.?\d*\")', $match, $mainLat );
-		preg_match ( '(lon[:|=]\"-?\d*\.?\d*\")', $match, $mainLon );
-		$mainLat = substr ( $mainLat [0], 5, - 1 );
-		$mainLon = substr ( $mainLon [0], 5, - 1 );
+		preg_match('(lat[:|=]\"-?\d*\.?\d*\")', $match, $mainLat);
+		preg_match('(lon[:|=]\"-?\d*\.?\d*\")', $match, $mainLon);
+		$mainLat = substr($mainLat [0], 5, - 1);
+		$mainLon = substr($mainLon [0], 5, - 1);
 		if (!is_numeric($mainLat)) {
 			$mainLat = $this->dflt ['lat'];
 		}
@@ -101,30 +101,30 @@ 
 			$mainLon = $this->dflt ['lon'];
 		}
 
-		$gmap = $this->_extract_params ( $str_params );
-		$overlay = $this->_extract_points ( $str_points );
+		$gmap = $this->_extract_params($str_params);
+		$overlay = $this->_extract_points($str_points);
 		$_firstimageID = '';
 
 		$_nocache = false;
 		// choose maptype based on the specified tag
 		$imgUrl = "{{";
-		if (stripos ( $gmap ['baselyr'], 'google' ) !== false) {
+		if (stripos($gmap ['baselyr'], 'google') !== false) {
 			// Google
-			$imgUrl .= $this->_getGoogle ( $gmap, $overlay );
+			$imgUrl .= $this->_getGoogle($gmap, $overlay);
 			$imgUrl .= "&.png";
-		} elseif (stripos ( $gmap ['baselyr'], 'bing' ) !== false) {
+		} elseif (stripos($gmap ['baselyr'], 'bing') !== false) {
 			// Bing
-			if (! $this->getConf ( 'bingAPIKey' )) {
+			if (!$this->getConf('bingAPIKey')) {
 				// in case there is no Bing api key we'll use OSM
-				$_firstimageID = $this->_getStaticOSM ( $gmap, $overlay );
+				$_firstimageID = $this->_getStaticOSM($gmap, $overlay);
 				$imgUrl .= $_firstimageID;
-				if ($this->getConf ( 'optionStaticMapGenerator' ) == 'remote') {
+				if ($this->getConf('optionStaticMapGenerator') == 'remote') {
 					$imgUrl .= "&.png";
 				}
 			} else {
 				// seems that Bing doesn't like the DW client, turn off caching
 				$_nocache = true;
-				$imgUrl .= $this->_getBing ( $gmap, $overlay ) . "&.png";
+				$imgUrl .= $this->_getBing($gmap, $overlay)."&.png";
 			}
 		} /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
 			// MapQuest
@@ -141,15 +141,15 @@ 
 			}
 		} */ else {
 			// default OSM
-			$_firstimageID = $this->_getStaticOSM ( $gmap, $overlay );
+			$_firstimageID = $this->_getStaticOSM($gmap, $overlay);
 			$imgUrl .= $_firstimageID;
-			if ($this->getConf ( 'optionStaticMapGenerator' ) == 'remote') {
+			if ($this->getConf('optionStaticMapGenerator') == 'remote') {
 				$imgUrl .= "&.png";
 			}
 		}
 
 		// append dw p_render specific params and render
-		$imgUrl .= "?" . str_replace ( "px", "", $gmap ['width'] ) . "x" . str_replace ( "px", "", $gmap ['height'] );
+		$imgUrl .= "?".str_replace("px", "", $gmap ['width'])."x".str_replace("px", "", $gmap ['height']);
 		$imgUrl .= "&nolink";
 
 		// add nocache option for selected services
@@ -157,34 +157,34 @@ 
 			$imgUrl .= "&nocache";
 		}
 
-		$imgUrl .= " |".$gmap ['summary'] . " }}";
+		$imgUrl .= " |".$gmap ['summary']." }}";
 
 		// dbglog($imgUrl,"complete image tags is:");
 
 		$mapid = $gmap ['id'];
 		// create a javascript parameter string for the map
 		$param = '';
-		foreach ( $gmap as $key => $val ) {
-			$param .= is_numeric ( $val ) ? "$key: $val, " : "$key: '" . hsc ( $val ) . "', ";
+		foreach ($gmap as $key => $val) {
+			$param .= is_numeric($val) ? "$key: $val, " : "$key: '".hsc($val)."', ";
 		}
-		if (! empty ( $param )) {
-			$param = substr ( $param, 0, - 2 );
+		if (!empty ($param)) {
+			$param = substr($param, 0, - 2);
 		}
-		unset ( $gmap ['id'] );
+		unset ($gmap ['id']);
 
 		// create a javascript serialisation of the point data
 		$poi = '';
 		$poitable = '';
 		$rowId = 0;
-		if (! empty ( $overlay )) {
-			foreach ( $overlay as $data ) {
-				list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
-				$rowId ++;
+		if (!empty ($overlay)) {
+			foreach ($overlay as $data) {
+				list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
+				$rowId++;
 				$poi .= ", {lat: $lat, lon: $lon, txt: '$text', angle: $angle, opacity: $opacity, img: '$img', rowId: $rowId}";
 
-				if ($this->getConf ( 'displayformat' ) === 'DMS') {
-					$lat = $this->convertLat ( $lat );
-					$lon = $this->convertLon ( $lon );
+				if ($this->getConf('displayformat') === 'DMS') {
+					$lat = $this->convertLat($lat);
+					$lon = $this->convertLon($lon);
 				} else {
 					$lat .= 'º';
 					$lon .= 'º';
@@ -192,46 +192,46 @@ 
 
 				$poitable .= '
 					<tr>
-					<td class="rowId">' . $rowId . '</td>
-					<td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/icons/' . $img . '" alt="'. substr($img, 0, -4) . $this->getlang('alt_legend_poi').' " /></td>
-					<td class="lat" title="' . $this->getLang ( 'olmapPOIlatTitle' ) . '">' . $lat . '</td>
-					<td class="lon" title="' . $this->getLang ( 'olmapPOIlonTitle' ) . '">' . $lon . '</td>
-					<td class="txt">' . $text . '</td>
+					<td class="rowId">' . $rowId.'</td>
+					<td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/icons/'.$img.'" alt="'.substr($img, 0, -4).$this->getlang('alt_legend_poi').' " /></td>
+					<td class="lat" title="' . $this->getLang('olmapPOIlatTitle').'">'.$lat.'</td>
+					<td class="lon" title="' . $this->getLang('olmapPOIlonTitle').'">'.$lon.'</td>
+					<td class="txt">' . $text.'</td>
 					</tr>';
 			}
-			$poi = substr ( $poi, 2 );
+			$poi = substr($poi, 2);
 		}
-		if (! empty ( $gmap ['kmlfile'] )) {
+		if (!empty ($gmap ['kmlfile'])) {
 			$poitable .= '
 					<tr>
-					<td class="rowId"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/kml_file.png" alt="KML file" /></td>
-					<td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="' . $this->getlang('alt_legend_kml') .'" /></td>
-					<td class="txt" colspan="3">KML track: ' . $this->getFileName ( $gmap ['kmlfile'] ) . '</td>
+					<td class="rowId"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/kml_file.png" alt="KML file" /></td>
+					<td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="'.$this->getlang('alt_legend_kml').'" /></td>
+					<td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']).'</td>
 					</tr>';
 		}
-		if (! empty ( $gmap ['gpxfile'] )) {
+		if (!empty ($gmap ['gpxfile'])) {
 			$poitable .= '
 					<tr>
-					<td class="rowId"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/gpx_file.png" alt="GPX file" /></td>
-					<td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/gpx_line.png" alt="' . $this->getlang('alt_legend_gpx') .'" /></td>
-					<td class="txt" colspan="3">GPX track: ' . $this->getFileName ( $gmap ['gpxfile'] ) . '</td>
+					<td class="rowId"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/gpx_file.png" alt="GPX file" /></td>
+					<td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/gpx_line.png" alt="'.$this->getlang('alt_legend_gpx').'" /></td>
+					<td class="txt" colspan="3">GPX track: ' . $this->getFileName($gmap ['gpxfile']).'</td>
 					</tr>';
 		}
-		if (! empty ( $gmap ['geojsonfile'] )) {
+		if (!empty ($gmap ['geojsonfile'])) {
 			$poitable .= '
 					<tr>
-					<td class="rowId"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/geojson_file.png" alt="GeoJSON file" /></td>
-					<td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/geojson_line.png" alt="' . $this->getlang('alt_legend_geojson') .'" /></td>
-					<td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName ( $gmap ['geojsonfile'] ) . '</td>
+					<td class="rowId"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/geojson_file.png" alt="GeoJSON file" /></td>
+					<td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/geojson_line.png" alt="'.$this->getlang('alt_legend_geojson').'" /></td>
+					<td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName($gmap ['geojsonfile']).'</td>
 					</tr>';
 		}
 
-		$autozoom = empty ( $gmap ['autozoom'] ) ? $this->getConf ( 'autoZoomMap' ) : $gmap ['autozoom'];
-		$js .= "{mapOpts: {" . $param . ", displayformat: '" . $this->getConf ( 'displayformat' ) . "', autozoom: " . $autozoom . "}, poi: [$poi]};";
+		$autozoom = empty ($gmap ['autozoom']) ? $this->getConf('autoZoomMap') : $gmap ['autozoom'];
+		$js .= "{mapOpts: {".$param.", displayformat: '".$this->getConf('displayformat')."', autozoom: ".$autozoom."}, poi: [$poi]};";
 		// unescape the json
-		$poitable = stripslashes ( $poitable );
+		$poitable = stripslashes($poitable);
 
-		return array (
+		return array(
 				$mapid,
 				$js,
 				$mainLat,
@@ -254,90 +254,90 @@ 
 		static $mapnumber = 0;
 
 		// dbglog($data, 'olmap::render() data.');
-		list ( $mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage ) = $data;
+		list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
 
 		if ($mode == 'xhtml') {
 			$olscript = '';
 			$olEnable = false;
 			$gscript = '';
-			$gEnable = $this->getConf ( 'enableGoogle' );
-			$stamenEnable = $this->getConf ( 'enableStamen' );
-			$osmEnable = $this->getConf ( 'enableOSM' );
-			$enableBing = $this->getConf ( 'enableBing' );
+			$gEnable = $this->getConf('enableGoogle');
+			$stamenEnable = $this->getConf('enableStamen');
+			$osmEnable = $this->getConf('enableOSM');
+			$enableBing = $this->getConf('enableBing');
 
 			$scriptEnable = '';
-			if (! $initialised) {
+			if (!$initialised) {
 				$initialised = true;
 				// render necessary script tags
 				if ($gEnable) {
-					$gscript = '<script charset="utf-8" defer="defer" src="//maps.google.com/maps/api/js?v=3.29&amp;key='.$this->getConf ( 'googleAPIkey' ).'"></script>';
+					$gscript = '<script charset="utf-8" defer="defer" src="//maps.google.com/maps/api/js?v=3.29&amp;key='.$this->getConf('googleAPIkey').'"></script>';
 				}
-				$olscript = '<script charset="utf-8" defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/lib/OpenLayers.js"></script>';
+				$olscript = '<script charset="utf-8" defer="defer" src="'.DOKU_BASE.'lib/plugins/openlayersmap/lib/OpenLayers.js"></script>';
 
 				$scriptEnable = '<script defer="defer" charset="utf-8" src="data:text/javascript;base64,';
 				$scriptSrc = $olscript ? 'olEnable = true;' : 'olEnable = false;';
-				$scriptSrc .= 'gEnable = ' . ($gEnable ? 'true' : 'false') . ';';
-				$scriptSrc .= 'osmEnable = ' . ($osmEnable ? 'true' : 'false') . ';';
-				$scriptSrc .= 'stamenEnable = ' . ($stamenEnable ? 'true' : 'false') . ';';
-				$scriptSrc .= 'bEnable = ' . ($enableBing ? 'true' : 'false') . ';';
-				$scriptSrc .= 'bApiKey="' . $this->getConf ( 'bingAPIKey' ) . '";';
-				$scriptSrc .= 'tfApiKey="' . $this->getConf ( 'tfApiKey' ) . '";';
-				$scriptSrc .= 'gApiKey="' . $this->getConf ( 'googleAPIkey' ) . '";';
+				$scriptSrc .= 'gEnable = '.($gEnable ? 'true' : 'false').';';
+				$scriptSrc .= 'osmEnable = '.($osmEnable ? 'true' : 'false').';';
+				$scriptSrc .= 'stamenEnable = '.($stamenEnable ? 'true' : 'false').';';
+				$scriptSrc .= 'bEnable = '.($enableBing ? 'true' : 'false').';';
+				$scriptSrc .= 'bApiKey="'.$this->getConf('bingAPIKey').'";';
+				$scriptSrc .= 'tfApiKey="'.$this->getConf('tfApiKey').'";';
+				$scriptSrc .= 'gApiKey="'.$this->getConf('googleAPIkey').'";';
 				$scriptEnable .= base64_encode($scriptSrc);
 				$scriptEnable .= '"></script>';
 			}
 			$renderer->doc .= "$gscript\n$olscript\n$scriptEnable";
-			$renderer->doc .= '<div class="olMapHelp">' . $this->locale_xhtml ( "help" ) . '</div>';
-			if ($this->getConf ( 'enableA11y' )) {
-				$renderer->doc .= '<div id="' . $mapid . '-static" class="olStaticMap">' . p_render ( $mode, p_get_instructions ( $staticImgUrl ), $info ) . '</div>';
+			$renderer->doc .= '<div class="olMapHelp">'.$this->locale_xhtml("help").'</div>';
+			if ($this->getConf('enableA11y')) {
+				$renderer->doc .= '<div id="'.$mapid.'-static" class="olStaticMap">'.p_render($mode, p_get_instructions($staticImgUrl), $info).'</div>';
 			}
-			$renderer->doc .= '<div id="' . $mapid . '-clearer" class="clearer"><p>&nbsp;</p></div>';
-			if ($this->getConf ( 'enableA11y' )) {
+			$renderer->doc .= '<div id="'.$mapid.'-clearer" class="clearer"><p>&nbsp;</p></div>';
+			if ($this->getConf('enableA11y')) {
 				// render a table of the POI for the print and a11y presentation, it is hidden using javascript
-				$renderer->doc .= '<div class="olPOItableSpan" id="' . $mapid . '-table-span">
-					<table class="olPOItable" id="' . $mapid . '-table">
-					<caption class="olPOITblCaption">' . $this->getLang ( 'olmapPOItitle' ) . '</caption>
+				$renderer->doc .= '<div class="olPOItableSpan" id="'.$mapid.'-table-span">
+					<table class="olPOItable" id="' . $mapid.'-table">
+					<caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle').'</caption>
 					<thead class="olPOITblHeader">
 					<tr>
 					<th class="rowId" scope="col">id</th>
-					<th class="icon" scope="col">' . $this->getLang ( 'olmapPOIicon' ) . '</th>
-					<th class="lat" scope="col" title="' . $this->getLang ( 'olmapPOIlatTitle' ) . '">' . $this->getLang ( 'olmapPOIlat' ) . '</th>
-					<th class="lon" scope="col" title="' . $this->getLang ( 'olmapPOIlonTitle' ) . '">' . $this->getLang ( 'olmapPOIlon' ) . '</th>
-					<th class="txt" scope="col">' . $this->getLang ( 'olmapPOItxt' ) . '</th>
+					<th class="icon" scope="col">' . $this->getLang('olmapPOIicon').'</th>
+					<th class="lat" scope="col" title="' . $this->getLang('olmapPOIlatTitle').'">'.$this->getLang('olmapPOIlat').'</th>
+					<th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle').'">'.$this->getLang('olmapPOIlon').'</th>
+					<th class="txt" scope="col">' . $this->getLang('olmapPOItxt').'</th>
 					</tr>
 					</thead>';
 				if ($poitabledesc != '') {
-					$renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">' . $poitabledesc . '</td></tr></tfoot>';
+					$renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">'.$poitabledesc.'</td></tr></tfoot>';
 				}
-				$renderer->doc .= '<tbody class="olPOITblBody">' . $poitable . '</tbody>
+				$renderer->doc .= '<tbody class="olPOITblBody">'.$poitable.'</tbody>
 					</table></div>';
 			}
 			// render inline mapscript parts
 			$renderer->doc .= '<script charset="utf-8" defer="defer" src="data:text/javascript;base64,';
 			$renderer->doc .= base64_encode("olMapData[$mapnumber] = $param");
 			$renderer->doc .= '"></script>';
-			$mapnumber ++;
+			$mapnumber++;
 			return true;
 		} elseif ($mode == 'metadata') {
-			if (! (($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) {
+			if (!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) {
 				// render geo metadata, unless they are the default
 				$renderer->meta ['geo'] ['lat'] = $mainLat;
 				$renderer->meta ['geo'] ['lon'] = $mainLon;
-				if ($geophp = &plugin_load ( 'helper', 'geophp' )) {
+				if ($geophp = &plugin_load('helper', 'geophp')) {
 					// if we have the geoPHP helper, add the geohash
 					// fails with older php versions.. $renderer->meta['geo']['geohash'] = (new Point($mainLon,$mainLat))->out('geohash');
-					$p = new Point ( $mainLon, $mainLat );
-					$renderer->meta ['geo'] ['geohash'] = $p->out ( 'geohash' );
+					$p = new Point($mainLon, $mainLat);
+					$renderer->meta ['geo'] ['geohash'] = $p->out('geohash');
 				}
 			}
 
-			if (($this->getConf ( 'enableA11y' )) && (! empty ( $_firstimage ))) {
+			if (($this->getConf('enableA11y')) && (!empty ($_firstimage))) {
 				// add map local image into relation/firstimage if not already filled and when it is a local image
 
 				global $ID;
-				$rel = p_get_metadata ( $ID, 'relation', METADATA_RENDER_USING_CACHE );
+				$rel = p_get_metadata($ID, 'relation', METADATA_RENDER_USING_CACHE);
 				$img = $rel ['firstimage'];
-				if (empty ( $img ) /* || $img == $_firstimage*/){
+				if (empty ($img) /* || $img == $_firstimage*/) {
 					//dbglog ( $_firstimage, 'olmap::render#rendering image relation metadata for _firstimage as $img was empty or the same.' );
 					// This seems to never work; the firstimage entry in the .meta file is empty
 					// $renderer->meta['relation']['firstimage'] = $_firstimage;
@@ -347,7 +347,7 @@ 
 					// p_set_metadata($ID, $relation, false, false);
 
 					// ... this works
-					$renderer->internalmedia ( $_firstimage, $poitabledesc );
+					$renderer->internalmedia($_firstimage, $poitabledesc);
 				}
 			}
 			return true;
@@ -363,21 +363,21 @@ 
 	 * @return array associative array of parameters key=>value
 	 */
 	private function _extract_params($str_params) {
-		$param = array ();
-		preg_match_all ( '/(\w*)="(.*?)"/us', $str_params, $param, PREG_SET_ORDER );
+		$param = array();
+		preg_match_all('/(\w*)="(.*?)"/us', $str_params, $param, PREG_SET_ORDER);
 		// parse match for instructions, break into key value pairs
 		$gmap = $this->dflt;
-		foreach ( $gmap as $key => &$value ) {
-			$defval = $this->getConf ( 'default_' . $key );
+		foreach ($gmap as $key => &$value) {
+			$defval = $this->getConf('default_'.$key);
 			if ($defval !== '') {
 				$value = $defval;
 			}
 		}
-		unset ( $value );
-		foreach ( $param as $kvpair ) {
-			list ( $match, $key, $val ) = $kvpair;
-			$key = strtolower ( $key );
-			if (isset ( $gmap [$key] )) {
+		unset ($value);
+		foreach ($param as $kvpair) {
+			list ($match, $key, $val) = $kvpair;
+			$key = strtolower($key);
+			if (isset ($gmap [$key])) {
 				if ($key == 'summary') {
 					// preserve case for summary field
 					$gmap [$key] = $val;
@@ -385,7 +385,7 @@ 
 					// preserve case for id field
 					$gmap [$key] = $val;
 				} else {
-					$gmap [$key] = strtolower ( $val );
+					$gmap [$key] = strtolower($val);
 				}
 			}
 		}
@@ -400,28 +400,28 @@ 
 	 * @return array multi-dimensional array of lat,lon,text triplets
 	 */
 	private function _extract_points($str_points) {
-		$point = array ();
+		$point = array();
 		// preg_match_all('/^([+-]?[0-9].*?),\s*([+-]?[0-9].*?),(.*?),(.*?),(.*?),(.*)$/um', $str_points, $point, PREG_SET_ORDER);
 		/*
 		 * group 1: ([+-]?[0-9]+(?:\.[0-9]*)?) group 2: ([+-]?[0-9]+(?:\.[0-9]*)?) group 3: (.*?) group 4: (.*?) group 5: (.*?) group 6: (.*)
 		 */
-		preg_match_all ( '/^([+-]?[0-9]+(?:\.[0-9]*)?),\s*([+-]?[0-9]+(?:\.[0-9]*)?),(.*?),(.*?),(.*?),(.*)$/um', $str_points, $point, PREG_SET_ORDER );
+		preg_match_all('/^([+-]?[0-9]+(?:\.[0-9]*)?),\s*([+-]?[0-9]+(?:\.[0-9]*)?),(.*?),(.*?),(.*?),(.*)$/um', $str_points, $point, PREG_SET_ORDER);
 		// create poi array
-		$overlay = array ();
-		foreach ( $point as $pt ) {
-			list ( $match, $lat, $lon, $angle, $opacity, $img, $text ) = $pt;
-			$lat = is_numeric ( $lat ) ? $lat : 0;
-			$lon = is_numeric ( $lon ) ? $lon : 0;
-			$angle = is_numeric ( $angle ) ? $angle : 0;
-			$opacity = is_numeric ( $opacity ) ? $opacity : 0.8;
+		$overlay = array();
+		foreach ($point as $pt) {
+			list ($match, $lat, $lon, $angle, $opacity, $img, $text) = $pt;
+			$lat = is_numeric($lat) ? $lat : 0;
+			$lon = is_numeric($lon) ? $lon : 0;
+			$angle = is_numeric($angle) ? $angle : 0;
+			$opacity = is_numeric($opacity) ? $opacity : 0.8;
 			// TODO validate using exist & set up default img?
-			$img = trim ( $img );
-			$text = p_get_instructions ( $text );
+			$img = trim($img);
+			$text = p_get_instructions($text);
 			// dbg ( $text );
-			$text = p_render ( "xhtml", $text, $info );
+			$text = p_render("xhtml", $text, $info);
 			// dbg ( $text );
-			$text = addslashes ( str_replace ( "\n", "", $text ) );
-			$overlay [] = array (
+			$text = addslashes(str_replace("\n", "", $text));
+			$overlay [] = array(
 					$lat,
 					$lon,
 					$text,
@@ -501,8 +501,8 @@ 
 	 * @param array $overlay
 	 */
 	private function _getGoogle($gmap, $overlay) {
-		$sUrl = $this->getConf ( 'iconUrlOverload' );
-		if (! $sUrl) {
+		$sUrl = $this->getConf('iconUrlOverload');
+		if (!$sUrl) {
 			$sUrl = DOKU_URL;
 		}
 		switch ($gmap ['baselyr']) {
@@ -525,27 +525,27 @@ 
 		// see: https://developers.google.com/maps/documentation/staticmaps/index#Viewports
 		// http://maps.google.com/maps/api/staticmap?center=51.565690,5.456756&zoom=16&size=600x400&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/marker.png|label:1|51.565690,5.456756&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/marker-blue.png|51.566197,5.458966|label:2&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.567177,5.457909|label:3&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.566283,5.457330|label:4&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.565630,5.457695|label:5&sensor=false&format=png&maptype=roadmap
 		$imgUrl = "http://maps.googleapis.com/maps/api/staticmap?";
-		$imgUrl .= "&size=" . str_replace ( "px", "", $gmap ['width'] ) . "x" . str_replace ( "px", "", $gmap ['height'] );
+		$imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x".str_replace("px", "", $gmap ['height']);
 		//if (!$this->getConf( 'autoZoomMap')) { // no need for center & zoom params }
-		$imgUrl .= "&center=" . $gmap ['lat'] . "," . $gmap ['lon'];
+		$imgUrl .= "&center=".$gmap ['lat'].",".$gmap ['lon'];
 		// max is 21 (== building scale), but that's overkill..
 		if ($gmap ['zoom'] > 17) {
 			$imgUrl .= "&zoom=17";
 		} else {
-			$imgUrl .= "&zoom=" . $gmap ['zoom'];
+			$imgUrl .= "&zoom=".$gmap ['zoom'];
 		}
-		if (! empty ( $overlay )) {
+		if (!empty ($overlay)) {
 			$rowId = 0;
-			foreach ( $overlay as $data ) {
-				list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
-				$imgUrl .= "&markers=icon%3a" . $sUrl . "lib/plugins/openlayersmap/icons/" . $img . "%7c" . $lat . "," . $lon . "%7clabel%3a" . ++ $rowId;
+			foreach ($overlay as $data) {
+				list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
+				$imgUrl .= "&markers=icon%3a".$sUrl."lib/plugins/openlayersmap/icons/".$img."%7c".$lat.",".$lon."%7clabel%3a".++ $rowId;
 			}
 		}
-		$imgUrl .= "&format=png&maptype=" . $maptype;
+		$imgUrl .= "&format=png&maptype=".$maptype;
 		global $conf;
-		$imgUrl .= "&language=" . $conf ['lang'];
-		if ($this->getConf( 'googleAPIkey' )) {
-			$imgUrl .= "&key=" . $this->getConf( 'googleAPIkey' );
+		$imgUrl .= "&language=".$conf ['lang'];
+		if ($this->getConf('googleAPIkey')) {
+			$imgUrl .= "&key=".$this->getConf('googleAPIkey');
 		}
 		// dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::_getGoogle: Google image url is:');
 		return $imgUrl;
@@ -575,26 +575,26 @@ 
 				$maptype = 'Road';
 				break;
 		}
-		$imgUrl = "http://dev.virtualearth.net/REST/v1/Imagery/Map/" . $maptype;// . "/";
-		if ($this->getConf ( 'autoZoomMap' )) {
-			$bbox = $this->_calcBBOX ( $overlay, $gmap ['lat'], $gmap ['lon'] );
+		$imgUrl = "http://dev.virtualearth.net/REST/v1/Imagery/Map/".$maptype; // . "/";
+		if ($this->getConf('autoZoomMap')) {
+			$bbox = $this->_calcBBOX($overlay, $gmap ['lat'], $gmap ['lon']);
 			//$imgUrl .= "?ma=" . $bbox ['minlat'] . "," . $bbox ['minlon'] . "," . $bbox ['maxlat'] . "," . $bbox ['maxlon'];
-			$imgUrl .= "?ma=" . $bbox ['minlat'] . "%2C" . $bbox ['minlon'] . "%2C" . $bbox ['maxlat'] . "%2C" . $bbox ['maxlon'];
+			$imgUrl .= "?ma=".$bbox ['minlat']."%2C".$bbox ['minlon']."%2C".$bbox ['maxlat']."%2C".$bbox ['maxlon'];
 			$imgUrl .= "&dcl=1";
 		}
-		if (strpos ( $imgUrl, "?" ) === false)
+		if (strpos($imgUrl, "?") === false)
 			$imgUrl .= "?";
 
 		//$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," . str_replace ( "px", "", $gmap ['height'] );
-		$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "%2C" . str_replace ( "px", "", $gmap ['height'] );
-		$imgUrl .= "&key=" . $this->getConf ( 'bingAPIKey' );
-		if (! empty ( $overlay )) {
+		$imgUrl .= "&ms=".str_replace("px", "", $gmap ['width'])."%2C".str_replace("px", "", $gmap ['height']);
+		$imgUrl .= "&key=".$this->getConf('bingAPIKey');
+		if (!empty ($overlay)) {
 			$rowId = 0;
-			foreach ( $overlay as $data ) {
-				list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
+			foreach ($overlay as $data) {
+				list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
 				// TODO icon style lookup, see: http://msdn.microsoft.com/en-us/library/ff701719.aspx for iconStyle
 				$iconStyle = 32;
-				$rowId ++;
+				$rowId++;
 				// NOTE: the max number of pushpins is 18! or we have to use POST (http://msdn.microsoft.com/en-us/library/ff701724.aspx)
 				if ($rowId == 18) {
 					break;
@@ -606,7 +606,7 @@ 
 		}
 		global $conf;
 		$imgUrl .= "&fmt=png";
-		$imgUrl .= "&c=" . $conf ['lang'];
+		$imgUrl .= "&c=".$conf ['lang'];
 		// dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::_getBing: bing image url is:');
 		return $imgUrl;
 	}
@@ -623,22 +623,22 @@ 
 	private function _getStaticOSM($gmap, $overlay) {
 		global $conf;
 
-		if ($this->getConf ( 'optionStaticMapGenerator' ) == 'local') {
+		if ($this->getConf('optionStaticMapGenerator') == 'local') {
 			// using local basemap composer
-			if (! $myMap = &plugin_load ( 'helper', 'openlayersmap_staticmap' )) {
-				dbglog ( $myMap, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: openlayersmap_staticmap plugin is not available.' );
+			if (!$myMap = &plugin_load('helper', 'openlayersmap_staticmap')) {
+				dbglog($myMap, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: openlayersmap_staticmap plugin is not available.');
 			}
-			if (! $geophp = &plugin_load ( 'helper', 'geophp' )) {
-				dbglog ( $geophp, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: geophp plugin is not available.' );
+			if (!$geophp = &plugin_load('helper', 'geophp')) {
+				dbglog($geophp, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: geophp plugin is not available.');
 			}
-			$size = str_replace ( "px", "", $gmap ['width'] ) . "x" . str_replace ( "px", "", $gmap ['height'] );
+			$size = str_replace("px", "", $gmap ['width'])."x".str_replace("px", "", $gmap ['height']);
 
 			$markers = array();
-			if (! empty ( $overlay )) {
-				foreach ( $overlay as $data ) {
-					list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
-					$iconStyle = substr ( $img, 0, strlen ( $img ) - 4 );
-					$markers [] = array (
+			if (!empty ($overlay)) {
+				foreach ($overlay as $data) {
+					list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
+					$iconStyle = substr($img, 0, strlen($img) - 4);
+					$markers [] = array(
 							'lat' => $lat,
 							'lon' => $lon,
 							'type' => $iconStyle
@@ -654,19 +654,19 @@ 
 					break;
 				case 'transport' :
 					$maptype = 'transport';
-					$apikey = $this->getConf ( 'tfApiKey' );
+					$apikey = $this->getConf('tfApiKey');
 					break;
 				case 'landscape' :
 					$maptype = 'landscape';
-					$apikey = $this->getConf ( 'tfApiKey' );
+					$apikey = $this->getConf('tfApiKey');
 					break;
 				case 'outdoors' :
 					$maptype = 'outdoors';
-					$apikey = $this->getConf ( 'tfApiKey' );
+					$apikey = $this->getConf('tfApiKey');
 					break;
 				case 'cycle map' :
 					$maptype = 'cycle';
-					$apikey = $this->getConf ( 'tfApiKey' );
+					$apikey = $this->getConf('tfApiKey');
 					break;
 				case 'hike and bike map' :
 					$maptype = 'hikeandbike';
@@ -681,33 +681,33 @@ 
 					break;
 			}
 
-			$result = $myMap->getMap ( $gmap ['lat'], $gmap ['lon'], $gmap ['zoom'], $size, $maptype, $markers, $gmap ['gpxfile'], $gmap ['kmlfile'], $gmap ['geojsonfile'] );
+			$result = $myMap->getMap($gmap ['lat'], $gmap ['lon'], $gmap ['zoom'], $size, $maptype, $markers, $gmap ['gpxfile'], $gmap ['kmlfile'], $gmap ['geojsonfile']);
 		} else {
 			// using external basemap composer
 
 			// http://staticmap.openstreetmap.de/staticmap.php?center=47.000622235634,10.117187497601&zoom=5&size=500x350
 			// &markers=48.999812532766,8.3593749976708,lightblue1|43.154850037315,17.499999997306,lightblue1|49.487527053077,10.820312497573,ltblu-pushpin|47.951071133739,15.917968747369,ol-marker|47.921629720114,18.027343747285,ol-marker-gold|47.951071133739,19.257812497236,ol-marker-blue|47.180141361692,19.257812497236,ol-marker-green
 			$imgUrl = "http://staticmap.openstreetmap.de/staticmap.php";
-			$imgUrl .= "?center=" . $gmap ['lat'] . "," . $gmap ['lon'];
-			$imgUrl .= "&size=" . str_replace ( "px", "", $gmap ['width'] ) . "x" . str_replace ( "px", "", $gmap ['height'] );
+			$imgUrl .= "?center=".$gmap ['lat'].",".$gmap ['lon'];
+			$imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x".str_replace("px", "", $gmap ['height']);
 
 			if ($gmap ['zoom'] > 16) {
 				// actually this could even be 18, but that seems overkill
 				$imgUrl .= "&zoom=16";
 			} else {
-				$imgUrl .= "&zoom=" . $gmap ['zoom'];
+				$imgUrl .= "&zoom=".$gmap ['zoom'];
 			}
 
-			if (! empty ( $overlay )) {
+			if (!empty ($overlay)) {
 				$rowId = 0;
 				$imgUrl .= "&markers=";
-				foreach ( $overlay as $data ) {
-					list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
-					$rowId ++;
+				foreach ($overlay as $data) {
+					list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
+					$rowId++;
 					$iconStyle = "lightblue$rowId";
 					$imgUrl .= "$lat,$lon,$iconStyle%7c";
 				}
-				$imgUrl = substr ( $imgUrl, 0, - 3 );
+				$imgUrl = substr($imgUrl, 0, - 3);
 			}
 
 			$result = $imgUrl;
@@ -730,21 +730,21 @@ 
 	private function _calcBBOX($overlay, $lat, $lon) {
 		$lats = array($lat);
 		$lons = array($lon);
-		foreach ( $overlay as $data ) {
-			list ( $lat, $lon, $text, $angle, $opacity, $img ) = $data;
+		foreach ($overlay as $data) {
+			list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
 			$lats [] = $lat;
 			$lons [] = $lon;
 		}
-		sort ( $lats );
-		sort ( $lons );
+		sort($lats);
+		sort($lons);
 		// TODO: make edge/wrap around cases work
-		$centerlat = $lats [0] + ($lats [count ( $lats ) - 1] - $lats [0]);
-		$centerlon = $lons [0] + ($lons [count ( $lats ) - 1] - $lons [0]);
-		return array (
+		$centerlat = $lats [0] + ($lats [count($lats) - 1] - $lats [0]);
+		$centerlon = $lons [0] + ($lons [count($lats) - 1] - $lons [0]);
+		return array(
 				'minlat' => $lats [0],
 				'minlon' => $lons [0],
-				'maxlat' => $lats [count ( $lats ) - 1],
-				'maxlon' => $lons [count ( $lats ) - 1],
+				'maxlat' => $lats [count($lats) - 1],
+				'maxlon' => $lons [count($lats) - 1],
 				'centerlat' => $centerlat,
 				'centerlon' => $centerlon
 		);
@@ -756,12 +756,12 @@ 
 	 * @param String $mediaLink
 	 */
 	private function getFileName($mediaLink) {
-		$mediaLink = str_replace ( '[[', '', $mediaLink );
-		$mediaLink = str_replace ( ']]', '', $mediaLink );
-		$mediaLink = substr ( $mediaLink, 0, - 4 );
-		$parts = explode ( ':', $mediaLink );
-		$mediaLink = end ( $parts );
-		return str_replace ( '_', ' ', $mediaLink );
+		$mediaLink = str_replace('[[', '', $mediaLink);
+		$mediaLink = str_replace(']]', '', $mediaLink);
+		$mediaLink = substr($mediaLink, 0, - 4);
+		$parts = explode(':', $mediaLink);
+		$mediaLink = end($parts);
+		return str_replace('_', ' ', $mediaLink);
 	}
 
 	/**
@@ -772,11 +772,11 @@ 
 	 * @return string dms
 	 */
 	private function _convertDDtoDMS($decimaldegrees) {
-		$dms = floor ( $decimaldegrees );
+		$dms = floor($decimaldegrees);
 		$secs = ($decimaldegrees - $dms) * 3600;
-		$min = floor ( $secs / 60 );
-		$sec = round ( $secs - ($min * 60), 3 );
-		$dms .= 'º' . $min . '\'' . $sec . '"';
+		$min = floor($secs / 60);
+		$sec = round($secs - ($min * 60), 3);
+		$dms .= 'º'.$min.'\''.$sec.'"';
 		return $dms;
 	}
 
@@ -788,13 +788,13 @@ 
 	 * @return string
 	 */
 	private function convertLat($decimaldegrees) {
-		if (strpos ( $decimaldegrees, '-' ) !== false) {
+		if (strpos($decimaldegrees, '-') !== false) {
 			$latPos = "S";
 		} else {
 			$latPos = "N";
 		}
-		$dms = $this->_convertDDtoDMS ( abs ( floatval ( $decimaldegrees ) ) );
-		return hsc ( $dms . $latPos );
+		$dms = $this->_convertDDtoDMS(abs(floatval($decimaldegrees)));
+		return hsc($dms.$latPos);
 	}
 
 	/**
@@ -805,12 +805,12 @@ 
 	 * @return string
 	 */
 	private function convertLon($decimaldegrees) {
-		if (strpos ( $decimaldegrees, '-' ) !== false) {
+		if (strpos($decimaldegrees, '-') !== false) {
 			$lonPos = "W";
 		} else {
 			$lonPos = "E";
 		}
-		$dms = $this->_convertDDtoDMS ( abs ( floatval ( $decimaldegrees ) ) );
-		return hsc ( $dms . $lonPos );
+		$dms = $this->_convertDDtoDMS(abs(floatval($decimaldegrees)));
+		return hsc($dms.$lonPos);
 	}
 }

Braces +7 added lines, -4 removed lines

@@ -14,10 +14,12 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (! defined ( 'DOKU_INC' )) {
 	define ( 'DOKU_INC', realpath ( dirname ( __FILE__ ) . '/../../' ) . '/' );
-if (! defined ( 'DOKU_PLUGIN' ))
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
 	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 require_once (DOKU_PLUGIN . 'syntax.php');
 
 /**
@@ -582,8 +584,9 @@ 
 			$imgUrl .= "?ma=" . $bbox ['minlat'] . "%2C" . $bbox ['minlon'] . "%2C" . $bbox ['maxlat'] . "%2C" . $bbox ['maxlon'];
 			$imgUrl .= "&dcl=1";
 		}
-		if (strpos ( $imgUrl, "?" ) === false)
-			$imgUrl .= "?";
+		if (strpos ( $imgUrl, "?" ) === false) {
+					$imgUrl .= "?";
+		}
 
 		//$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," . str_replace ( "px", "", $gmap ['height'] );
 		$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "%2C" . str_replace ( "px", "", $gmap ['height'] );

helper/staticmap.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 if (!defined('DOKU_INC')) die();
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
 require_once DOKU_PLUGIN.'openlayersmap/StaticMap.php';
 /**
  * DokuWiki Plugin openlayersmap (staticmap Helper Component).
@@ -34,7 +34,7 @@ 
 	 *
 	 * @return array Information to all provided methods.
 	 */
-	function getMethods(){
+	function getMethods() {
 		$result = array();
 		$result[] = array(
 				'name'   => 'getMap',
@@ -71,19 +71,19 @@ 
 	 *
 	 * @return the media id url
 	 */
-	public function getMap($lat, $lon, $zoom, $size, $maptype, $markers, $gpx, $kml, $geojson, $apikey = ''){
+	public function getMap($lat, $lon, $zoom, $size, $maptype, $markers, $gpx, $kml, $geojson, $apikey = '') {
 		global $conf;
 		// dbglog($markers,'helper_plugin_openlayersmap_staticmap::getMap: markers :');
 
 		// normalize zoom
-		$zoom = $zoom?intval($zoom):0;
-		if($zoom > 18) $zoom = 18;
+		$zoom = $zoom ?intval($zoom) : 0;
+		if ($zoom > 18) $zoom = 18;
 		// normalize WxH
-		list($width, $height) = explode('x',$size);
+		list($width, $height) = explode('x', $size);
 		$width = intval($width);
-		if($width > $this->maxWidth) $width = $this->maxWidth;
+		if ($width > $this->maxWidth) $width = $this->maxWidth;
 		$height = intval($height);
-		if($height > $this->maxHeight) $height = $this->maxHeight;
+		if ($height > $this->maxHeight) $height = $this->maxHeight;
 
 		// cleanup/validate gpx/kml
 		$kml = $this->mediaIdToPath($kml);
@@ -100,14 +100,14 @@ 
 		);
 
 		// return the media id url
-		$mediaId = str_replace('/', ':',  $map->getMap());
+		$mediaId = str_replace('/', ':', $map->getMap());
 		// 	if($this->startsWith($mediaId,':')) {
 		// 		$mediaId = substr($mediaId, 1);
 		// 	}
 		return $mediaId;
 	}
 
-	private function startsWith($haystack, $needle)	{
+	private function startsWith($haystack, $needle) {
 		$length = strlen($needle);
 		return (substr($haystack, 0, $length) === $needle);
 	}
@@ -117,17 +117,17 @@ 
 	 * @param string $id the DW media id
 	 * @return the path to the file
 	 */
-	private function mediaIdToPath($id){
+	private function mediaIdToPath($id) {
 		global $conf;
-		if(empty($id)) {
+		if (empty($id)) {
 			return "";
 		}
-		$id=str_replace("[[","",$id);
-		$id=str_replace("]]","",$id);
-		if($this->startsWith($id,':')) {
+		$id = str_replace("[[", "", $id);
+		$id = str_replace("]]", "", $id);
+		if ($this->startsWith($id, ':')) {
 			$id = substr($id, 1);
 		}
-		$id=str_replace(":","/",$id);
+		$id = str_replace(":", "/", $id);
 		return $conf['mediadir'].'/'.$id;
 	}
 }

Braces +15 added lines, -5 removed lines

@@ -14,8 +14,12 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (!defined('DOKU_INC')) die();
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+if (!defined('DOKU_INC')) {
+	die();
+}
+if (!defined('DOKU_PLUGIN')) {
+	define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+}
 require_once DOKU_PLUGIN.'openlayersmap/StaticMap.php';
 /**
  * DokuWiki Plugin openlayersmap (staticmap Helper Component).
@@ -77,13 +81,19 @@ 
 
 		// normalize zoom
 		$zoom = $zoom?intval($zoom):0;
-		if($zoom > 18) $zoom = 18;
+		if($zoom > 18) {
+			$zoom = 18;
+		}
 		// normalize WxH
 		list($width, $height) = explode('x',$size);
 		$width = intval($width);
-		if($width > $this->maxWidth) $width = $this->maxWidth;
+		if($width > $this->maxWidth) {
+			$width = $this->maxWidth;
+		}
 		$height = intval($height);
-		if($height > $this->maxHeight) $height = $this->maxHeight;
+		if($height > $this->maxHeight) {
+			$height = $this->maxHeight;
+		}
 
 		// cleanup/validate gpx/kml
 		$kml = $this->mediaIdToPath($kml);

lang/es/settings.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 $lang['enableBing'] = 'Habilita Bing como proveedor de mapas';
 $lang['enableOSM'] = 'Habilita OpenStreetMap como proveedor de mapas';
 $lang['enableA11y'] = 'Habilita a11y/print para mapa estático, tabla de nombres';
-$lang['optionStaticMapGenerator']='FIXME (translate)- Local or remote static map compiler. <b>Using \'local\' fails when the server can\'t go on the internet.</b>';
+$lang['optionStaticMapGenerator'] = 'FIXME (translate)- Local or remote static map compiler. <b>Using \'local\' fails when the server can\'t go on the internet.</b>';
 $lang['autoZoomMap'] = 'FIXME (translate)- Enable auto zoom for the fallback map';
 $lang['displayformat'] = 'FIXME (translate)- Coordinates display format; decimal degrees or degrees, minutes, seconds';
 $lang['default_width'] = 'Default map width';

lang/fr/settings.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 $lang['enableBing'] = 'Activer l\'utilisation de Bing comme fournisseur de base de données cartographiques';
 $lang['enableOSM'] = 'Activer l\'utilisation d\'OpenStreetMap comme fournisseur de base de données cartographiques';
 $lang['enableA11y'] = 'Activer a11y/Sortie d\'impression (carte statique, table des légendes)';
-$lang['optionStaticMapGenerator']='Compilateur de cartes statiques local ou distant. <b>L\'utilisation de \'local\' échoue lorsque le serveur ne peut pas accéder à Internet.</b>';
+$lang['optionStaticMapGenerator'] = 'Compilateur de cartes statiques local ou distant. <b>L\'utilisation de \'local\' échoue lorsque le serveur ne peut pas accéder à Internet.</b>';
 $lang['autoZoomMap'] = 'Activer le zoom automatique pour la carte de secours';
 $lang['displayformat'] = 'Format d\'affichage des coordonnées; degrés décimaux ou degrés, minutes, secondes';
 $lang['default_width'] = 'Default map width';

lang/nl/settings.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 $lang['enableBing'] = 'Maak gebruik van Bing als basiskaart mogelijk';
 $lang['enableOSM'] = 'Maak gebruik van OpenStreetMap als basiskaart mogelijk';
 $lang['enableA11y'] = 'Maak a11y/print output (statische kaart, legenda tabel) mogelijk';
-$lang['optionStaticMapGenerator']='Lokale of externe statische kaart generator. <b>Gebruik van \'local\' faalt als de webserver het internet niet op kan.</b>';
+$lang['optionStaticMapGenerator'] = 'Lokale of externe statische kaart generator. <b>Gebruik van \'local\' faalt als de webserver het internet niet op kan.</b>';
 $lang['autoZoomMap'] = 'Zet automatisch zoomen aan voor de terugvalkaart';
 $lang['displayformat'] = 'Coördinaten weergave formaat; decimale graden of graden, minuten, seconden';
 $lang['default_width'] = 'Default map width';

lang/ru/settings.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 $lang['enableBing'] = 'Разрешить использование Bing как провайдера карт';
 $lang['enableOSM'] = 'Разрешить использование OpenStreetMap как провайдера карт';
 $lang['enableA11y'] = 'Разрешить вывод a11y/print (статическая карта, таблица с легендой)';
-$lang['optionStaticMapGenerator']='Локальное (local) или удалённое (remote) хранилище статических карт. <b>Локальное хранилище не будет работать, если сервер не подключён к интернету.</b>';
+$lang['optionStaticMapGenerator'] = 'Локальное (local) или удалённое (remote) хранилище статических карт. <b>Локальное хранилище не будет работать, если сервер не подключён к интернету.</b>';
 $lang['autoZoomMap'] = 'Разрешить автоматическое масштабирование для выпадающей карты';
 $lang['displayformat'] = 'Формат отображения координат: DD - градусы с дробной частью, DMS - градусы, минуты, секунды';
 $lang['default_width'] = 'Ширина карты по умолчанию';

lang/en/settings.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 $lang['enableBing'] = 'Enable the use of Bing as basemap provider';
 $lang['enableOSM'] = 'Enable the use of OpenStreetMap as basemap provider';
 $lang['enableA11y'] = 'Enable a11y/print output (static map, legend table)';
-$lang['optionStaticMapGenerator']='Local or remote static map compiler. <b>Using \'local\' fails when the server can\'t go on the internet.</b>';
+$lang['optionStaticMapGenerator'] = 'Local or remote static map compiler. <b>Using \'local\' fails when the server can\'t go on the internet.</b>';
 $lang['autoZoomMap'] = 'Enable auto zoom for the fallback map';
 $lang['displayformat'] = 'Coordinates display format; decimal degrees or degrees, minutes, seconds';
 $lang['default_width'] = 'Default map width';

_test/general.test.php

Indentation +35 added lines, -35 removed lines

@@ -24,44 +24,44 @@
  */
 class general_plugin_openlayersmap_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('openlayersmap','geophp');
+	protected $pluginsEnabled = array('openlayersmap','geophp');
 
-    /**
-     * Simple test to make sure the plugin.info.txt is in correct format
-     */
-    public function test_plugininfo() {
-        $file = __DIR__.'/../plugin.info.txt';
-        $this->assertFileExists($file);
+	/**
+	 * Simple test to make sure the plugin.info.txt is in correct format
+	 */
+	public function test_plugininfo() {
+		$file = __DIR__.'/../plugin.info.txt';
+		$this->assertFileExists($file);
 
-        $info = confToHash($file);
+		$info = confToHash($file);
 
-        $this->assertArrayHasKey('base', $info);
-        $this->assertArrayHasKey('author', $info);
-        $this->assertArrayHasKey('email', $info);
-        $this->assertArrayHasKey('date', $info);
-        $this->assertArrayHasKey('name', $info);
-        $this->assertArrayHasKey('desc', $info);
-        $this->assertArrayHasKey('url', $info);
+		$this->assertArrayHasKey('base', $info);
+		$this->assertArrayHasKey('author', $info);
+		$this->assertArrayHasKey('email', $info);
+		$this->assertArrayHasKey('date', $info);
+		$this->assertArrayHasKey('name', $info);
+		$this->assertArrayHasKey('desc', $info);
+		$this->assertArrayHasKey('url', $info);
 
-        $this->assertEquals('openlayersmap', $info['base']);
-        $this->assertRegExp('/^https?:\/\//', $info['url']);
-        $this->assertTrue(mail_isvalid($info['email']));
-        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
-        $this->assertTrue(false !== strtotime($info['date']));
-    }
+		$this->assertEquals('openlayersmap', $info['base']);
+		$this->assertRegExp('/^https?:\/\//', $info['url']);
+		$this->assertTrue(mail_isvalid($info['email']));
+		$this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+		$this->assertTrue(false !== strtotime($info['date']));
+	}
 
-    /**
-     * test if plugin is loaded.
-     */
-    public function test_plugin_openlayersmap_isloaded() {
-        global $plugin_controller;
-        $this->assertTrue(
-                    in_array('geophp', $plugin_controller->getList()),
-                    "geophp plugin is loaded"
-                            );
-        $this->assertTrue(
-                    in_array('openlayersmap', $plugin_controller->getList()),
-                    "openlayersmap plugin is loaded"
-                            );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	public function test_plugin_openlayersmap_isloaded() {
+		global $plugin_controller;
+		$this->assertTrue(
+					in_array('geophp', $plugin_controller->getList()),
+					"geophp plugin is loaded"
+							);
+		$this->assertTrue(
+					in_array('openlayersmap', $plugin_controller->getList()),
+					"openlayersmap plugin is loaded"
+							);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  */
 class general_plugin_openlayersmap_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('openlayersmap','geophp');
+    protected $pluginsEnabled = array('openlayersmap', 'geophp');
 
     /**
      * Simple test to make sure the plugin.info.txt is in correct format