mprins / dokuwiki-plugin-openlayersmap

admin/purge.php

Indentation +87 added lines, -87 removed lines

@@ -24,98 +24,98 @@
  * @author Mark Prins
  */
 class admin_plugin_openlayersmap_purge extends DokuWiki_Admin_Plugin {
-    /**
-     * (non-PHPdoc)
-     * @see DokuWiki_Admin_Plugin::getMenuSort()
-     */
-    public function getMenuSort(): int {
-        return 800;
-    }
+	/**
+	 * (non-PHPdoc)
+	 * @see DokuWiki_Admin_Plugin::getMenuSort()
+	 */
+	public function getMenuSort(): int {
+		return 800;
+	}
 
-    /**
-     * (non-PHPdoc)
-     * @see DokuWiki_Admin_Plugin::forAdminOnly()
-     */
-    public function forAdminOnly(): bool {
-        return true;
-    }
+	/**
+	 * (non-PHPdoc)
+	 * @see DokuWiki_Admin_Plugin::forAdminOnly()
+	 */
+	public function forAdminOnly(): bool {
+		return true;
+	}
 
-    /**
-     * (non-PHPdoc)
-     * @see DokuWiki_Admin_Plugin::handle()
-     */
-    public function handle() {
-        global $conf;
-        if(!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
-        if(isset($_REQUEST['purgetiles'])) {
-            $path = $conf['cachedir'] . '/olmaptiles';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'), 0);
-        }
-        if(isset($_REQUEST['purgemaps'])) {
-            $path = $conf['mediadir'] . '/olmapmaps';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'), 0);
-        }
-    }
+	/**
+	 * (non-PHPdoc)
+	 * @see DokuWiki_Admin_Plugin::handle()
+	 */
+	public function handle() {
+		global $conf;
+		if(!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
+		if(isset($_REQUEST['purgetiles'])) {
+			$path = $conf['cachedir'] . '/olmaptiles';
+			if($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'), 0);
+		}
+		if(isset($_REQUEST['purgemaps'])) {
+			$path = $conf['mediadir'] . '/olmapmaps';
+			if($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'), 0);
+		}
+	}
 
-    /**
-     * Recursively delete the directory.
-     * @param string $sDir directory path
-     * @return boolean true when succesful
-     */
-    private function rrmdir($sDir): bool {
-        if(is_dir($sDir)) {
-            dbglog($sDir, 'admin_plugin_openlayersmap_purge::rrmdir: recursively removing path: ');
-            $sDir = rtrim($sDir, '/');
-            $oDir = dir($sDir);
-            while(($sFile = $oDir->read()) !== false) {
-                if($sFile != '.' && $sFile != '..') {
-                    (!is_link("$sDir/$sFile") && is_dir("$sDir/$sFile")) ?
-                        $this->rrmdir("$sDir/$sFile") : unlink("$sDir/$sFile");
-                }
-            }
-            $oDir->close();
-            rmdir($sDir);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Recursively delete the directory.
+	 * @param string $sDir directory path
+	 * @return boolean true when succesful
+	 */
+	private function rrmdir($sDir): bool {
+		if(is_dir($sDir)) {
+			dbglog($sDir, 'admin_plugin_openlayersmap_purge::rrmdir: recursively removing path: ');
+			$sDir = rtrim($sDir, '/');
+			$oDir = dir($sDir);
+			while(($sFile = $oDir->read()) !== false) {
+				if($sFile != '.' && $sFile != '..') {
+					(!is_link("$sDir/$sFile") && is_dir("$sDir/$sFile")) ?
+						$this->rrmdir("$sDir/$sFile") : unlink("$sDir/$sFile");
+				}
+			}
+			$oDir->close();
+			rmdir($sDir);
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * (non-PHPdoc)
-     * @see DokuWiki_Admin_Plugin::html()
-     */
-    public function html() {
-        echo $this->locale_xhtml('admin_intro');
-        $form = new Doku_Form(array('id' => 'olmap_purgeform', 'method' => 'post'));
-        $form->addHidden('continue', 'go');
+	/**
+	 * (non-PHPdoc)
+	 * @see DokuWiki_Admin_Plugin::html()
+	 */
+	public function html() {
+		echo $this->locale_xhtml('admin_intro');
+		$form = new Doku_Form(array('id' => 'olmap_purgeform', 'method' => 'post'));
+		$form->addHidden('continue', 'go');
 
-        $form->startFieldset($this->getLang('admin_tiles'));
-        $form->addElement('<p>');
-        $form->addElement(
-            '<input id="purgetiles" name="purgetiles" type="checkbox" value="1" class="checkbox" />'
-        );
-        $form->addElement(
-            '<label for="purgetiles" class="label">' . $this->getLang('admin_purge_tiles')
-            . '</label>'
-        );
-        $form->addElement('</p>');
-        $form->endFieldset();
+		$form->startFieldset($this->getLang('admin_tiles'));
+		$form->addElement('<p>');
+		$form->addElement(
+			'<input id="purgetiles" name="purgetiles" type="checkbox" value="1" class="checkbox" />'
+		);
+		$form->addElement(
+			'<label for="purgetiles" class="label">' . $this->getLang('admin_purge_tiles')
+			. '</label>'
+		);
+		$form->addElement('</p>');
+		$form->endFieldset();
 
-        $form->startFieldset($this->getLang('admin_maps'));
-        $form->addElement('<p>');
-        $form->addElement('<input id="purgemaps" name="purgemaps" type="checkbox" value="1" class="checkbox" />');
-        $form->addElement(
-            '<label for="purgemaps" class="label">' . $this->getLang('admin_purge_maps') . '</label>'
-        );
-        $form->addElement('</p>');
-        $form->endFieldset();
+		$form->startFieldset($this->getLang('admin_maps'));
+		$form->addElement('<p>');
+		$form->addElement('<input id="purgemaps" name="purgemaps" type="checkbox" value="1" class="checkbox" />');
+		$form->addElement(
+			'<label for="purgemaps" class="label">' . $this->getLang('admin_purge_maps') . '</label>'
+		);
+		$form->addElement('</p>');
+		$form->endFieldset();
 
-        $form->addElement(
-            form_makeButton(
-                'submit', 'admin', $this->getLang('admin_submit'),
-                array('accesskey' => 'p', 'title' => $this->getLang('admin_submit'))
-            )
-        );
-        $form->printForm();
-    }
+		$form->addElement(
+			form_makeButton(
+				'submit', 'admin', $this->getLang('admin_submit'),
+				array('accesskey' => 'p', 'title' => $this->getLang('admin_submit'))
+			)
+		);
+		$form->printForm();
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -46,14 +46,14 @@ 
      */
     public function handle() {
         global $conf;
-        if(!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
-        if(isset($_REQUEST['purgetiles'])) {
-            $path = $conf['cachedir'] . '/olmaptiles';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'), 0);
+        if (!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
+        if (isset($_REQUEST['purgetiles'])) {
+            $path = $conf['cachedir'].'/olmaptiles';
+            if ($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'), 0);
         }
-        if(isset($_REQUEST['purgemaps'])) {
-            $path = $conf['mediadir'] . '/olmapmaps';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'), 0);
+        if (isset($_REQUEST['purgemaps'])) {
+            $path = $conf['mediadir'].'/olmapmaps';
+            if ($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'), 0);
         }
     }
 
@@ -63,12 +63,12 @@ 
      * @return boolean true when succesful
      */
     private function rrmdir($sDir): bool {
-        if(is_dir($sDir)) {
+        if (is_dir($sDir)) {
             dbglog($sDir, 'admin_plugin_openlayersmap_purge::rrmdir: recursively removing path: ');
             $sDir = rtrim($sDir, '/');
             $oDir = dir($sDir);
-            while(($sFile = $oDir->read()) !== false) {
-                if($sFile != '.' && $sFile != '..') {
+            while (($sFile = $oDir->read()) !== false) {
+                if ($sFile != '.' && $sFile != '..') {
                     (!is_link("$sDir/$sFile") && is_dir("$sDir/$sFile")) ?
                         $this->rrmdir("$sDir/$sFile") : unlink("$sDir/$sFile");
                 }
@@ -95,7 +95,7 @@ 
             '<input id="purgetiles" name="purgetiles" type="checkbox" value="1" class="checkbox" />'
         );
         $form->addElement(
-            '<label for="purgetiles" class="label">' . $this->getLang('admin_purge_tiles')
+            '<label for="purgetiles" class="label">'.$this->getLang('admin_purge_tiles')
             . '</label>'
         );
         $form->addElement('</p>');
@@ -105,7 +105,7 @@ 
         $form->addElement('<p>');
         $form->addElement('<input id="purgemaps" name="purgemaps" type="checkbox" value="1" class="checkbox" />');
         $form->addElement(
-            '<label for="purgemaps" class="label">' . $this->getLang('admin_purge_maps') . '</label>'
+            '<label for="purgemaps" class="label">'.$this->getLang('admin_purge_maps').'</label>'
         );
         $form->addElement('</p>');
         $form->endFieldset();

Braces +9 added lines, -3 removed lines

@@ -46,14 +46,20 @@
      */
     public function handle() {
         global $conf;
-        if(!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
+        if(!isset($_REQUEST['continue']) || !checkSecurityToken()) {
+        	return;
+        }
         if(isset($_REQUEST['purgetiles'])) {
             $path = $conf['cachedir'] . '/olmaptiles';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'), 0);
+            if($this->rrmdir($path)) {
+            	msg($this->getLang('admin_purged_tiles'), 0);
+            }
         }
         if(isset($_REQUEST['purgemaps'])) {
             $path = $conf['mediadir'] . '/olmapmaps';
-            if($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'), 0);
+            if($this->rrmdir($path)) {
+            	msg($this->getLang('admin_purged_maps'), 0);
+            }
         }
     }
 

conf/metadata.php

Indentation +23 added lines, -23 removed lines

@@ -22,72 +22,72 @@
  */
 
 $meta['enableOSM']                = array(
-    'onoff'
+	'onoff'
 );
 $meta['enableStamen']             = array(
-    'onoff'
+	'onoff'
 );
 $meta['enableGoogle']             = array(
-    'onoff'
+	'onoff'
 );
 $meta['googleAPIkey']             = array(
-    'string'
+	'string'
 );
 $meta['enableBing']               = array(
-    'onoff'
+	'onoff'
 );
 $meta['bingAPIKey']               = array(
-    'string'
+	'string'
 );
 $meta['tfApiKey']                 = array(
-    'string'
+	'string'
 );
 $meta['iconUrlOverload']          = array(
-    'string'
+	'string'
 );
 $meta['enableA11y']               = array(
-    'onoff'
+	'onoff'
 );
 $meta['optionStaticMapGenerator'] = array(
-    'multichoice', '_choices' => array('local', 'remote')
+	'multichoice', '_choices' => array('local', 'remote')
 );
 $meta['autoZoomMap']              = array(
-    'onoff'
+	'onoff'
 );
 $meta ['displayformat']           = array(
-    'multichoice', '_choices' => array('DD', 'DMS')
+	'multichoice', '_choices' => array('DD', 'DMS')
 );
 
 $meta ['default_width']         = array(
-    'string'
+	'string'
 );
 $meta ['default_height']        = array(
-    'string'
+	'string'
 );
 $meta ['default_zoom']          = array(
-    'string'
+	'string'
 );
 $meta ['default_autozoom']      = array(
-    'onoff'
+	'onoff'
 );
 $meta ['default_statusbar']     = array(
-    'onoff'
+	'onoff'
 );
 $meta ['default_toolbar']       = array(
-    'onoff'
+	'onoff'
 );
 $meta ['default_controls']      = array(
-    'onoff'
+	'onoff'
 );
 $meta ['default_poihoverstyle'] = array(
-    'onoff'
+	'onoff'
 );
 $meta ['default_kmlfile']       = array(
-    'string'
+	'string'
 );
 $meta ['default_gpxfile']       = array(
-    'string'
+	'string'
 );
 $meta ['default_geojsonfile']   = array(
-    'string'
+	'string'
 );

StaticMap.php

Indentation +699 added lines, -699 removed lines

@@ -27,703 +27,703 @@
  *
  */
 class StaticMap {
-    // this should probably not be changed
-    var $doc = '';
-
-    // the final output
-    protected $tileSize = 256;
-    protected $tileInfo = array(
-        // OSM sources
-        'openstreetmap' => array(
-            'txt'  => '(c) OpenStreetMap CC-BY-SA',
-            'logo' => 'osm_logo.png',
-            'url'  => 'https://tile.openstreetmap.org/{Z}/{X}/{Y}.png'
-        ),
-        // OCM sources
-        'cycle'         => array(
-            'txt'  => 'OpenCycleMap tiles',
-            'logo' => 'cycle_logo.png',
-            'url'  => 'https://tile.thunderforest.com/cycle/{Z}/{X}/{Y}.png?apikey='
-        ),
-        'transport'     => array(
-            'txt'  => 'OpenCycleMap tiles',
-            'logo' => 'cycle_logo.png',
-            'url'  => 'https://tile.thunderforest.com/transport/{Z}/{X}/{Y}.png?apikey='
-        ),
-        'landscape'     => array(
-            'txt'  => 'OpenCycleMap tiles',
-            'logo' => 'cycle_logo.png',
-            'url'  => 'https://tile.thunderforest.com/landscape/{Z}/{X}/{Y}.png?apikey='
-        ),
-        'outdoors'      => array(
-            'txt'  => 'OpenCycleMap tiles',
-            'logo' => 'cycle_logo.png',
-            'url'  => 'https://tile.thunderforest.com/outdoors/{Z}/{X}/{Y}.png?apikey='
-        ),
-        'toner-lite'    => array(
-            'txt'  => 'Stamen tiles',
-            'logo' => 'stamen.png',
-            'url'  => 'http://tile.stamen.com/toner-lite/{Z}/{X}/{Y}.png'
-        ),
-        'terrain'       => array(
-            'txt'  => 'Stamen tiles',
-            'logo' => 'stamen.png',
-            'url'  => 'http://tile.stamen.com/terrain/{Z}/{X}/{Y}.png'
-        )
-        //,
-        // 'piste'=>array(
-        // 'txt'=>'OpenPisteMap tiles',
-        // 'logo'=>'piste_logo.png',
-        // 'url'=>''),
-        // 'sea'=>array(
-        // 'txt'=>'OpenSeaMap tiles',
-        // 'logo'=>'sea_logo.png',
-        // 'url'=>''),
-        // H&B sources
-        //			'hikeandbike' => array (
-        //					'txt' => 'Hike & Bike Map',
-        //					'logo' => 'hnb_logo.png',
-        //					//'url' => 'http://toolserver.org/tiles/hikebike/{Z}/{X}/{Y}.png'
-        //					//moved to: https://www.toolserver.org/tiles/hikebike/12/2105/1388.png
-        //					'url' => 'http://c.tiles.wmflabs.org/hikebike/{Z}/{X}/{Y}.png'
-        //			)
-    );
-    protected $tileDefaultSrc = 'openstreetmap';
-
-    // set up markers
-    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(
-            'regex'        => '/^lightblue([0-9]+)$/',
-            'extension'    => '.png',
-            'shadow'       => false,
-            'offsetImage'  => '0,-19',
-            'offsetShadow' => false
-        ),
-        // openlayers std markers are 21x25px with shadow
-        'ol-marker' => array(
-            'regex'        => '/^marker(|-blue|-gold|-green|-red)+$/',
-            'extension'    => '.png',
-            'shadow'       => 'marker_shadow.png',
-            'offsetImage'  => '-10,-25',
-            'offsetShadow' => '-1,-13'
-        ),
-        // these are 16x16 px
-        'ww_icon'   => array(
-            'regex'        => '/ww_\S+$/',
-            'extension'    => '.png',
-            'shadow'       => false,
-            'offsetImage'  => '-8,-8',
-            'offsetShadow' => false
-        ),
-        // assume these are 16x16 px
-        'rest'      => array(
-            'regex'        => '/^(?!lightblue([0-9]+)$)(?!(ww_\S+$))(?!marker(|-blue|-gold|-green|-red)+$)(.*)/',
-            'extension'    => '.png',
-            'shadow'       => 'marker_shadow.png',
-            'offsetImage'  => '-8,-8',
-            'offsetShadow' => '-1,-1'
-        )
-    );
-    protected $centerX, $centerY, $offsetX, $offsetY, $image;
-    protected $zoom, $lat, $lon, $width, $height, $markers, $maptype, $kmlFileName, $gpxFileName, $geojsonFileName,
-        $autoZoomExtent, $apikey;
-    protected $tileCacheBaseDir, $mapCacheBaseDir, $mediaBaseDir;
-    protected $useTileCache = true;
-    protected $mapCacheID = '';
-    protected $mapCacheFile = '';
-    protected $mapCacheExtension = 'png';
-
-    /**
-     * Constructor.
-     *
-     * @param float   $lat
-     *            Latitude (x) of center of map
-     * @param float   $lon
-     *            Longitude (y) of center of map
-     * @param int     $zoom
-     *            Zoomlevel
-     * @param int     $width
-     *            Width in pixels
-     * @param int     $height
-     *            Height in pixels
-     * @param string  $maptype
-     *            Name of the map
-     * @param mixed   $markers
-     *            array of markers
-     * @param string  $gpx
-     *            GPX filename
-     * @param string  $kml
-     *            KML filename
-     * @param string  $mediaDir
-     *            Directory to store/cache maps
-     * @param string  $tileCacheBaseDir
-     *            Directory to cache map tiles
-     * @param boolean $autoZoomExtent
-     *            Wheter or not to override zoom/lat/lon and zoom to the extent of gpx/kml and markers
-     * @param apikey
-     *            Some service require a key to access
-     */
-    public function __construct($lat, $lon, $zoom, $width, $height, $maptype, $markers, $gpx, $kml, $geojson,
-                                $mediaDir, $tileCacheBaseDir, $autoZoomExtent = true, $apikey = '') {
-        $this->zoom   = $zoom;
-        $this->lat    = $lat;
-        $this->lon    = $lon;
-        $this->width  = $width;
-        $this->height = $height;
-        // validate + set maptype
-        $this->maptype = $this->tileDefaultSrc;
-        if(array_key_exists($maptype, $this->tileInfo)) {
-            $this->maptype = $maptype;
-        }
-        $this->markers          = $markers;
-        $this->kmlFileName      = $kml;
-        $this->gpxFileName      = $gpx;
-        $this->geojsonFileName  = $geojson;
-        $this->mediaBaseDir     = $mediaDir;
-        $this->tileCacheBaseDir = $tileCacheBaseDir . '/olmaptiles';
-        $this->useTileCache     = $this->tileCacheBaseDir !== '';
-        $this->mapCacheBaseDir  = $mediaDir . '/olmapmaps';
-        $this->autoZoomExtent   = $autoZoomExtent;
-        $this->apikey           = $apikey;
-    }
-
-    /**
-     * get the map, this may return a reference to a cached copy.
-     *
-     * @return string url relative to media dir
-     */
-    public function getMap() {
-        try {
-            if($this->autoZoomExtent) {
-                $this->autoZoom();
-            }
-        } catch(Exception $e) {
-            dbglog($e);
-        }
-
-        // use map cache, so check cache for map
-        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->doc = $this->mapCacheIDToFilename();
-        // make url relative to media dir
-        return str_replace($this->mediaBaseDir, '', $this->doc);
-    }
-
-    /**
-     * Calculate the lat/lon/zoom values to make sure that all of the markers and gpx/kml are on the map.
-     * can throw an error like
-     * "Fatal error: Uncaught Exception: Cannot create a collection with non-geometries in
-     * D:\www\wild-water.nl\www\dokuwiki\lib\plugins\geophp\geoPHP\lib\geometry\Collection.class.php:29"
-     *
-     * @param float $paddingFactor
-     *            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']);
-            }
-        }
-        $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) {
-                $geoms [] = $g;
-            }
-        }
-        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");
-            return;
-        }
-
-        $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)));
-        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);
-
-        if(is_finite($zoom) && $zoom < 15 && $zoom > 2) {
-            $this->zoom = floor($zoom);
-        }
-        $this->lon = $centroid->getX();
-        $this->lat = $centroid->getY();
-        dbglog("StaticMap::autoZoom: Set autozoom options to: z: $this->zoom, lon: $this->lon, lat: $this->lat");
-    }
-
-    public function checkMapCache() {
-        $this->mapCacheID = md5($this->serializeParams());
-        $filename         = $this->mapCacheIDToFilename();
-        if(file_exists($filename))
-            return true;
-    }
-
-    public function serializeParams() {
-        return join(
-            "&", array(
-                   $this->zoom,
-                   $this->lat,
-                   $this->lon,
-                   $this->width,
-                   $this->height,
-                   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);
-        }
-        return $this->mapCacheFile . "." . $this->mapCacheExtension;
-    }
-
-    /**
-     * 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();
-    }
-
-    /**
-     */
-    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);
-    }
-
-    /**
-     *
-     * @param number $long
-     * @param number $zoom
-     * @return number
-     */
-    public function lonToTile($long, $zoom) {
-        return (($long + 180) / 360) * pow(2, $zoom);
-    }
-
-    /**
-     *
-     * @param number $lat
-     * @param number $zoom
-     * @return float|int
-     */
-    public function latToTile($lat, $zoom) {
-        return (1 - log(tan($lat * pi() / 180) + 1 / cos($lat * M_PI / 180)) / M_PI) / 2 * pow(2, $zoom);
-    }
-
-    /**
-     * 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(
-                        '{Z}',
-                        '{X}',
-                        '{Y}'
-                    ), array(
-                        $this->zoom,
-                        $x,
-                        $y
-                    ), $this->tileInfo [$this->maptype] ['url']
-                );
-                $url .= $this->apikey;
-
-                $tileData = $this->fetchTile($url);
-                if($tileData) {
-                    $tileImage = imagecreatefromstring($tileData);
-                } else {
-                    $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
-                );
-            }
-        }
-    }
-
-    /**
-     * Fetch a tile and (if configured) store it in the cache.
-     *
-     * @param string $url
-     */
-    public function fetchTile($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")) {
-            // 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);
-        } else {
-            // use file_get_contents
-            global $conf;
-            $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'],
-                    'request_fulluri' => true
-                )
-            );
-            $context = stream_context_create($opts);
-            $tile    = file_get_contents($url, false, $context);
-        }
-        if($tile && $this->useTileCache) {
-            $this->writeTileToCache($url, $tile);
-        }
-        return $tile;
-    }
-
-    /**
-     *
-     * @param string $url
-     */
-    public function checkTileCache($url) {
-        $filename = $this->tileUrlToFilename($url);
-        if(file_exists($filename)) {
-            return file_get_contents($filename);
-        }
-    }
-
-    /**
-     *
-     * @param string $url
-     * @return string
-     */
-    public function tileUrlToFilename($url) {
-        return $this->tileCacheBaseDir . "/" . str_replace(
-                array(
-                    'http://'
-                ), '', $url
-            );
-    }
-
-    /**
-     * Write a tile into the cache.
-     *
-     * @param string $url
-     * @param mixed  $data
-     */
-    public function writeTileToCache($url, $data) {
-        $filename = $this->tileUrlToFilename($url);
-        $this->mkdir_recursive(dirname($filename), 0777);
-        file_put_contents($filename, $data);
-    }
-
-    /**
-     * Recursively create the directory.
-     *
-     * @param string $pathname
-     *            The directory path.
-     * @param int    $mode
-     *            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);
-    }
-
-    /**
-     * Place markers on the map and number them in the same order as they are listed in the html.
-     */
-    public function placeMarkers() {
-        $count         = 0;
-        $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) {
-            // set some local variables
-            $markerLat  = $marker ['lat'];
-            $markerLon  = $marker ['lon'];
-            $markerType = $marker ['type'];
-            // clear variables from previous loops
-            $markerFilename = '';
-            $markerShadow   = '';
-            $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'];
-                        if($markerPrototype ['offsetImage']) {
-                            list ($markerImageOffsetX, $markerImageOffsetY) = explode(
-                                ",",
-                                $markerPrototype ['offsetImage']
-                            );
-                        }
-                        $markerShadow = $markerPrototype ['shadow'];
-                        if($markerShadow) {
-                            list ($markerShadowOffsetX, $markerShadowOffsetY) = explode(
-                                ",",
-                                $markerPrototype ['offsetShadow']
-                            );
-                        }
-                    }
-                }
-            }
-            // create img resource
-            if(file_exists($markerBaseDir . '/' . $markerFilename)) {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/' . $markerFilename);
-            } else {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/marker.png');
-            }
-            // check for shadow + create shadow recource
-            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)));
-            // copy shadow on basemap
-            if($markerShadow && $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));
-            // 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);
-        }
-    }
-
-    /**
-     * Draw kml trace on the map.
-     */
-    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);
-    }
-
-    /**
-     * Draw geometry or geometry collection on the map.
-     *
-     * @param Geometry $geom
-     * @param int      $colour
-     *            drawing colour
-     */
-    private function drawGeometry($geom, $colour) {
-        if(empty($geom)) return;
-
-        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);
-                }
-                break;
-            case 'MultiPolygon' :
-            case 'MultiLineString' :
-            case 'MultiPoint' :
-                // TODO implement / do nothing
-                break;
-            case 'Polygon' :
-                $this->drawPolygon($geom, $colour);
-                break;
-            case 'LineString' :
-                $this->drawLineString($geom, $colour);
-                break;
-            case 'Point' :
-                $this->drawPoint($geom, $colour);
-                break;
-            default :
-                // draw nothing
-                break;
-        }
-    }
-
-    /**
-     * Draw a polygon on the map.
-     *
-     * @param Polygon $polygon
-     * @param int     $colour
-     *            drawing colour
-     */
-    private function drawPolygon($polygon, $colour) {
-        // TODO implementation of drawing holes,
-        // maybe draw the polygon to an in-memory image and use imagecopy, draw polygon in col., draw holes in bgcol?
-
-        // print_r('Polygon:<br />');
-        // print_r($polygon);
-        $extPoints = array();
-        // extring is a linestring actually..
-        $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)));
-            $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);
-    }
-
-    /**
-     * Draw a line on the map.
-     *
-     * @param LineString $line
-     * @param int        $colour
-     *            drawing colour
-     */
-    private function drawLineString($line, $colour) {
-        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);
-            // 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)));
-            // draw to image
-            imageline($this->image, $x1, $y1, $x2, $y2, $colour);
-        }
-        imagesetthickness($this->image, 1);
-    }
-
-    /**
-     * Draw a point on the map.
-     *
-     * @param Point $point
-     * @param int   $colour
-     *            drawing colour
-     */
-    private function drawPoint($point, $colour) {
-        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)));
-        $r  = 5;
-        // draw to image
-        // imageellipse($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);
-    }
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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);
-
-        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);
-        }
-    }
+	// this should probably not be changed
+	var $doc = '';
+
+	// the final output
+	protected $tileSize = 256;
+	protected $tileInfo = array(
+		// OSM sources
+		'openstreetmap' => array(
+			'txt'  => '(c) OpenStreetMap CC-BY-SA',
+			'logo' => 'osm_logo.png',
+			'url'  => 'https://tile.openstreetmap.org/{Z}/{X}/{Y}.png'
+		),
+		// OCM sources
+		'cycle'         => array(
+			'txt'  => 'OpenCycleMap tiles',
+			'logo' => 'cycle_logo.png',
+			'url'  => 'https://tile.thunderforest.com/cycle/{Z}/{X}/{Y}.png?apikey='
+		),
+		'transport'     => array(
+			'txt'  => 'OpenCycleMap tiles',
+			'logo' => 'cycle_logo.png',
+			'url'  => 'https://tile.thunderforest.com/transport/{Z}/{X}/{Y}.png?apikey='
+		),
+		'landscape'     => array(
+			'txt'  => 'OpenCycleMap tiles',
+			'logo' => 'cycle_logo.png',
+			'url'  => 'https://tile.thunderforest.com/landscape/{Z}/{X}/{Y}.png?apikey='
+		),
+		'outdoors'      => array(
+			'txt'  => 'OpenCycleMap tiles',
+			'logo' => 'cycle_logo.png',
+			'url'  => 'https://tile.thunderforest.com/outdoors/{Z}/{X}/{Y}.png?apikey='
+		),
+		'toner-lite'    => array(
+			'txt'  => 'Stamen tiles',
+			'logo' => 'stamen.png',
+			'url'  => 'http://tile.stamen.com/toner-lite/{Z}/{X}/{Y}.png'
+		),
+		'terrain'       => array(
+			'txt'  => 'Stamen tiles',
+			'logo' => 'stamen.png',
+			'url'  => 'http://tile.stamen.com/terrain/{Z}/{X}/{Y}.png'
+		)
+		//,
+		// 'piste'=>array(
+		// 'txt'=>'OpenPisteMap tiles',
+		// 'logo'=>'piste_logo.png',
+		// 'url'=>''),
+		// 'sea'=>array(
+		// 'txt'=>'OpenSeaMap tiles',
+		// 'logo'=>'sea_logo.png',
+		// 'url'=>''),
+		// H&B sources
+		//			'hikeandbike' => array (
+		//					'txt' => 'Hike & Bike Map',
+		//					'logo' => 'hnb_logo.png',
+		//					//'url' => 'http://toolserver.org/tiles/hikebike/{Z}/{X}/{Y}.png'
+		//					//moved to: https://www.toolserver.org/tiles/hikebike/12/2105/1388.png
+		//					'url' => 'http://c.tiles.wmflabs.org/hikebike/{Z}/{X}/{Y}.png'
+		//			)
+	);
+	protected $tileDefaultSrc = 'openstreetmap';
+
+	// set up markers
+	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(
+			'regex'        => '/^lightblue([0-9]+)$/',
+			'extension'    => '.png',
+			'shadow'       => false,
+			'offsetImage'  => '0,-19',
+			'offsetShadow' => false
+		),
+		// openlayers std markers are 21x25px with shadow
+		'ol-marker' => array(
+			'regex'        => '/^marker(|-blue|-gold|-green|-red)+$/',
+			'extension'    => '.png',
+			'shadow'       => 'marker_shadow.png',
+			'offsetImage'  => '-10,-25',
+			'offsetShadow' => '-1,-13'
+		),
+		// these are 16x16 px
+		'ww_icon'   => array(
+			'regex'        => '/ww_\S+$/',
+			'extension'    => '.png',
+			'shadow'       => false,
+			'offsetImage'  => '-8,-8',
+			'offsetShadow' => false
+		),
+		// assume these are 16x16 px
+		'rest'      => array(
+			'regex'        => '/^(?!lightblue([0-9]+)$)(?!(ww_\S+$))(?!marker(|-blue|-gold|-green|-red)+$)(.*)/',
+			'extension'    => '.png',
+			'shadow'       => 'marker_shadow.png',
+			'offsetImage'  => '-8,-8',
+			'offsetShadow' => '-1,-1'
+		)
+	);
+	protected $centerX, $centerY, $offsetX, $offsetY, $image;
+	protected $zoom, $lat, $lon, $width, $height, $markers, $maptype, $kmlFileName, $gpxFileName, $geojsonFileName,
+		$autoZoomExtent, $apikey;
+	protected $tileCacheBaseDir, $mapCacheBaseDir, $mediaBaseDir;
+	protected $useTileCache = true;
+	protected $mapCacheID = '';
+	protected $mapCacheFile = '';
+	protected $mapCacheExtension = 'png';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param float   $lat
+	 *            Latitude (x) of center of map
+	 * @param float   $lon
+	 *            Longitude (y) of center of map
+	 * @param int     $zoom
+	 *            Zoomlevel
+	 * @param int     $width
+	 *            Width in pixels
+	 * @param int     $height
+	 *            Height in pixels
+	 * @param string  $maptype
+	 *            Name of the map
+	 * @param mixed   $markers
+	 *            array of markers
+	 * @param string  $gpx
+	 *            GPX filename
+	 * @param string  $kml
+	 *            KML filename
+	 * @param string  $mediaDir
+	 *            Directory to store/cache maps
+	 * @param string  $tileCacheBaseDir
+	 *            Directory to cache map tiles
+	 * @param boolean $autoZoomExtent
+	 *            Wheter or not to override zoom/lat/lon and zoom to the extent of gpx/kml and markers
+	 * @param apikey
+	 *            Some service require a key to access
+	 */
+	public function __construct($lat, $lon, $zoom, $width, $height, $maptype, $markers, $gpx, $kml, $geojson,
+								$mediaDir, $tileCacheBaseDir, $autoZoomExtent = true, $apikey = '') {
+		$this->zoom   = $zoom;
+		$this->lat    = $lat;
+		$this->lon    = $lon;
+		$this->width  = $width;
+		$this->height = $height;
+		// validate + set maptype
+		$this->maptype = $this->tileDefaultSrc;
+		if(array_key_exists($maptype, $this->tileInfo)) {
+			$this->maptype = $maptype;
+		}
+		$this->markers          = $markers;
+		$this->kmlFileName      = $kml;
+		$this->gpxFileName      = $gpx;
+		$this->geojsonFileName  = $geojson;
+		$this->mediaBaseDir     = $mediaDir;
+		$this->tileCacheBaseDir = $tileCacheBaseDir . '/olmaptiles';
+		$this->useTileCache     = $this->tileCacheBaseDir !== '';
+		$this->mapCacheBaseDir  = $mediaDir . '/olmapmaps';
+		$this->autoZoomExtent   = $autoZoomExtent;
+		$this->apikey           = $apikey;
+	}
+
+	/**
+	 * get the map, this may return a reference to a cached copy.
+	 *
+	 * @return string url relative to media dir
+	 */
+	public function getMap() {
+		try {
+			if($this->autoZoomExtent) {
+				$this->autoZoom();
+			}
+		} catch(Exception $e) {
+			dbglog($e);
+		}
+
+		// use map cache, so check cache for map
+		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->doc = $this->mapCacheIDToFilename();
+		// make url relative to media dir
+		return str_replace($this->mediaBaseDir, '', $this->doc);
+	}
+
+	/**
+	 * Calculate the lat/lon/zoom values to make sure that all of the markers and gpx/kml are on the map.
+	 * can throw an error like
+	 * "Fatal error: Uncaught Exception: Cannot create a collection with non-geometries in
+	 * D:\www\wild-water.nl\www\dokuwiki\lib\plugins\geophp\geoPHP\lib\geometry\Collection.class.php:29"
+	 *
+	 * @param float $paddingFactor
+	 *            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']);
+			}
+		}
+		$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) {
+				$geoms [] = $g;
+			}
+		}
+		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");
+			return;
+		}
+
+		$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)));
+		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);
+
+		if(is_finite($zoom) && $zoom < 15 && $zoom > 2) {
+			$this->zoom = floor($zoom);
+		}
+		$this->lon = $centroid->getX();
+		$this->lat = $centroid->getY();
+		dbglog("StaticMap::autoZoom: Set autozoom options to: z: $this->zoom, lon: $this->lon, lat: $this->lat");
+	}
+
+	public function checkMapCache() {
+		$this->mapCacheID = md5($this->serializeParams());
+		$filename         = $this->mapCacheIDToFilename();
+		if(file_exists($filename))
+			return true;
+	}
+
+	public function serializeParams() {
+		return join(
+			"&", array(
+				   $this->zoom,
+				   $this->lat,
+				   $this->lon,
+				   $this->width,
+				   $this->height,
+				   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);
+		}
+		return $this->mapCacheFile . "." . $this->mapCacheExtension;
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 */
+	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);
+	}
+
+	/**
+	 *
+	 * @param number $long
+	 * @param number $zoom
+	 * @return number
+	 */
+	public function lonToTile($long, $zoom) {
+		return (($long + 180) / 360) * pow(2, $zoom);
+	}
+
+	/**
+	 *
+	 * @param number $lat
+	 * @param number $zoom
+	 * @return float|int
+	 */
+	public function latToTile($lat, $zoom) {
+		return (1 - log(tan($lat * pi() / 180) + 1 / cos($lat * M_PI / 180)) / M_PI) / 2 * pow(2, $zoom);
+	}
+
+	/**
+	 * 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(
+						'{Z}',
+						'{X}',
+						'{Y}'
+					), array(
+						$this->zoom,
+						$x,
+						$y
+					), $this->tileInfo [$this->maptype] ['url']
+				);
+				$url .= $this->apikey;
+
+				$tileData = $this->fetchTile($url);
+				if($tileData) {
+					$tileImage = imagecreatefromstring($tileData);
+				} else {
+					$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
+				);
+			}
+		}
+	}
+
+	/**
+	 * Fetch a tile and (if configured) store it in the cache.
+	 *
+	 * @param string $url
+	 */
+	public function fetchTile($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")) {
+			// 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);
+		} else {
+			// use file_get_contents
+			global $conf;
+			$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'],
+					'request_fulluri' => true
+				)
+			);
+			$context = stream_context_create($opts);
+			$tile    = file_get_contents($url, false, $context);
+		}
+		if($tile && $this->useTileCache) {
+			$this->writeTileToCache($url, $tile);
+		}
+		return $tile;
+	}
+
+	/**
+	 *
+	 * @param string $url
+	 */
+	public function checkTileCache($url) {
+		$filename = $this->tileUrlToFilename($url);
+		if(file_exists($filename)) {
+			return file_get_contents($filename);
+		}
+	}
+
+	/**
+	 *
+	 * @param string $url
+	 * @return string
+	 */
+	public function tileUrlToFilename($url) {
+		return $this->tileCacheBaseDir . "/" . str_replace(
+				array(
+					'http://'
+				), '', $url
+			);
+	}
+
+	/**
+	 * Write a tile into the cache.
+	 *
+	 * @param string $url
+	 * @param mixed  $data
+	 */
+	public function writeTileToCache($url, $data) {
+		$filename = $this->tileUrlToFilename($url);
+		$this->mkdir_recursive(dirname($filename), 0777);
+		file_put_contents($filename, $data);
+	}
+
+	/**
+	 * Recursively create the directory.
+	 *
+	 * @param string $pathname
+	 *            The directory path.
+	 * @param int    $mode
+	 *            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);
+	}
+
+	/**
+	 * Place markers on the map and number them in the same order as they are listed in the html.
+	 */
+	public function placeMarkers() {
+		$count         = 0;
+		$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) {
+			// set some local variables
+			$markerLat  = $marker ['lat'];
+			$markerLon  = $marker ['lon'];
+			$markerType = $marker ['type'];
+			// clear variables from previous loops
+			$markerFilename = '';
+			$markerShadow   = '';
+			$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'];
+						if($markerPrototype ['offsetImage']) {
+							list ($markerImageOffsetX, $markerImageOffsetY) = explode(
+								",",
+								$markerPrototype ['offsetImage']
+							);
+						}
+						$markerShadow = $markerPrototype ['shadow'];
+						if($markerShadow) {
+							list ($markerShadowOffsetX, $markerShadowOffsetY) = explode(
+								",",
+								$markerPrototype ['offsetShadow']
+							);
+						}
+					}
+				}
+			}
+			// create img resource
+			if(file_exists($markerBaseDir . '/' . $markerFilename)) {
+				$markerImg = imagecreatefrompng($markerBaseDir . '/' . $markerFilename);
+			} else {
+				$markerImg = imagecreatefrompng($markerBaseDir . '/marker.png');
+			}
+			// check for shadow + create shadow recource
+			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)));
+			// copy shadow on basemap
+			if($markerShadow && $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));
+			// 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);
+		}
+	}
+
+	/**
+	 * Draw kml trace on the map.
+	 */
+	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);
+	}
+
+	/**
+	 * Draw geometry or geometry collection on the map.
+	 *
+	 * @param Geometry $geom
+	 * @param int      $colour
+	 *            drawing colour
+	 */
+	private function drawGeometry($geom, $colour) {
+		if(empty($geom)) return;
+
+		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);
+				}
+				break;
+			case 'MultiPolygon' :
+			case 'MultiLineString' :
+			case 'MultiPoint' :
+				// TODO implement / do nothing
+				break;
+			case 'Polygon' :
+				$this->drawPolygon($geom, $colour);
+				break;
+			case 'LineString' :
+				$this->drawLineString($geom, $colour);
+				break;
+			case 'Point' :
+				$this->drawPoint($geom, $colour);
+				break;
+			default :
+				// draw nothing
+				break;
+		}
+	}
+
+	/**
+	 * Draw a polygon on the map.
+	 *
+	 * @param Polygon $polygon
+	 * @param int     $colour
+	 *            drawing colour
+	 */
+	private function drawPolygon($polygon, $colour) {
+		// TODO implementation of drawing holes,
+		// maybe draw the polygon to an in-memory image and use imagecopy, draw polygon in col., draw holes in bgcol?
+
+		// print_r('Polygon:<br />');
+		// print_r($polygon);
+		$extPoints = array();
+		// extring is a linestring actually..
+		$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)));
+			$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);
+	}
+
+	/**
+	 * Draw a line on the map.
+	 *
+	 * @param LineString $line
+	 * @param int        $colour
+	 *            drawing colour
+	 */
+	private function drawLineString($line, $colour) {
+		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);
+			// 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)));
+			// draw to image
+			imageline($this->image, $x1, $y1, $x2, $y2, $colour);
+		}
+		imagesetthickness($this->image, 1);
+	}
+
+	/**
+	 * Draw a point on the map.
+	 *
+	 * @param Point $point
+	 * @param int   $colour
+	 *            drawing colour
+	 */
+	private function drawPoint($point, $colour) {
+		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)));
+		$r  = 5;
+		// draw to image
+		// imageellipse($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);
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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);
+
+		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);
+		}
+	}
 }

Spacing +65 added lines, -65 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');
 
 /**
  *
@@ -174,7 +174,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;
@@ -182,9 +182,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;
     }
@@ -196,15 +196,15 @@ 
      */
     public function getMap() {
         try {
-            if($this->autoZoomExtent) {
+            if ($this->autoZoomExtent) {
                 $this->autoZoom();
             }
-        } catch(Exception $e) {
+        } 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);
@@ -226,38 +226,38 @@ 
      */
     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 [] = 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)) {
+        if (file_exists($this->kmlFileName)) {
             $g = geoPHP::load(file_get_contents($this->kmlFileName), 'kml');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
-        if(file_exists($this->gpxFileName)) {
+        if (file_exists($this->gpxFileName)) {
             $g = geoPHP::load(file_get_contents($this->gpxFileName), 'gpx');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
-        if(file_exists($this->geojsonFileName)) {
+        if (file_exists($this->geojsonFileName)) {
             $g = geoPHP::load(file_get_contents($this->geojsonFileName), 'geojson');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
 
-        if(count($geoms) <= 1) {
+        if (count($geoms) <= 1) {
             dbglog($geoms, "StaticMap::autoZoom: Skip setting autozoom options");
             return;
         }
 
-        $geom     = new GeometryCollection ($geoms);
+        $geom     = new GeometryCollection($geoms);
         $centroid = $geom->centroid();
         $bbox     = $geom->getBBox();
 
@@ -273,7 +273,7 @@ 
         $resolution           = max($resolutionHorizontal, $resolutionVertical) * $paddingFactor;
         $zoom                 = log(360 / ($resolution * $this->tileSize), 2);
 
-        if(is_finite($zoom) && $zoom < 15 && $zoom > 2) {
+        if (is_finite($zoom) && $zoom < 15 && $zoom > 2) {
             $this->zoom = floor($zoom);
         }
         $this->lon = $centroid->getX();
@@ -284,7 +284,7 @@ 
     public function checkMapCache() {
         $this->mapCacheID = md5($this->serializeParams());
         $filename         = $this->mapCacheIDToFilename();
-        if(file_exists($filename))
+        if (file_exists($filename))
             return true;
     }
 
@@ -306,12 +306,12 @@ 
     }
 
     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;
     }
 
     /**
@@ -320,13 +320,13 @@ 
     public function makeMap() {
         $this->initCoords();
         $this->createBaseMap();
-        if(!empty ($this->markers))
+        if (!empty ($this->markers))
             $this->placeMarkers();
-        if(file_exists($this->kmlFileName))
+        if (file_exists($this->kmlFileName))
             $this->drawKML();
-        if(file_exists($this->gpxFileName))
+        if (file_exists($this->gpxFileName))
             $this->drawGPX();
-        if(file_exists($this->geojsonFileName))
+        if (file_exists($this->geojsonFileName))
             $this->drawGeojson();
 
         $this->drawCopyright();
@@ -377,8 +377,8 @@ 
         $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++) {
+        for ($x = $startX; $x <= $endX; $x++) {
+            for ($y = $startY; $y <= $endY; $y++) {
                 $url = str_replace(
                     array(
                         '{Z}',
@@ -393,7 +393,7 @@ 
                 $url .= $this->apikey;
 
                 $tileData = $this->fetchTile($url);
-                if($tileData) {
+                if ($tileData) {
                     $tileImage = imagecreatefromstring($tileData);
                 } else {
                     $tileImage = imagecreate($this->tileSize, $this->tileSize);
@@ -417,11 +417,11 @@ 
      * @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);
@@ -433,18 +433,18 @@ 
         } else {
             // use file_get_contents
             global $conf;
-            $opts    = 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);
         }
-        if($tile && $this->useTileCache) {
+        if ($tile && $this->useTileCache) {
             $this->writeTileToCache($url, $tile);
         }
         return $tile;
@@ -456,7 +456,7 @@ 
      */
     public function checkTileCache($url) {
         $filename = $this->tileUrlToFilename($url);
-        if(file_exists($filename)) {
+        if (file_exists($filename)) {
             return file_get_contents($filename);
         }
     }
@@ -467,7 +467,7 @@ 
      * @return string
      */
     public function tileUrlToFilename($url) {
-        return $this->tileCacheBaseDir . "/" . str_replace(
+        return $this->tileCacheBaseDir."/".str_replace(
                 array(
                     'http://'
                 ), '', $url
@@ -506,9 +506,9 @@ 
         $count         = 0;
         $color         = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor       = imagecolorallocate($this->image, 200, 200, 200);
-        $markerBaseDir = dirname(__FILE__) . '/icons';
+        $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'];
@@ -518,18 +518,18 @@ 
             $markerShadow   = '';
             $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'];
-                        if($markerPrototype ['offsetImage']) {
+            if ($markerType) {
+                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']
                             );
                         }
                         $markerShadow = $markerPrototype ['shadow'];
-                        if($markerShadow) {
+                        if ($markerShadow) {
                             list ($markerShadowOffsetX, $markerShadowOffsetY) = explode(
                                 ",",
                                 $markerPrototype ['offsetShadow']
@@ -539,20 +539,20 @@ 
                 }
             }
             // 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)));
             // copy shadow on basemap
-            if($markerShadow && $markerShadowImg) {
+            if ($markerShadow && $markerShadowImg) {
                 imagecopy($this->image, $markerShadowImg, $destX + intval($markerShadowOffsetX), $destY + intval($markerShadowOffsetY), 0, 0, imagesx($markerShadowImg), imagesy($markerShadowImg));
             }
             // copy marker on basemap above shadow
@@ -581,12 +581,12 @@ 
      *            drawing colour
      */
     private function drawGeometry($geom, $colour) {
-        if(empty($geom)) return;
+        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++) {
+                for ($i = 1; $i < $geom->numGeometries() + 1; $i++) {
                     $_geom = $geom->geometryN($i);
                     $this->drawGeometry($_geom, $colour);
                 }
@@ -628,7 +628,7 @@ 
         // extring is a linestring actually..
         $extRing = $polygon->exteriorRing();
 
-        for($i = 1; $i < $extRing->numGeometries(); $i++) {
+        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)));
@@ -650,7 +650,7 @@ 
      */
     private function drawLineString($line, $colour) {
         imagesetthickness($this->image, 2);
-        for($p = 1; $p < $line->numGeometries(); $p++) {
+        for ($p = 1; $p < $line->numGeometries(); $p++) {
             // get first pair of points
             $p1 = $line->geometryN($p);
             $p2 = $line->geometryN($p + 1);
@@ -709,8 +709,8 @@ 
      * add copyright and origin notice and icons to the map.
      */
     public function drawCopyright() {
-        $logoBaseDir = dirname(__FILE__) . '/' . 'logo/';
-        $logoImg     = imagecreatefrompng($logoBaseDir . $this->tileInfo ['openstreetmap'] ['logo']);
+        $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);
 
@@ -719,8 +719,8 @@ 
         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']);
+        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);

Braces +21 added lines, -13 removed lines

@@ -284,8 +284,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() {
@@ -320,14 +321,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();
     }
@@ -417,8 +422,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")) {
@@ -581,7 +587,9 @@ 
      *            drawing colour
      */
     private function drawGeometry($geom, $colour) {
-        if(empty($geom)) return;
+        if(empty($geom)) {
+        	return;
+        }
 
         switch($geom->geometryType()) {
             case 'GeometryCollection' :

_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

@@ -30,7 +30,7 @@
      * Simple test to make sure the plugin.info.txt is in correct format
      */
     public function test_plugininfo() {
-        $file = __DIR__ . '/../plugin.info.txt';
+        $file = __DIR__.'/../plugin.info.txt';
         $this->assertFileExists($file);
 
         $info = confToHash($file);

helper/staticmap.php

Indentation +101 added lines, -101 removed lines

@@ -24,113 +24,113 @@
  * @author Mark Prins
  */
 class helper_plugin_openlayersmap_staticmap extends DokuWiki_Plugin {
-    /** maximum width of the resulting image. */
-    private $maxWidth = 1024;
-    /** maximum heigth of the resulting image. */
-    private $maxHeight = 1024;
+	/** maximum width of the resulting image. */
+	private $maxWidth = 1024;
+	/** maximum heigth of the resulting image. */
+	private $maxHeight = 1024;
 
-    /**
-     * Provide metadata of the public methods of this class.
-     *
-     * @return array Information to all provided methods.
-     */
-    public function getMethods(): array {
-        $result   = array();
-        $result[] = array(
-            'name'   => 'getMap',
-            'desc'   => 'returns url to the image',
-            'params' => array(
-                'lat'     => 'float',
-                'lon'     => 'float',
-                'zoom'    => 'integer',
-                'size'    => 'string',
-                'maptype' => 'string',
-                'markers' => 'string',
-                'gpx'     => 'string',
-                'kml'     => 'string',
-                'geojson' => 'string',
-                'apikey'  => 'string'
-            ),
-            'return' => array('image' => 'string'),
-        );
-        return $result;
-    }
+	/**
+	 * Provide metadata of the public methods of this class.
+	 *
+	 * @return array Information to all provided methods.
+	 */
+	public function getMethods(): array {
+		$result   = array();
+		$result[] = array(
+			'name'   => 'getMap',
+			'desc'   => 'returns url to the image',
+			'params' => array(
+				'lat'     => 'float',
+				'lon'     => 'float',
+				'zoom'    => 'integer',
+				'size'    => 'string',
+				'maptype' => 'string',
+				'markers' => 'string',
+				'gpx'     => 'string',
+				'kml'     => 'string',
+				'geojson' => 'string',
+				'apikey'  => 'string'
+			),
+			'return' => array('image' => 'string'),
+		);
+		return $result;
+	}
 
-    /**
-     * Create the map.
-     *
-     * @param number lat the latitude of the map's center, eg. 40.714728
-     * @param number lon the longitude of the map's center, eg -73.998672
-     * @param number zoom the zoom level in the tile cache, eg. 14
-     * @param mixed size the size in WxH px, eg. 512x512
-     * @param string maptype the maptype, eg. cycle
-     * @param mixed markers associative array of markers, array('lat'=>$lat,'lon'=>$lon,'type'=>$iconStyle),
-     *      eg. array('lat'=>40.702147,'lon'=>-74.015794,'type'=>lightblue1);
-     * @param string gpx media link
-     * @param string kml media link
-     * @param string geojson media link
-     * @param string optional API key eg. for Thunderforest maps
-     *
-     * @returns string media id url
-     */
-    public function getMap($lat, $lon, $zoom, $size, $maptype, $markers, $gpx, $kml, $geojson, $apikey = ''): string {
-        global $conf;
-        // dbglog($markers,'helper_plugin_openlayersmap_staticmap::getMap: markers :');
+	/**
+	 * Create the map.
+	 *
+	 * @param number lat the latitude of the map's center, eg. 40.714728
+	 * @param number lon the longitude of the map's center, eg -73.998672
+	 * @param number zoom the zoom level in the tile cache, eg. 14
+	 * @param mixed size the size in WxH px, eg. 512x512
+	 * @param string maptype the maptype, eg. cycle
+	 * @param mixed markers associative array of markers, array('lat'=>$lat,'lon'=>$lon,'type'=>$iconStyle),
+	 *      eg. array('lat'=>40.702147,'lon'=>-74.015794,'type'=>lightblue1);
+	 * @param string gpx media link
+	 * @param string kml media link
+	 * @param string geojson media link
+	 * @param string optional API key eg. for Thunderforest maps
+	 *
+	 * @returns string media id url
+	 */
+	public function getMap($lat, $lon, $zoom, $size, $maptype, $markers, $gpx, $kml, $geojson, $apikey = ''): string {
+		global $conf;
+		// dbglog($markers,'helper_plugin_openlayersmap_staticmap::getMap: markers :');
 
-        // normalize zoom
-        $zoom = $zoom ? intval($zoom) : 0;
-        if($zoom > 18) $zoom = 18;
-        // normalize WxH
-        list($width, $height) = explode('x', $size);
-        $width = intval($width);
-        if($width > $this->maxWidth) $width = $this->maxWidth;
-        $height = intval($height);
-        if($height > $this->maxHeight) $height = $this->maxHeight;
+		// normalize zoom
+		$zoom = $zoom ? intval($zoom) : 0;
+		if($zoom > 18) $zoom = 18;
+		// normalize WxH
+		list($width, $height) = explode('x', $size);
+		$width = intval($width);
+		if($width > $this->maxWidth) $width = $this->maxWidth;
+		$height = intval($height);
+		if($height > $this->maxHeight) $height = $this->maxHeight;
 
-        // cleanup/validate gpx/kml
-        $kml = $this->mediaIdToPath($kml);
-        // dbglog($kml,'helper_plugin_openlayersmap_staticmap::getMap: kml file:');
-        $gpx = $this->mediaIdToPath($gpx);
-        // dbglog($gpx,'helper_plugin_openlayersmap_staticmap::getMap: gpx file:');
-        $geojson = $this->mediaIdToPath($geojson);
+		// cleanup/validate gpx/kml
+		$kml = $this->mediaIdToPath($kml);
+		// dbglog($kml,'helper_plugin_openlayersmap_staticmap::getMap: kml file:');
+		$gpx = $this->mediaIdToPath($gpx);
+		// dbglog($gpx,'helper_plugin_openlayersmap_staticmap::getMap: gpx file:');
+		$geojson = $this->mediaIdToPath($geojson);
 
-        // create map
-        $map = new StaticMap(
-            $lat, $lon, $zoom, $width, $height, $maptype,
-            $markers, $gpx, $kml, $geojson, $conf['mediadir'], $conf['cachedir'],
-            $this->getConf('autoZoomMap'),
-            $apikey
-        );
+		// create map
+		$map = new StaticMap(
+			$lat, $lon, $zoom, $width, $height, $maptype,
+			$markers, $gpx, $kml, $geojson, $conf['mediadir'], $conf['cachedir'],
+			$this->getConf('autoZoomMap'),
+			$apikey
+		);
 
-        // return the media id url
-        $mediaId = str_replace('/', ':', $map->getMap());
-        // if($this->startsWith($mediaId,':')) {
-        //     $mediaId = substr($mediaId, 1);
-        // }
-        return $mediaId;
-    }
+		// return the media id url
+		$mediaId = str_replace('/', ':', $map->getMap());
+		// if($this->startsWith($mediaId,':')) {
+		//     $mediaId = substr($mediaId, 1);
+		// }
+		return $mediaId;
+	}
 
-    /**
-     * Constructs the path to a file.
-     * @param string $id the DW media id
-     * @return string the path to the file
-     */
-    private function mediaIdToPath(string $id): string {
-        global $conf;
-        if(empty($id)) {
-            return "";
-        }
-        $id = str_replace("[[", "", $id);
-        $id = str_replace("]]", "", $id);
-        if($this->startsWith($id, ':')) {
-            $id = substr($id, 1);
-        }
-        $id = str_replace(":", "/", $id);
-        return $conf['mediadir'] . '/' . $id;
-    }
+	/**
+	 * Constructs the path to a file.
+	 * @param string $id the DW media id
+	 * @return string the path to the file
+	 */
+	private function mediaIdToPath(string $id): string {
+		global $conf;
+		if(empty($id)) {
+			return "";
+		}
+		$id = str_replace("[[", "", $id);
+		$id = str_replace("]]", "", $id);
+		if($this->startsWith($id, ':')) {
+			$id = substr($id, 1);
+		}
+		$id = str_replace(":", "/", $id);
+		return $conf['mediadir'] . '/' . $id;
+	}
 
-    private function startsWith($haystack, $needle): bool {
-        $length = strlen($needle);
-        return (substr($haystack, 0, $length) === $needle);
-    }
+	private function startsWith($haystack, $needle): bool {
+		$length = strlen($needle);
+		return (substr($haystack, 0, $length) === $needle);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -79,13 +79,13 @@ 
 
         // 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);
@@ -117,16 +117,16 @@ 
      */
     private function mediaIdToPath(string $id): string {
         global $conf;
-        if(empty($id)) {
+        if (empty($id)) {
             return "";
         }
         $id = str_replace("[[", "", $id);
         $id = str_replace("]]", "", $id);
-        if($this->startsWith($id, ':')) {
+        if ($this->startsWith($id, ':')) {
             $id = substr($id, 1);
         }
         $id = str_replace(":", "/", $id);
-        return $conf['mediadir'] . '/' . $id;
+        return $conf['mediadir'].'/'.$id;
     }
 
     private function startsWith($haystack, $needle): bool {

Braces +9 added lines, -3 removed lines

@@ -79,13 +79,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);

action.php

Indentation +39 added lines, -39 removed lines

@@ -24,46 +24,46 @@
  */
 class action_plugin_openlayersmap extends DokuWiki_Action_Plugin {
 
-    /**
-     * plugin should use this method to register its handlers with the DokuWiki's event controller
-     *
-     * @param    $controller DokuWiki's event controller object. Also available as global $EVENT_HANDLER
-     */
-    public function register(Doku_Event_Handler $controller) {
-        $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertButton', array());
-        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'insertCSSSniffer');
-    }
+	/**
+	 * plugin should use this method to register its handlers with the DokuWiki's event controller
+	 *
+	 * @param    $controller DokuWiki's event controller object. Also available as global $EVENT_HANDLER
+	 */
+	public function register(Doku_Event_Handler $controller) {
+		$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertButton', array());
+		$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'insertCSSSniffer');
+	}
 
-    /**
-     * Inserts the toolbar button.
-     * @param Doku_Event $event the DokuWiki event
-     */
-    public function insertButton(Doku_Event $event, $param) {
-        $strOpen       = '<olmap id="olMapOne" width="550px" height="450px" lat="50.0" ';
-        $strOpen       .= 'lon="5.1" zoom="12" statusbar="1" controls="1" poihoverstyle="0" ';
-        $strOpen       .= 'baselyr="OpenStreetMap" gpxfile="" kmlfile="" geojsonfile="" summary="" >\n';
-        $strOpen       .= '~~ Plugin olmap help.\n';
-        $strOpen       .= '~~ Required in the above tag are values for: id (unique on this page), width, heigth.\n';
-        $strOpen       .= '~~ Also you will want to enter zoomlevel and lat, lon values that make sense for where you';
-        $strOpen       .= '~~ want the map to start.\n\n';
-        $strOpen       .= '~~ Below is an example of a POI, you can add as many as you want. ';
-        $strOpen       .= '~~ More examples: https://dokuwiki.org/plugin:openlayersmap \n';
-        $event->data[] = array(
-            'type'   => 'format',
-            'title'  => $this->getLang('openlayersmap'),
-            'icon'   => '../../plugins/openlayersmap/toolbar/map.png',
-            'open'   => $strOpen,
-            'sample' => '50.0117,5.1287,-90,.8,marker-green.png,Pont de Barbouillons; Daverdisse \\\\ external link: 
+	/**
+	 * Inserts the toolbar button.
+	 * @param Doku_Event $event the DokuWiki event
+	 */
+	public function insertButton(Doku_Event $event, $param) {
+		$strOpen       = '<olmap id="olMapOne" width="550px" height="450px" lat="50.0" ';
+		$strOpen       .= 'lon="5.1" zoom="12" statusbar="1" controls="1" poihoverstyle="0" ';
+		$strOpen       .= 'baselyr="OpenStreetMap" gpxfile="" kmlfile="" geojsonfile="" summary="" >\n';
+		$strOpen       .= '~~ Plugin olmap help.\n';
+		$strOpen       .= '~~ Required in the above tag are values for: id (unique on this page), width, heigth.\n';
+		$strOpen       .= '~~ Also you will want to enter zoomlevel and lat, lon values that make sense for where you';
+		$strOpen       .= '~~ want the map to start.\n\n';
+		$strOpen       .= '~~ Below is an example of a POI, you can add as many as you want. ';
+		$strOpen       .= '~~ More examples: https://dokuwiki.org/plugin:openlayersmap \n';
+		$event->data[] = array(
+			'type'   => 'format',
+			'title'  => $this->getLang('openlayersmap'),
+			'icon'   => '../../plugins/openlayersmap/toolbar/map.png',
+			'open'   => $strOpen,
+			'sample' => '50.0117,5.1287,-90,.8,marker-green.png,Pont de Barbouillons; Daverdisse \\\\ external link: 
                         [[https://test.com|test.com]] \\\\ internal link: [[::start]]\\\\ **DW Formatting** \n',
-            'close'  => '</olmap>\n',
-        );
-    }
+			'close'  => '</olmap>\n',
+		);
+	}
 
-    /** add a snippet of javascript into the head to do a css operation we can check for later on.*/
-    public function insertCSSSniffer(Doku_Event $event, $param) {
-        $event->data["script"][] = array(
-            "type"  => "text/javascript",
-            "_data" => "document.documentElement.className += ' olCSSsupported';",
-        );
-    }
+	/** add a snippet of javascript into the head to do a css operation we can check for later on.*/
+	public function insertCSSSniffer(Doku_Event $event, $param) {
+		$event->data["script"][] = array(
+			"type"  => "text/javascript",
+			"_data" => "document.documentElement.className += ' olCSSsupported';",
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @param Doku_Event $event the DokuWiki event
      */
     public function insertButton(Doku_Event $event, $param) {
-        $strOpen       = '<olmap id="olMapOne" width="550px" height="450px" lat="50.0" ';
+        $strOpen = '<olmap id="olMapOne" width="550px" height="450px" lat="50.0" ';
         $strOpen       .= 'lon="5.1" zoom="12" statusbar="1" controls="1" poihoverstyle="0" ';
         $strOpen       .= 'baselyr="OpenStreetMap" gpxfile="" kmlfile="" geojsonfile="" summary="" >\n';
         $strOpen       .= '~~ Plugin olmap help.\n';

syntax/olmap.php

Indentation +718 added lines, -718 removed lines

@@ -25,108 +25,108 @@ 
  */
 class syntax_plugin_openlayersmap_olmap extends DokuWiki_Syntax_Plugin {
 
-    /**
-     * defaults of the known attributes of the olmap tag.
-     */
-    private $dflt = array(
-        'id'            => 'olmap',
-        'width'         => '550px',
-        'height'        => '450px',
-        'lat'           => 50.0,
-        'lon'           => 5.1,
-        'zoom'          => 12,
-        'autozoom'      => 1,
-        'statusbar'     => true,
-        'toolbar'       => true,
-        'controls'      => true,
-        'poihoverstyle' => false,
-        'baselyr'       => 'OpenStreetMap',
-        'gpxfile'       => '',
-        'kmlfile'       => '',
-        'geojsonfile'   => '',
-        'summary'       => ''
-    );
-
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::getType()
-     */
-    public function getType(): string {
-        return 'substition';
-    }
-
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::getPType()
-     */
-    public function getPType(): string {
-        return 'block';
-    }
-
-    /**
-     *
-     * @see Doku_Parser_Mode::getSort()
-     */
-    public function getSort(): int {
-        return 901;
-    }
-
-    /**
-     *
-     * @see Doku_Parser_Mode::connectTo()
-     */
-    public function connectTo($mode) {
-        $this->Lexer->addSpecialPattern(
-            '<olmap ?[^>\n]*>.*?</olmap>', $mode,
-            'plugin_openlayersmap_olmap'
-        );
-    }
-
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::handle()
-     */
-    public function handle($match, $state, $pos, Doku_Handler $handler): array {
-        // break matched cdata into its components
-        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);
-        if(!is_numeric($mainLat)) {
-            $mainLat = $this->dflt ['lat'];
-        }
-        if(!is_numeric($mainLon)) {
-            $mainLon = $this->dflt ['lon'];
-        }
-
-        $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) {
-            // Google
-            $imgUrl .= $this->_getGoogle($gmap, $overlay);
-            $imgUrl .= "&.png";
-        } elseif(stripos($gmap ['baselyr'], 'bing') !== false) {
-            // Bing
-            if(!$this->getConf('bingAPIKey')) {
-                // in case there is no Bing api key we'll use OSM
-                $_firstimageID = $this->_getStaticOSM($gmap, $overlay);
-                $imgUrl        .= $_firstimageID;
-                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";
-            }
-        } /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
+	/**
+	 * defaults of the known attributes of the olmap tag.
+	 */
+	private $dflt = array(
+		'id'            => 'olmap',
+		'width'         => '550px',
+		'height'        => '450px',
+		'lat'           => 50.0,
+		'lon'           => 5.1,
+		'zoom'          => 12,
+		'autozoom'      => 1,
+		'statusbar'     => true,
+		'toolbar'       => true,
+		'controls'      => true,
+		'poihoverstyle' => false,
+		'baselyr'       => 'OpenStreetMap',
+		'gpxfile'       => '',
+		'kmlfile'       => '',
+		'geojsonfile'   => '',
+		'summary'       => ''
+	);
+
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getType()
+	 */
+	public function getType(): string {
+		return 'substition';
+	}
+
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getPType()
+	 */
+	public function getPType(): string {
+		return 'block';
+	}
+
+	/**
+	 *
+	 * @see Doku_Parser_Mode::getSort()
+	 */
+	public function getSort(): int {
+		return 901;
+	}
+
+	/**
+	 *
+	 * @see Doku_Parser_Mode::connectTo()
+	 */
+	public function connectTo($mode) {
+		$this->Lexer->addSpecialPattern(
+			'<olmap ?[^>\n]*>.*?</olmap>', $mode,
+			'plugin_openlayersmap_olmap'
+		);
+	}
+
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::handle()
+	 */
+	public function handle($match, $state, $pos, Doku_Handler $handler): array {
+		// break matched cdata into its components
+		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);
+		if(!is_numeric($mainLat)) {
+			$mainLat = $this->dflt ['lat'];
+		}
+		if(!is_numeric($mainLon)) {
+			$mainLon = $this->dflt ['lon'];
+		}
+
+		$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) {
+			// Google
+			$imgUrl .= $this->_getGoogle($gmap, $overlay);
+			$imgUrl .= "&.png";
+		} elseif(stripos($gmap ['baselyr'], 'bing') !== false) {
+			// Bing
+			if(!$this->getConf('bingAPIKey')) {
+				// in case there is no Bing api key we'll use OSM
+				$_firstimageID = $this->_getStaticOSM($gmap, $overlay);
+				$imgUrl        .= $_firstimageID;
+				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";
+			}
+		} /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
             // MapQuest
             if (! $this->getConf ( 'mapquestAPIKey' )) {
                 // no API key for MapQuest, use OSM
@@ -140,268 +140,268 @@ 
                 $imgUrl .= "&.png";
             }
         } */ else {
-            // default OSM
-            $_firstimageID = $this->_getStaticOSM($gmap, $overlay);
-            $imgUrl        .= $_firstimageID;
-            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 .= "&nolink";
-
-        // add nocache option for selected services
-        if($_nocache) {
-            $imgUrl .= "&nocache";
-        }
-
-        $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) . "', ";
-        }
-        if(!empty ($param)) {
-            $param = substr($param, 0, -2);
-        }
-        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++;
-                $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);
-                } else {
-                    $lat .= 'º';
-                    $lon .= 'º';
-                }
-
-                $poitable .= '
+			// default OSM
+			$_firstimageID = $this->_getStaticOSM($gmap, $overlay);
+			$imgUrl        .= $_firstimageID;
+			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 .= "&nolink";
+
+		// add nocache option for selected services
+		if($_nocache) {
+			$imgUrl .= "&nocache";
+		}
+
+		$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) . "', ";
+		}
+		if(!empty ($param)) {
+			$param = substr($param, 0, -2);
+		}
+		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++;
+				$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);
+				} else {
+					$lat .= 'º';
+					$lon .= 'º';
+				}
+
+				$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>
+					. 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);
-        }
-        if(!empty ($gmap ['kmlfile'])) {
-            $poitable .= '
+			}
+			$poi = substr($poi, 2);
+		}
+		if(!empty ($gmap ['kmlfile'])) {
+			$poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
-                . 'lib/plugins/openlayersmap/toolbar/kml_file.png" alt="KML file" /></td>
+				. '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>
+				. $this->getlang('alt_legend_kml') . '" /></td>
                     <td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']) . '</td>
                     </tr>';
-        }
-        if(!empty ($gmap ['gpxfile'])) {
-            $poitable .= '
+		}
+		if(!empty ($gmap ['gpxfile'])) {
+			$poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
-                . 'lib/plugins/openlayersmap/toolbar/gpx_file.png" alt="GPX file" /></td>
+				. '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>
+				. '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'])) {
-            $poitable .= '
+		}
+		if(!empty ($gmap ['geojsonfile'])) {
+			$poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
-                . 'lib/plugins/openlayersmap/toolbar/geojson_file.png" alt="GeoJSON file" /></td>
+				. '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>
+				. '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]};";
-        // unescape the json
-        $poitable = stripslashes($poitable);
-
-        return array(
-            $mapid,
-            $js,
-            $mainLat,
-            $mainLon,
-            $poitable,
-            $gmap ['summary'],
-            $imgUrl,
-            $_firstimageID
-        );
-    }
-
-    /**
-     * extract parameters for the map from the parameter string
-     *
-     * @param string $str_params
-     *            string of key="value" pairs
-     * @return array associative array of parameters key=>value
-     */
-    private function _extract_params(string $str_params): array {
-        $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);
-            if($defval !== '') {
-                $value = $defval;
-            }
-        }
-        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;
-                } elseif($key == 'id') {
-                    // preserve case for id field
-                    $gmap [$key] = $val;
-                } else {
-                    $gmap [$key] = strtolower($val);
-                }
-            }
-        }
-        return $gmap;
-    }
-
-    /**
-     * extract overlay points for the map from the wiki syntax data
-     *
-     * @param string $str_points
-     *            multi-line string of lat,lon,text triplets
-     * @return array multi-dimensional array of lat,lon,text triplets
-     */
-    private function _extract_points(string $str_points): array {
-        $point = array();
-        // preg_match_all('/^([+-]?[0-9].*?),\s*([+-]?[0-9].*?),(.*?),(.*?),(.*?),(.*)$/um', $str_points, $point, PREG_SET_ORDER);
-        /*
+		}
+
+		$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);
+
+		return array(
+			$mapid,
+			$js,
+			$mainLat,
+			$mainLon,
+			$poitable,
+			$gmap ['summary'],
+			$imgUrl,
+			$_firstimageID
+		);
+	}
+
+	/**
+	 * extract parameters for the map from the parameter string
+	 *
+	 * @param string $str_params
+	 *            string of key="value" pairs
+	 * @return array associative array of parameters key=>value
+	 */
+	private function _extract_params(string $str_params): array {
+		$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);
+			if($defval !== '') {
+				$value = $defval;
+			}
+		}
+		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;
+				} elseif($key == 'id') {
+					// preserve case for id field
+					$gmap [$key] = $val;
+				} else {
+					$gmap [$key] = strtolower($val);
+				}
+			}
+		}
+		return $gmap;
+	}
+
+	/**
+	 * extract overlay points for the map from the wiki syntax data
+	 *
+	 * @param string $str_points
+	 *            multi-line string of lat,lon,text triplets
+	 * @return array multi-dimensional array of lat,lon,text triplets
+	 */
+	private function _extract_points(string $str_points): 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
-        );
-        // 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;
-            // TODO validate using exist & set up default img?
-            $img  = trim($img);
-            $text = p_get_instructions($text);
-            // dbg ( $text );
-            $text = p_render("xhtml", $text, $info);
-            // dbg ( $text );
-            $text       = addslashes(str_replace("\n", "", $text));
-            $overlay [] = array(
-                $lat,
-                $lon,
-                $text,
-                $angle,
-                $opacity,
-                $img
-            );
-        }
-        return $overlay;
-    }
-
-    /**
-     * Create a Google maps static image url w/ the poi.
-     *
-     * @param array $gmap
-     * @param array $overlay
-     * @return string
-     */
-    private function _getGoogle(array $gmap, array $overlay): string {
-        $sUrl = $this->getConf('iconUrlOverload');
-        if(!$sUrl) {
-            $sUrl = DOKU_URL;
-        }
-        switch($gmap ['baselyr']) {
-            case 'google hybrid' :
-                $maptype = 'hybrid';
-                break;
-            case 'google sat' :
-                $maptype = 'satellite';
-                break;
-            case 'terrain' :
-            case 'google relief' :
-                $maptype = 'terrain';
-                break;
-            case 'google road' :
-            default :
-                $maptype = 'roadmap';
-                break;
-        }
-        // TODO maybe use viewport / visible instead of center/zoom,
-        // 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 = "https://maps.googleapis.com/maps/api/staticmap?";
-        $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'];
-        // max is 21 (== building scale), but that's overkill..
-        if($gmap ['zoom'] > 17) {
-            $imgUrl .= "&zoom=17";
-        } else {
-            $imgUrl .= "&zoom=" . $gmap ['zoom'];
-        }
-        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;
-            }
-        }
-        $imgUrl .= "&format=png&maptype=" . $maptype;
-        global $conf;
-        $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;
-    }
-
-    /**
-     * Create a MapQuest static map API image url.
-     *
-     * @param array $gmap
-     * @param array $overlay
-     */
-    /*
+		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;
+			// TODO validate using exist & set up default img?
+			$img  = trim($img);
+			$text = p_get_instructions($text);
+			// dbg ( $text );
+			$text = p_render("xhtml", $text, $info);
+			// dbg ( $text );
+			$text       = addslashes(str_replace("\n", "", $text));
+			$overlay [] = array(
+				$lat,
+				$lon,
+				$text,
+				$angle,
+				$opacity,
+				$img
+			);
+		}
+		return $overlay;
+	}
+
+	/**
+	 * Create a Google maps static image url w/ the poi.
+	 *
+	 * @param array $gmap
+	 * @param array $overlay
+	 * @return string
+	 */
+	private function _getGoogle(array $gmap, array $overlay): string {
+		$sUrl = $this->getConf('iconUrlOverload');
+		if(!$sUrl) {
+			$sUrl = DOKU_URL;
+		}
+		switch($gmap ['baselyr']) {
+			case 'google hybrid' :
+				$maptype = 'hybrid';
+				break;
+			case 'google sat' :
+				$maptype = 'satellite';
+				break;
+			case 'terrain' :
+			case 'google relief' :
+				$maptype = 'terrain';
+				break;
+			case 'google road' :
+			default :
+				$maptype = 'roadmap';
+				break;
+		}
+		// TODO maybe use viewport / visible instead of center/zoom,
+		// 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 = "https://maps.googleapis.com/maps/api/staticmap?";
+		$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'];
+		// max is 21 (== building scale), but that's overkill..
+		if($gmap ['zoom'] > 17) {
+			$imgUrl .= "&zoom=17";
+		} else {
+			$imgUrl .= "&zoom=" . $gmap ['zoom'];
+		}
+		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;
+			}
+		}
+		$imgUrl .= "&format=png&maptype=" . $maptype;
+		global $conf;
+		$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;
+	}
+
+	/**
+	 * Create a MapQuest static map API image url.
+	 *
+	 * @param array $gmap
+	 * @param array $overlay
+	 */
+	/*
    private function _getMapQuest($gmap, $overlay) {
        $sUrl = $this->getConf ( 'iconUrlOverload' );
        if (! $sUrl) {
@@ -458,334 +458,334 @@ 
    }
    */
 
-    /**
-     * Create a static OSM map image url w/ the poi from http://staticmap.openstreetmap.de (staticMapLite)
-     * use http://staticmap.openstreetmap.de "staticMapLite" or a local version
-     *
-     * @param array $gmap
-     * @param array $overlay
-     *
-     * @return false|string
-     * @todo implementation for http://ojw.dev.openstreetmap.org/StaticMapDev/
-     */
-    private function _getStaticOSM(array $gmap, array $overlay) {
-        global $conf;
-
-        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(!$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']);
-
-            $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
-                    );
-                }
-            }
-
-            $apikey = '';
-            switch($gmap ['baselyr']) {
-                case 'mapnik' :
-                case 'openstreetmap' :
-                    $maptype = 'openstreetmap';
-                    break;
-                case 'transport' :
-                    $maptype = 'transport';
-                    $apikey  = $this->getConf('tfApiKey');
-                    break;
-                case 'landscape' :
-                    $maptype = 'landscape';
-                    $apikey  = $this->getConf('tfApiKey');
-                    break;
-                case 'outdoors' :
-                    $maptype = 'outdoors';
-                    $apikey  = $this->getConf('tfApiKey');
-                    break;
-                case 'cycle map' :
-                    $maptype = 'cycle';
-                    $apikey  = $this->getConf('tfApiKey');
-                    break;
-                case 'hike and bike map' :
-                    $maptype = 'hikeandbike';
-                    break;
-                case 'mapquest hybrid' :
-                case 'mapquest road' :
-                case 'mapquest sat' :
-                    $maptype = 'mapquest';
-                    break;
-                default :
-                    $maptype = '';
-                    break;
-            }
-
-            $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 = "https://staticmap.openstreetmap.de/staticmap.php";
-            $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'];
-            }
-
-            if(!empty ($overlay)) {
-                $rowId  = 0;
-                $imgUrl .= "&markers=";
-                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);
-            }
-
-            $result = $imgUrl;
-        }
-        // dbglog ( $result, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: osm image url is:' );
-        return $result;
-    }
-
-    /**
-     * Create a Bing maps static image url w/ the poi.
-     *
-     * @param array $gmap
-     * @param array $overlay
-     * @return string
-     */
-    private function _getBing(array $gmap, array $overlay): string {
-        switch($gmap ['baselyr']) {
-            case 've hybrid' :
-            case 'bing hybrid' :
-                $maptype = 'AerialWithLabels';
-                break;
-            case 've sat' :
-            case 'bing sat' :
-                $maptype = 'Aerial';
-                break;
-            case 've normal' :
-            case 've road' :
-            case 've' :
-            case 'bing road' :
-            default :
-                $maptype = 'Road';
-                break;
-        }
-        $imgUrl = "https://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 .= "&dcl=1";
-        }
-        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)) {
-            $rowId = 0;
-            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++;
-                // 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;
-                }
-                //$imgUrl .= "&pp=$lat,$lon;$iconStyle;$rowId";
-                $imgUrl .= "&pp=$lat%2C$lon%3B$iconStyle%3B$rowId";
-
-            }
-        }
-        global $conf;
-        $imgUrl .= "&fmt=png";
-        $imgUrl .= "&c=" . $conf ['lang'];
-        // dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::_getBing: bing image url is:');
-        return $imgUrl;
-    }
-
-    /**
-     * Calculate the minimum bbox for a start location + poi.
-     *
-     * @param array $overlay
-     *            multi-dimensional array of array($lat, $lon, $text, $angle, $opacity, $img)
-     * @param float $lat
-     *            latitude for map center
-     * @param float $lon
-     *            longitude for map center
-     * @return array :float array describing the mbr and center point
-     */
-    private function _calcBBOX(array $overlay, float $lat, float $lon): array {
-        $lats = array($lat);
-        $lons = array($lon);
-        foreach($overlay as $data) {
-            list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
-            $lats [] = $lat;
-            $lons [] = $lon;
-        }
-        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(
-            'minlat'    => $lats [0],
-            'minlon'    => $lons [0],
-            'maxlat'    => $lats [count($lats) - 1],
-            'maxlon'    => $lons [count($lats) - 1],
-            'centerlat' => $centerlat,
-            'centerlon' => $centerlon
-        );
-    }
-
-    /**
-     * convert latitude in decimal degrees to DMS+hemisphere.
-     *
-     * @param float $decimaldegrees
-     * @return string
-     * @todo move this into a shared library
-     */
-    private function convertLat(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
-            $latPos = "S";
-        } else {
-            $latPos = "N";
-        }
-        $dms = $this->_convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
-    }
-
-    /**
-     * Convert decimal degrees to degrees, minutes, seconds format
-     *
-     * @param float $decimaldegrees
-     * @return string dms
-     * @todo move this into a shared library
-     */
-    private function _convertDDtoDMS(float $decimaldegrees): string {
-        $dms  = floor($decimaldegrees);
-        $secs = ($decimaldegrees - $dms) * 3600;
-        $min  = floor($secs / 60);
-        $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
-        return $dms;
-    }
-
-    /**
-     * convert longitude in decimal degrees to DMS+hemisphere.
-     *
-     * @param float $decimaldegrees
-     * @return string
-     * @todo move this into a shared library
-     */
-    private function convertLon(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
-            $lonPos = "W";
-        } else {
-            $lonPos = "E";
-        }
-        $dms = $this->_convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
-    }
-
-    /**
-     * Figures out the base filename of a media path.
-     *
-     * @param string $mediaLink
-     * @return string
-     */
-    private function getFileName(string $mediaLink): string {
-        $mediaLink = str_replace('[[', '', $mediaLink);
-        $mediaLink = str_replace(']]', '', $mediaLink);
-        $mediaLink = substr($mediaLink, 0, -4);
-        $parts     = explode(':', $mediaLink);
-        $mediaLink = end($parts);
-        return str_replace('_', ' ', $mediaLink);
-    }
-
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::render()
-     */
-    function render($format, Doku_Renderer $renderer, $data): bool {
-        // set to true after external scripts tags are written
-        static $initialised = false;
-        // incremented for each map tag in the page source so we can keep track of each map in this page
-        static $mapnumber = 0;
-
-        // dbglog($data, 'olmap::render() data.');
-        list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
-
-        if($format == 'xhtml') {
-            $olscript     = '';
-            $olEnable     = false;
-            $gscript      = '';
-            $gEnable      = $this->getConf('enableGoogle');
-            $stamenEnable = $this->getConf('enableStamen');
-            $osmEnable    = $this->getConf('enableOSM');
-            $enableBing   = $this->getConf('enableBing');
-
-            $scriptEnable = '';
-            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>';
-                }
-                $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') . '";';
-                $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($format, p_get_instructions($staticImgUrl), $info) . '</div>';
-            }
-            $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">
+	/**
+	 * Create a static OSM map image url w/ the poi from http://staticmap.openstreetmap.de (staticMapLite)
+	 * use http://staticmap.openstreetmap.de "staticMapLite" or a local version
+	 *
+	 * @param array $gmap
+	 * @param array $overlay
+	 *
+	 * @return false|string
+	 * @todo implementation for http://ojw.dev.openstreetmap.org/StaticMapDev/
+	 */
+	private function _getStaticOSM(array $gmap, array $overlay) {
+		global $conf;
+
+		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(!$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']);
+
+			$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
+					);
+				}
+			}
+
+			$apikey = '';
+			switch($gmap ['baselyr']) {
+				case 'mapnik' :
+				case 'openstreetmap' :
+					$maptype = 'openstreetmap';
+					break;
+				case 'transport' :
+					$maptype = 'transport';
+					$apikey  = $this->getConf('tfApiKey');
+					break;
+				case 'landscape' :
+					$maptype = 'landscape';
+					$apikey  = $this->getConf('tfApiKey');
+					break;
+				case 'outdoors' :
+					$maptype = 'outdoors';
+					$apikey  = $this->getConf('tfApiKey');
+					break;
+				case 'cycle map' :
+					$maptype = 'cycle';
+					$apikey  = $this->getConf('tfApiKey');
+					break;
+				case 'hike and bike map' :
+					$maptype = 'hikeandbike';
+					break;
+				case 'mapquest hybrid' :
+				case 'mapquest road' :
+				case 'mapquest sat' :
+					$maptype = 'mapquest';
+					break;
+				default :
+					$maptype = '';
+					break;
+			}
+
+			$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 = "https://staticmap.openstreetmap.de/staticmap.php";
+			$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'];
+			}
+
+			if(!empty ($overlay)) {
+				$rowId  = 0;
+				$imgUrl .= "&markers=";
+				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);
+			}
+
+			$result = $imgUrl;
+		}
+		// dbglog ( $result, 'syntax_plugin_openlayersmap_olmap::_getStaticOSM: osm image url is:' );
+		return $result;
+	}
+
+	/**
+	 * Create a Bing maps static image url w/ the poi.
+	 *
+	 * @param array $gmap
+	 * @param array $overlay
+	 * @return string
+	 */
+	private function _getBing(array $gmap, array $overlay): string {
+		switch($gmap ['baselyr']) {
+			case 've hybrid' :
+			case 'bing hybrid' :
+				$maptype = 'AerialWithLabels';
+				break;
+			case 've sat' :
+			case 'bing sat' :
+				$maptype = 'Aerial';
+				break;
+			case 've normal' :
+			case 've road' :
+			case 've' :
+			case 'bing road' :
+			default :
+				$maptype = 'Road';
+				break;
+		}
+		$imgUrl = "https://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 .= "&dcl=1";
+		}
+		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)) {
+			$rowId = 0;
+			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++;
+				// 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;
+				}
+				//$imgUrl .= "&pp=$lat,$lon;$iconStyle;$rowId";
+				$imgUrl .= "&pp=$lat%2C$lon%3B$iconStyle%3B$rowId";
+
+			}
+		}
+		global $conf;
+		$imgUrl .= "&fmt=png";
+		$imgUrl .= "&c=" . $conf ['lang'];
+		// dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::_getBing: bing image url is:');
+		return $imgUrl;
+	}
+
+	/**
+	 * Calculate the minimum bbox for a start location + poi.
+	 *
+	 * @param array $overlay
+	 *            multi-dimensional array of array($lat, $lon, $text, $angle, $opacity, $img)
+	 * @param float $lat
+	 *            latitude for map center
+	 * @param float $lon
+	 *            longitude for map center
+	 * @return array :float array describing the mbr and center point
+	 */
+	private function _calcBBOX(array $overlay, float $lat, float $lon): array {
+		$lats = array($lat);
+		$lons = array($lon);
+		foreach($overlay as $data) {
+			list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
+			$lats [] = $lat;
+			$lons [] = $lon;
+		}
+		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(
+			'minlat'    => $lats [0],
+			'minlon'    => $lons [0],
+			'maxlat'    => $lats [count($lats) - 1],
+			'maxlon'    => $lons [count($lats) - 1],
+			'centerlat' => $centerlat,
+			'centerlon' => $centerlon
+		);
+	}
+
+	/**
+	 * convert latitude in decimal degrees to DMS+hemisphere.
+	 *
+	 * @param float $decimaldegrees
+	 * @return string
+	 * @todo move this into a shared library
+	 */
+	private function convertLat(float $decimaldegrees): string {
+		if(strpos($decimaldegrees, '-') !== false) {
+			$latPos = "S";
+		} else {
+			$latPos = "N";
+		}
+		$dms = $this->_convertDDtoDMS(abs($decimaldegrees));
+		return hsc($dms . $latPos);
+	}
+
+	/**
+	 * Convert decimal degrees to degrees, minutes, seconds format
+	 *
+	 * @param float $decimaldegrees
+	 * @return string dms
+	 * @todo move this into a shared library
+	 */
+	private function _convertDDtoDMS(float $decimaldegrees): string {
+		$dms  = floor($decimaldegrees);
+		$secs = ($decimaldegrees - $dms) * 3600;
+		$min  = floor($secs / 60);
+		$sec  = round($secs - ($min * 60), 3);
+		$dms  .= 'º' . $min . '\'' . $sec . '"';
+		return $dms;
+	}
+
+	/**
+	 * convert longitude in decimal degrees to DMS+hemisphere.
+	 *
+	 * @param float $decimaldegrees
+	 * @return string
+	 * @todo move this into a shared library
+	 */
+	private function convertLon(float $decimaldegrees): string {
+		if(strpos($decimaldegrees, '-') !== false) {
+			$lonPos = "W";
+		} else {
+			$lonPos = "E";
+		}
+		$dms = $this->_convertDDtoDMS(abs($decimaldegrees));
+		return hsc($dms . $lonPos);
+	}
+
+	/**
+	 * Figures out the base filename of a media path.
+	 *
+	 * @param string $mediaLink
+	 * @return string
+	 */
+	private function getFileName(string $mediaLink): string {
+		$mediaLink = str_replace('[[', '', $mediaLink);
+		$mediaLink = str_replace(']]', '', $mediaLink);
+		$mediaLink = substr($mediaLink, 0, -4);
+		$parts     = explode(':', $mediaLink);
+		$mediaLink = end($parts);
+		return str_replace('_', ' ', $mediaLink);
+	}
+
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::render()
+	 */
+	function render($format, Doku_Renderer $renderer, $data): bool {
+		// set to true after external scripts tags are written
+		static $initialised = false;
+		// incremented for each map tag in the page source so we can keep track of each map in this page
+		static $mapnumber = 0;
+
+		// dbglog($data, 'olmap::render() data.');
+		list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
+
+		if($format == 'xhtml') {
+			$olscript     = '';
+			$olEnable     = false;
+			$gscript      = '';
+			$gEnable      = $this->getConf('enableGoogle');
+			$stamenEnable = $this->getConf('enableStamen');
+			$osmEnable    = $this->getConf('enableOSM');
+			$enableBing   = $this->getConf('enableBing');
+
+			$scriptEnable = '';
+			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>';
+				}
+				$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') . '";';
+				$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($format, p_get_instructions($staticImgUrl), $info) . '</div>';
+			}
+			$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>
                     <thead class="olPOITblHeader">
@@ -793,59 +793,59 @@ 
                     <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>
+					. $this->getLang('olmapPOIlat') . '</th>
                     <th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle') . '">'
-                    . $this->getLang('olmapPOIlon') . '</th>
+					. $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 .= '<tbody class="olPOITblBody">' . $poitable . '</tbody>
+				if($poitabledesc != '') {
+					$renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">' . $poitabledesc
+						. '</td></tr></tfoot>';
+				}
+				$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++;
-            return true;
-        } elseif($format == 'metadata') {
-            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 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');
-                }
-            }
-
-            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);
-                $img = $rel ['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;
-
-                    // ... and neither does this; the firstimage entry in the .meta file is empty
-                    // $relation = array('relation'=>array('firstimage'=>$_firstimage));
-                    // p_set_metadata($ID, $relation, false, false);
-
-                    // ... this works
-                    $renderer->internalmedia($_firstimage, $poitabledesc);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
+			}
+			// 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++;
+			return true;
+		} elseif($format == 'metadata') {
+			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 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');
+				}
+			}
+
+			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);
+				$img = $rel ['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;
+
+					// ... and neither does this; the firstimage entry in the .meta file is empty
+					// $relation = array('relation'=>array('firstimage'=>$_firstimage));
+					// p_set_metadata($ID, $relation, false, false);
+
+					// ... this works
+					$renderer->internalmedia($_firstimage, $poitabledesc);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
 }

Spacing +128 added lines, -128 removed lines

@@ -94,10 +94,10 @@ 
         preg_match('(lon[:|=]\"-?\d*\.?\d*\")', $match, $mainLon);
         $mainLat = substr($mainLat [0], 5, -1);
         $mainLon = substr($mainLon [0], 5, -1);
-        if(!is_numeric($mainLat)) {
+        if (!is_numeric($mainLat)) {
             $mainLat = $this->dflt ['lat'];
         }
-        if(!is_numeric($mainLon)) {
+        if (!is_numeric($mainLon)) {
             $mainLon = $this->dflt ['lon'];
         }
 
@@ -108,23 +108,23 @@ 
         $_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 .= "&.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);
-                $imgUrl        .= $_firstimageID;
-                if($this->getConf('optionStaticMapGenerator') == 'remote') {
+                $imgUrl .= $_firstimageID;
+                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
@@ -142,33 +142,33 @@ 
         } */ else {
             // default OSM
             $_firstimageID = $this->_getStaticOSM($gmap, $overlay);
-            $imgUrl        .= $_firstimageID;
-            if($this->getConf('optionStaticMapGenerator') == 'remote') {
+            $imgUrl .= $_firstimageID;
+            if ($this->getConf('optionStaticMapGenerator') == 'remote') {
                 $imgUrl .= "&.png";
             }
         }
 
         // append dw p_render specific params and render
-        $imgUrl .= "?" . str_replace("px", "", $gmap ['width']) . "x"
+        $imgUrl .= "?".str_replace("px", "", $gmap ['width'])."x"
             . str_replace("px", "", $gmap ['height']);
         $imgUrl .= "&nolink";
 
         // add nocache option for selected services
-        if($_nocache) {
+        if ($_nocache) {
             $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)) {
+        if (!empty ($param)) {
             $param = substr($param, 0, -2);
         }
         unset ($gmap ['id']);
@@ -177,13 +177,13 @@ 
         $poi      = '';
         $poitable = '';
         $rowId    = 0;
-        if(!empty ($overlay)) {
-            foreach($overlay as $data) {
+        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') {
+                if ($this->getConf('displayformat') === 'DMS') {
                     $lat = $this->convertLat($lat);
                     $lon = $this->convertLon($lon);
                 } else {
@@ -193,52 +193,52 @@ 
 
                 $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);
         }
-        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="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>
+                . $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>
+                . $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]};";
+        $js       = "{mapOpts: {".$param.", displayformat: '".$this->getConf('displayformat')
+            . "', autozoom: ".$autozoom."}, poi: [$poi]};";
         // unescape the json
         $poitable = stripslashes($poitable);
 
@@ -266,21 +266,21 @@ 
         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);
-            if($defval !== '') {
+        foreach ($gmap as $key => &$value) {
+            $defval = $this->getConf('default_'.$key);
+            if ($defval !== '') {
                 $value = $defval;
             }
         }
         unset ($value);
-        foreach($param as $kvpair) {
+        foreach ($param as $kvpair) {
             list ($match, $key, $val) = $kvpair;
             $key = strtolower($key);
-            if(isset ($gmap [$key])) {
-                if($key == 'summary') {
+            if (isset ($gmap [$key])) {
+                if ($key == 'summary') {
                     // preserve case for summary field
                     $gmap [$key] = $val;
-                } elseif($key == 'id') {
+                } elseif ($key == 'id') {
                     // preserve case for id field
                     $gmap [$key] = $val;
                 } else {
@@ -310,7 +310,7 @@ 
         );
         // create poi array
         $overlay = array();
-        foreach($point as $pt) {
+        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;
@@ -344,10 +344,10 @@ 
      */
     private function _getGoogle(array $gmap, array $overlay): string {
         $sUrl = $this->getConf('iconUrlOverload');
-        if(!$sUrl) {
+        if (!$sUrl) {
             $sUrl = DOKU_URL;
         }
-        switch($gmap ['baselyr']) {
+        switch ($gmap ['baselyr']) {
             case 'google hybrid' :
                 $maptype = 'hybrid';
                 break;
@@ -367,29 +367,29 @@ 
         // 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 = "https://maps.googleapis.com/maps/api/staticmap?";
-        $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x"
+        $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) {
+        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) {
+            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 .= "&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;
@@ -471,20 +471,20 @@ 
     private function _getStaticOSM(array $gmap, array $overlay) {
         global $conf;
 
-        if($this->getConf('optionStaticMapGenerator') == 'local') {
+        if ($this->getConf('optionStaticMapGenerator') == 'local') {
             // using local basemap composer
-            if(!$myMap = plugin_load('helper', 'openlayersmap_staticmap')) {
+            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')) {
+            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"
+            $size = str_replace("px", "", $gmap ['width'])."x"
                 . str_replace("px", "", $gmap ['height']);
 
             $markers = array();
-            if(!empty ($overlay)) {
-                foreach($overlay as $data) {
+            if (!empty ($overlay)) {
+                foreach ($overlay as $data) {
                     list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                     $iconStyle  = substr($img, 0, strlen($img) - 4);
                     $markers [] = array(
@@ -496,7 +496,7 @@ 
             }
 
             $apikey = '';
-            switch($gmap ['baselyr']) {
+            switch ($gmap ['baselyr']) {
                 case 'mapnik' :
                 case 'openstreetmap' :
                     $maptype = 'openstreetmap';
@@ -540,25 +540,25 @@ 
             // 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 = "https://staticmap.openstreetmap.de/staticmap.php";
-            $imgUrl .= "?center=" . $gmap ['lat'] . "," . $gmap ['lon'];
-            $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x"
+            $imgUrl .= "?center=".$gmap ['lat'].",".$gmap ['lon'];
+            $imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x"
                 . str_replace("px", "", $gmap ['height']);
 
-            if($gmap ['zoom'] > 16) {
+            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)) {
-                $rowId  = 0;
+            if (!empty ($overlay)) {
+                $rowId = 0;
                 $imgUrl .= "&markers=";
-                foreach($overlay as $data) {
+                foreach ($overlay as $data) {
                     list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                     $rowId++;
                     $iconStyle = "lightblue$rowId";
-                    $imgUrl    .= "$lat,$lon,$iconStyle%7c";
+                    $imgUrl .= "$lat,$lon,$iconStyle%7c";
                 }
                 $imgUrl = substr($imgUrl, 0, -3);
             }
@@ -577,7 +577,7 @@ 
      * @return string
      */
     private function _getBing(array $gmap, array $overlay): string {
-        switch($gmap ['baselyr']) {
+        switch ($gmap ['baselyr']) {
             case 've hybrid' :
             case 'bing hybrid' :
                 $maptype = 'AerialWithLabels';
@@ -594,30 +594,30 @@ 
                 $maptype = 'Road';
                 break;
         }
-        $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/" . $maptype;// . "/";
-        if($this->getConf('autoZoomMap')) {
+        $imgUrl = "https://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"
+        $imgUrl .= "&ms=".str_replace("px", "", $gmap ['width'])."%2C"
             . str_replace("px", "", $gmap ['height']);
-        $imgUrl .= "&key=" . $this->getConf('bingAPIKey');
-        if(!empty ($overlay)) {
+        $imgUrl .= "&key=".$this->getConf('bingAPIKey');
+        if (!empty ($overlay)) {
             $rowId = 0;
-            foreach($overlay as $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++;
                 // 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) {
+                if ($rowId == 18) {
                     break;
                 }
                 //$imgUrl .= "&pp=$lat,$lon;$iconStyle;$rowId";
@@ -627,7 +627,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;
     }
@@ -646,7 +646,7 @@ 
     private function _calcBBOX(array $overlay, float $lat, float $lon): array {
         $lats = array($lat);
         $lons = array($lon);
-        foreach($overlay as $data) {
+        foreach ($overlay as $data) {
             list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
             $lats [] = $lat;
             $lons [] = $lon;
@@ -674,13 +674,13 @@ 
      * @todo move this into a shared library
      */
     private function convertLat(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
+        if (strpos($decimaldegrees, '-') !== false) {
             $latPos = "S";
         } else {
             $latPos = "N";
         }
         $dms = $this->_convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
+        return hsc($dms.$latPos);
     }
 
     /**
@@ -695,7 +695,7 @@ 
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º'.$min.'\''.$sec.'"';
         return $dms;
     }
 
@@ -707,13 +707,13 @@ 
      * @todo move this into a shared library
      */
     private function convertLon(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
+        if (strpos($decimaldegrees, '-') !== false) {
             $lonPos = "W";
         } else {
             $lonPos = "E";
         }
         $dms = $this->_convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
+        return hsc($dms.$lonPos);
     }
 
     /**
@@ -744,7 +744,7 @@ 
         // dbglog($data, 'olmap::render() data.');
         list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
 
-        if($format == 'xhtml') {
+        if ($format == 'xhtml') {
             $olscript     = '';
             $olEnable     = false;
             $gscript      = '';
@@ -754,56 +754,56 @@ 
             $enableBing   = $this->getConf('enableBing');
 
             $scriptEnable = '';
-            if(!$initialised) {
+            if (!$initialised) {
                 $initialised = true;
                 // render necessary script tags
-                if($gEnable) {
+                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>';
+                        . $this->getConf('googleAPIkey').'"></script>';
                 }
-                $olscript = '<script charset="utf-8" defer="defer" src="' . DOKU_BASE
+                $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($format, 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($format, 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
+                if ($poitabledesc != '') {
+                    $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
@@ -812,26 +812,26 @@ 
             $renderer->doc .= '"></script>';
             $mapnumber++;
             return true;
-        } elseif($format == 'metadata') {
-            if(!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) {
+        } elseif ($format == 'metadata') {
+            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);
+                    $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);
                 $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;

Braces +3 added lines, -2 removed lines

@@ -602,8 +602,9 @@
                 . "%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"

icons/index.php

Indentation +4 added lines, -4 removed lines

@@ -42,9 +42,9 @@
 </head>
 <body>
 <div class="box"><?php
-    foreach(glob('*.png') as $img) {
-        echo '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" /> ';
-    }
-    ?></div>
+	foreach(glob('*.png') as $img) {
+		echo '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" /> ';
+	}
+	?></div>
 </body>
 </html>

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 </head>
 <body>
 <div class="box"><?php
-    foreach(glob('*.png') as $img) {
-        echo '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" /> ';
+    foreach (glob('*.png') as $img) {
+        echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
     }
     ?></div>
 </body>