mprins / dokuwiki-plugin-openlayersmap

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'
 );

action.php

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';

Indentation +36 added lines, -36 removed lines

@@ -24,43 +24,43 @@
  */
 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("_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("_data" => "document.documentElement.className += ' olCSSsupported';");
+	}
 }

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>

_test/general.test.php

Indentation +33 added lines, -33 removed lines

@@ -24,42 +24,42 @@
  */
 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.
-     */
-    final public function test_plugininfo(): void {
-        $file = __DIR__ . '/../plugin.info.txt';
-        self::assertFileExists($file);
+	/**
+	 * Simple test to make sure the plugin.info.txt is in correct format.
+	 */
+	final public function test_plugininfo(): void {
+		$file = __DIR__ . '/../plugin.info.txt';
+		self::assertFileExists($file);
 
-        $info = confToHash($file);
+		$info = confToHash($file);
 
-        self::assertArrayHasKey('base', $info);
-        self::assertArrayHasKey('author', $info);
-        self::assertArrayHasKey('email', $info);
-        self::assertArrayHasKey('date', $info);
-        self::assertArrayHasKey('name', $info);
-        self::assertArrayHasKey('desc', $info);
-        self::assertArrayHasKey('url', $info);
+		self::assertArrayHasKey('base', $info);
+		self::assertArrayHasKey('author', $info);
+		self::assertArrayHasKey('email', $info);
+		self::assertArrayHasKey('date', $info);
+		self::assertArrayHasKey('name', $info);
+		self::assertArrayHasKey('desc', $info);
+		self::assertArrayHasKey('url', $info);
 
-        self::assertEquals('openlayersmap', $info['base']);
-        self::assertRegExp('/^https?:\/\//', $info['url']);
-        self::assertTrue(mail_isvalid($info['email']));
-        self::assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
-        self::assertTrue(false !== strtotime($info['date']));
-    }
+		self::assertEquals('openlayersmap', $info['base']);
+		self::assertRegExp('/^https?:\/\//', $info['url']);
+		self::assertTrue(mail_isvalid($info['email']));
+		self::assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+		self::assertTrue(false !== strtotime($info['date']));
+	}
 
-    /**
-     * test if plugin is loaded.
-     */
-    final public function test_plugin_openlayersmap_isloaded(): void {
-        global $plugin_controller;
-        self::assertContains(
-            'geophp', $plugin_controller->getList(), "geophp plugin is loaded"
-        );
-        self::assertContains(
-            'openlayersmap', $plugin_controller->getList(), "openlayersmap plugin is loaded"
-        );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	final public function test_plugin_openlayersmap_isloaded(): void {
+		global $plugin_controller;
+		self::assertContains(
+			'geophp', $plugin_controller->getList(), "geophp plugin is loaded"
+		);
+		self::assertContains(
+			'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.
      */
     final public function test_plugininfo(): void {
-        $file = __DIR__ . '/../plugin.info.txt';
+        $file = __DIR__.'/../plugin.info.txt';
         self::assertFileExists($file);
 
         $info = confToHash($file);

syntax/olmap.php

Braces +3 added lines, -2 removed lines

@@ -617,8 +617,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'] );

Indentation +724 added lines, -724 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->extractParams($str_params);
-        $overlay       = $this->extractPoints($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->extractParams($str_params);
+		$overlay       = $this->extractPoints($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,169 +140,169 @@ 
                 $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 extractParams(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 extractPoints(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 extractParams(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 extractPoints(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: (.*?)
@@ -310,104 +310,104 @@ 
          * 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) {
@@ -465,337 +465,337 @@ 
    }
    */
 
-    /**
-     * 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,
-                    'openlayersmap_staticmap plugin is not available for use.'
-                );
-            }
-            if(!$geophp = plugin_load('helper', 'geophp')) {
-                dbglog($geophp, 'geophp plugin is not available for use.');
-            }
-            $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  = '?apikey=' . $this->getConf('tfApiKey');
-                    break;
-                case 'landscape' :
-                    $maptype = 'landscape';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
-                    break;
-                case 'outdoors' :
-                    $maptype = 'outdoors';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
-                    break;
-                case 'cycle map' :
-                    $maptype = 'cycle';
-                    $apikey  = '?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'], $apikey
-            );
-        } else {
-            // using external basemap composer
-
-            // https://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()
-     */
-    public 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     = '';
-            $stamenEnable = $this->getConf('enableStamen');
-            $osmEnable    = $this->getConf('enableOSM');
-            $enableBing   = $this->getConf('enableBing');
-
-            $scriptEnable = '';
-            if(!$initialised) {
-                $initialised = true;
-                // render necessary script tags only once
-                $olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol.js"></script>
+	/**
+	 * 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,
+					'openlayersmap_staticmap plugin is not available for use.'
+				);
+			}
+			if(!$geophp = plugin_load('helper', 'geophp')) {
+				dbglog($geophp, 'geophp plugin is not available for use.');
+			}
+			$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  = '?apikey=' . $this->getConf('tfApiKey');
+					break;
+				case 'landscape' :
+					$maptype = 'landscape';
+					$apikey  = '?apikey=' . $this->getConf('tfApiKey');
+					break;
+				case 'outdoors' :
+					$maptype = 'outdoors';
+					$apikey  = '?apikey=' . $this->getConf('tfApiKey');
+					break;
+				case 'cycle map' :
+					$maptype = 'cycle';
+					$apikey  = '?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'], $apikey
+			);
+		} else {
+			// using external basemap composer
+
+			// https://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()
+	 */
+	public 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     = '';
+			$stamenEnable = $this->getConf('enableStamen');
+			$osmEnable    = $this->getConf('enableOSM');
+			$enableBing   = $this->getConf('enableBing');
+
+			$scriptEnable = '';
+			if(!$initialised) {
+				$initialised = true;
+				// render necessary script tags only once
+				$olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol.js"></script>
 <script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol-layerswitcher.js"></script>';
 
-                $scriptEnable = '<script defer="defer" src="data:text/javascript;base64,';
-                $scriptSrc    = $olscript ? 'const olEnable=true;' : 'const olEnable=false;';
-                $scriptSrc    .= 'const osmEnable=' . ($osmEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const stamenEnable=' . ($stamenEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bEnable=' . ($enableBing ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bApiKey="' . $this->getConf('bingAPIKey') . '";';
-                $scriptSrc    .= 'const tfApiKey="' . $this->getConf('tfApiKey') . '";';
-                $scriptSrc    .= 'const gApiKey="' . $this->getConf('googleAPIkey') . '";';
-                $scriptSrc    .= 'olMapData = []; let olMaps = {}; let olMapOverlays = {};';
-                $scriptEnable .= base64_encode($scriptSrc);
-                $scriptEnable .= '"></script>';
-            }
-            $renderer->doc .= "$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 .= '
+				$scriptEnable = '<script defer="defer" src="data:text/javascript;base64,';
+				$scriptSrc    = $olscript ? 'const olEnable=true;' : 'const olEnable=false;';
+				$scriptSrc    .= 'const osmEnable=' . ($osmEnable ? 'true' : 'false') . ';';
+				$scriptSrc    .= 'const stamenEnable=' . ($stamenEnable ? 'true' : 'false') . ';';
+				$scriptSrc    .= 'const bEnable=' . ($enableBing ? 'true' : 'false') . ';';
+				$scriptSrc    .= 'const bApiKey="' . $this->getConf('bingAPIKey') . '";';
+				$scriptSrc    .= 'const tfApiKey="' . $this->getConf('tfApiKey') . '";';
+				$scriptSrc    .= 'const gApiKey="' . $this->getConf('googleAPIkey') . '";';
+				$scriptSrc    .= 'olMapData = []; let olMaps = {}; let olMapOverlays = {};';
+				$scriptEnable .= base64_encode($scriptSrc);
+				$scriptEnable .= '"></script>';
+			}
+			$renderer->doc .= "$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>
@@ -804,64 +804,64 @@ 
                     <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>';
-                $renderer->doc .= "\n";
-            }
-            // render inline mapscript parts
-            $renderer->doc .= '<script 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 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;
-    }
+				$renderer->doc .= "\n";
+			}
+			// render inline mapscript parts
+			$renderer->doc .= '<script 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 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 +130 added lines, -130 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 {
@@ -316,7 +316,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;
@@ -350,10 +350,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;
@@ -373,29 +373,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;
@@ -478,23 +478,23 @@ 
     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,
                     'openlayersmap_staticmap plugin is not available for use.'
                 );
             }
-            if(!$geophp = plugin_load('helper', 'geophp')) {
+            if (!$geophp = plugin_load('helper', 'geophp')) {
                 dbglog($geophp, 'geophp plugin is not available for use.');
             }
-            $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(
@@ -506,26 +506,26 @@ 
             }
 
             $apikey = '';
-            switch($gmap ['baselyr']) {
+            switch ($gmap ['baselyr']) {
                 case 'mapnik' :
                 case 'openstreetmap' :
                     $maptype = 'openstreetmap';
                     break;
                 case 'transport' :
                     $maptype = 'transport';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'landscape' :
                     $maptype = 'landscape';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'outdoors' :
                     $maptype = 'outdoors';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'cycle map' :
                     $maptype = 'cycle';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'hike and bike map' :
                     $maptype = 'hikeandbike';
@@ -554,25 +554,25 @@ 
             //  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);
             }
@@ -591,7 +591,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';
@@ -608,33 +608,33 @@ 
                 $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";
@@ -644,7 +644,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;
     }
@@ -663,7 +663,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;
@@ -691,13 +691,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);
     }
 
     /**
@@ -712,7 +712,7 @@ 
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º'.$min.'\''.$sec.'"';
         return $dms;
     }
 
@@ -724,13 +724,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);
     }
 
     /**
@@ -761,60 +761,60 @@ 
         // dbglog($data, 'olmap::render() data.');
         list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
 
-        if($format == 'xhtml') {
+        if ($format == 'xhtml') {
             $olscript     = '';
             $stamenEnable = $this->getConf('enableStamen');
             $osmEnable    = $this->getConf('enableOSM');
             $enableBing   = $this->getConf('enableBing');
 
             $scriptEnable = '';
-            if(!$initialised) {
+            if (!$initialised) {
                 $initialised = true;
                 // render necessary script tags only once
-                $olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol.js"></script>
-<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol-layerswitcher.js"></script>';
+                $olscript = '<script defer="defer" src="'.DOKU_BASE.'lib/plugins/openlayersmap/ol6/ol.js"></script>
+<script defer="defer" src="' . DOKU_BASE.'lib/plugins/openlayersmap/ol6/ol-layerswitcher.js"></script>';
 
                 $scriptEnable = '<script defer="defer" src="data:text/javascript;base64,';
                 $scriptSrc    = $olscript ? 'const olEnable=true;' : 'const olEnable=false;';
-                $scriptSrc    .= 'const osmEnable=' . ($osmEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const stamenEnable=' . ($stamenEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bEnable=' . ($enableBing ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bApiKey="' . $this->getConf('bingAPIKey') . '";';
-                $scriptSrc    .= 'const tfApiKey="' . $this->getConf('tfApiKey') . '";';
-                $scriptSrc    .= 'const gApiKey="' . $this->getConf('googleAPIkey') . '";';
+                $scriptSrc    .= 'const osmEnable='.($osmEnable ? 'true' : 'false').';';
+                $scriptSrc    .= 'const stamenEnable='.($stamenEnable ? 'true' : 'false').';';
+                $scriptSrc    .= 'const bEnable='.($enableBing ? 'true' : 'false').';';
+                $scriptSrc    .= 'const bApiKey="'.$this->getConf('bingAPIKey').'";';
+                $scriptSrc    .= 'const tfApiKey="'.$this->getConf('tfApiKey').'";';
+                $scriptSrc    .= 'const gApiKey="'.$this->getConf('googleAPIkey').'";';
                 $scriptSrc    .= 'olMapData = []; let olMaps = {}; let olMapOverlays = {};';
                 $scriptEnable .= base64_encode($scriptSrc);
                 $scriptEnable .= '"></script>';
             }
             $renderer->doc .= "$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>
+                <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>';
                 $renderer->doc .= "\n";
@@ -825,28 +825,28 @@ 
             $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 same.' );
                     // This seems to never work; the firstimage entry in the .meta file is empty

admin/purge.php

Indentation +90 added lines, -90 removed lines

@@ -24,101 +24,101 @@
  * @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;
+	}
 
-    public function getMenuIcon(): string {
-        $plugin = $this->getPluginName();
-        return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
-    }
+	public function getMenuIcon(): string {
+		$plugin = $this->getPluginName();
+		return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
+	}
 
-    /**
-     * (non-PHPdoc)
-     * @see DokuWiki_Admin_Plugin::handle()
-     */
-    public function handle(): void {
-        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(): void {
+		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(string $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(string $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(): void {
-        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(): void {
+		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 +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 
     public function getMenuIcon(): string {
         $plugin = $this->getPluginName();
-        return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
+        return DOKU_PLUGIN.$plugin.'/admin/purge.svg';
     }
 
     /**
@@ -43,18 +43,18 @@ 
      */
     public function handle(): void {
         global $conf;
-        if(!isset($_REQUEST['continue']) || !checkSecurityToken()) {
+        if (!isset($_REQUEST['continue']) || !checkSecurityToken()) {
             return;
         }
-        if(isset($_REQUEST['purgetiles'])) {
-            $path = $conf['cachedir'] . '/olmaptiles';
-            if($this->rrmdir($path)) {
+        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)) {
+        if (isset($_REQUEST['purgemaps'])) {
+            $path = $conf['mediadir'].'/olmapmaps';
+            if ($this->rrmdir($path)) {
                 msg($this->getLang('admin_purged_maps'), 0);
             }
         }
@@ -66,12 +66,12 @@ 
      * @return boolean true when succesful
      */
     private function rrmdir(string $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");
                 }
@@ -98,7 +98,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>');
@@ -108,7 +108,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();

helper/staticmap.php

Indentation +114 added lines, -114 removed lines

@@ -24,125 +24,125 @@
  * @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 float  $lat     the latitude of the map's center, eg. 40.714728
-     * @param float  $lon     the longitude of the map's center, eg -73.998672
-     * @param int    $zoom    the zoom level in the tile cache, eg. 14
-     * @param string $size    the size in WxH px, eg. 512x512
-     * @param string $maptype the maptype, eg. cycle
-     * @param array  $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 $apikey  optional API key eg. for Thunderforest maps
-     *
-     * @return string
-     */
-    public function getMap(
-        float $lat,
-        float $lon,
-        int $zoom,
-        string $size,
-        string $maptype,
-        array $markers,
-        string $gpx,
-        string $kml,
-        string $geojson,
-        string $apikey = ''
-    ): string {
-        global $conf;
-        // dbglog($markers,'helper_plugin_openlayersmap_staticmap::getMap: markers :');
+	/**
+	 * Create the map.
+	 *
+	 * @param float  $lat     the latitude of the map's center, eg. 40.714728
+	 * @param float  $lon     the longitude of the map's center, eg -73.998672
+	 * @param int    $zoom    the zoom level in the tile cache, eg. 14
+	 * @param string $size    the size in WxH px, eg. 512x512
+	 * @param string $maptype the maptype, eg. cycle
+	 * @param array  $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 $apikey  optional API key eg. for Thunderforest maps
+	 *
+	 * @return string
+	 */
+	public function getMap(
+		float $lat,
+		float $lon,
+		int $zoom,
+		string $size,
+		string $maptype,
+		array $markers,
+		string $gpx,
+		string $kml,
+		string $geojson,
+		string $apikey = ''
+	): string {
+		global $conf;
+		// dbglog($markers,'helper_plugin_openlayersmap_staticmap::getMap: markers :');
 
-        // normalize zoom
-        $zoom = $zoom ?: 0;
-        if($zoom > 18) {
-            $zoom = 18;
-        }
-        // normalize WxH
-        list($width, $height) = explode('x', $size);
-        $width = (int) $width;
-        if($width > $this->maxWidth) {
-            $width = $this->maxWidth;
-        }
-        $height = (int) $height;
-        if($height > $this->maxHeight) {
-            $height = $this->maxHeight;
-        }
+		// normalize zoom
+		$zoom = $zoom ?: 0;
+		if($zoom > 18) {
+			$zoom = 18;
+		}
+		// normalize WxH
+		list($width, $height) = explode('x', $size);
+		$width = (int) $width;
+		if($width > $this->maxWidth) {
+			$width = $this->maxWidth;
+		}
+		$height = (int) $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
-        require_once DOKU_PLUGIN . 'openlayersmap/StaticMap.php';
-        $map = new StaticMap(
-            $lat, $lon, $zoom, $width, $height, $maptype,
-            $markers, $gpx, $kml, $geojson, $conf['mediadir'], $conf['cachedir'],
-            $this->getConf('autoZoomMap'), $apikey
-        );
+		// create map
+		require_once DOKU_PLUGIN . 'openlayersmap/StaticMap.php';
+		$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 str_replace('/', ':', $map->getMap());
-    }
+		// return the media id url
+		// $mediaId = str_replace('/', ':', $map->getMap());
+		// if($this->startsWith($mediaId,':')) {
+		//     $mediaId = substr($mediaId, 1);
+		// }
+		// return $mediaId;
+		return str_replace('/', ':', $map->getMap());
+	}
 
-    /**
-     * 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(array("[[", "]]"), "", $id);
-        if((strpos($id, ':') === 0)) {
-            $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(array("[[", "]]"), "", $id);
+		if((strpos($id, ':') === 0)) {
+			$id = substr($id, 1);
+		}
+		$id = str_replace(":", "/", $id);
+		return $conf['mediadir'] . '/' . $id;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -90,17 +90,17 @@ 
 
         // normalize zoom
         $zoom = $zoom ?: 0;
-        if($zoom > 18) {
+        if ($zoom > 18) {
             $zoom = 18;
         }
         // normalize WxH
         list($width, $height) = explode('x', $size);
         $width = (int) $width;
-        if($width > $this->maxWidth) {
+        if ($width > $this->maxWidth) {
             $width = $this->maxWidth;
         }
         $height = (int) $height;
-        if($height > $this->maxHeight) {
+        if ($height > $this->maxHeight) {
             $height = $this->maxHeight;
         }
 
@@ -112,7 +112,7 @@ 
         $geojson = $this->mediaIdToPath($geojson);
 
         // create map
-        require_once DOKU_PLUGIN . 'openlayersmap/StaticMap.php';
+        require_once DOKU_PLUGIN.'openlayersmap/StaticMap.php';
         $map = new StaticMap(
             $lat, $lon, $zoom, $width, $height, $maptype,
             $markers, $gpx, $kml, $geojson, $conf['mediadir'], $conf['cachedir'],
@@ -135,14 +135,14 @@ 
      */
     private function mediaIdToPath(string $id): string {
         global $conf;
-        if(empty($id)) {
+        if (empty($id)) {
             return "";
         }
         $id = str_replace(array("[[", "]]"), "", $id);
-        if((strpos($id, ':') === 0)) {
+        if ((strpos($id, ':') === 0)) {
             $id = substr($id, 1);
         }
         $id = str_replace(":", "/", $id);
-        return $conf['mediadir'] . '/' . $id;
+        return $conf['mediadir'].'/'.$id;
     }
 }

syntax/osmlayer.php

Indentation +96 added lines, -96 removed lines

@@ -22,110 +22,110 @@
  */
 class syntax_plugin_openlayersmap_osmlayer extends DokuWiki_Syntax_Plugin
 {
-    private $dflt = array(
-        'id'          => 'olmap',
-        'name'        => '',
-        'url'         => '',
-        'opacity'     => 0.8,
-        'attribution' => '',
-        'visible'     => false,
-        'cors'        => null
-    );
+	private $dflt = array(
+		'id'          => 'olmap',
+		'name'        => '',
+		'url'         => '',
+		'opacity'     => 0.8,
+		'attribution' => '',
+		'visible'     => false,
+		'cors'        => null
+	);
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::getPType()
-     */
-    public function getPType(): string
-    {
-        return 'block';
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getPType()
+	 */
+	public function getPType(): string
+	{
+		return 'block';
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::getType()
-     */
-    public function getType(): string
-    {
-        // return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
-        return 'baseonly';
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getType()
+	 */
+	public function getType(): string
+	{
+		// return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
+		return 'baseonly';
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see Doku_Parser_Mode::getSort()
-     */
-    public function getSort(): int
-    {
-        return 902;
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see Doku_Parser_Mode::getSort()
+	 */
+	public function getSort(): int
+	{
+		return 902;
+	}
 
-    /**
-     * Connect to our special pattern.
-     *
-     * @see Doku_Parser_Mode::connectTo()
-     */
-    public function connectTo($mode): void
-    {
-        // look for: <olmap_osmlayer id="olmap" name="sport" url="http://tiles.openseamap.org/sport/${z}/${x}/${y}.png"
-        // visible="false" opacity=0.6 attribution="Some attribution"></olmap_osmlayer>
-        $this->Lexer->addSpecialPattern(
-            '<olmap_osmlayer ?[^>\n]*>.*?</olmap_osmlayer>',
-            $mode,
-            'plugin_openlayersmap_osmlayer'
-        );
-    }
+	/**
+	 * Connect to our special pattern.
+	 *
+	 * @see Doku_Parser_Mode::connectTo()
+	 */
+	public function connectTo($mode): void
+	{
+		// look for: <olmap_osmlayer id="olmap" name="sport" url="http://tiles.openseamap.org/sport/${z}/${x}/${y}.png"
+		// visible="false" opacity=0.6 attribution="Some attribution"></olmap_osmlayer>
+		$this->Lexer->addSpecialPattern(
+			'<olmap_osmlayer ?[^>\n]*>.*?</olmap_osmlayer>',
+			$mode,
+			'plugin_openlayersmap_osmlayer'
+		);
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::handle()
-     */
-    public function handle($match, $state, $pos, Doku_Handler $handler): array
-    {
-        $param = array();
-        $data  = $this->dflt;
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::handle()
+	 */
+	public function handle($match, $state, $pos, Doku_Handler $handler): array
+	{
+		$param = array();
+		$data  = $this->dflt;
 
-        preg_match_all('/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER);
+		preg_match_all('/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER);
 
-        foreach ($param as $kvpair) {
-            list ($matched, $key, $val) = $kvpair;
-            if (isset ($data [$key])) {
-                $key         = strtolower($key);
-                $data [$key] = $val;
-            }
-        }
-        // dbglog($data,'syntax_plugin_overlayer::handle: parsed data is:');
-        return $data;
-    }
+		foreach ($param as $kvpair) {
+			list ($matched, $key, $val) = $kvpair;
+			if (isset ($data [$key])) {
+				$key         = strtolower($key);
+				$data [$key] = $val;
+			}
+		}
+		// dbglog($data,'syntax_plugin_overlayer::handle: parsed data is:');
+		return $data;
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::render()
-     */
-    public function render($format, Doku_Renderer $renderer, $data): bool
-    {
-        if ($format !== 'xhtml') {
-            return false;
-        }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::render()
+	 */
+	public function render($format, Doku_Renderer $renderer, $data): bool
+	{
+		if ($format !== 'xhtml') {
+			return false;
+		}
 
-        // incremented for each olmap_osmlayer tag in the page source
-        static $overlaynumber = 0;
+		// incremented for each olmap_osmlayer tag in the page source
+		static $overlaynumber = 0;
 
-        list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
-        foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
-        }
-        $str           .= '"type":"osm"}';
-        $renderer->doc .= base64_encode("olMapOverlays['osm" . $overlaynumber . "'] = " . $str . ";")
-            . '"></script>';
-        $overlaynumber++;
-        return true;
-    }
+		list ($id, $url, $name, $visible) = $data;
+		$renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
+		$str           = '{';
+		foreach ($data as $key => $val) {
+			$str .= "'" . $key . "' : '" . $val . "',";
+		}
+		$str           .= '"type":"osm"}';
+		$renderer->doc .= base64_encode("olMapOverlays['osm" . $overlaynumber . "'] = " . $str . ";")
+			. '"></script>';
+		$overlaynumber++;
+		return true;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -117,13 +117,13 @@
         static $overlaynumber = 0;
 
         list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
+        $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,';
+        $str = '{';
         foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
+            $str .= "'".$key."' : '".$val."',";
         }
         $str           .= '"type":"osm"}';
-        $renderer->doc .= base64_encode("olMapOverlays['osm" . $overlaynumber . "'] = " . $str . ";")
+        $renderer->doc .= base64_encode("olMapOverlays['osm".$overlaynumber."'] = ".$str.";")
             . '"></script>';
         $overlaynumber++;
         return true;

syntax/agslayer.php

Indentation +100 added lines, -100 removed lines

@@ -22,114 +22,114 @@
  */
 class syntax_plugin_openlayersmap_agslayer extends DokuWiki_Syntax_Plugin
 {
-    private $dflt = array(
-        'id'          => 'olmap',
-        'name'        => '',
-        'url'         => '',
-        'opacity'     => 0.8,
-        'attribution' => '',
-        'visible'     => false,
-        'layers'      => '',
-        'format'      => 'png',
-        'transparent' => 'true'
-    );
+	private $dflt = array(
+		'id'          => 'olmap',
+		'name'        => '',
+		'url'         => '',
+		'opacity'     => 0.8,
+		'attribution' => '',
+		'visible'     => false,
+		'layers'      => '',
+		'format'      => 'png',
+		'transparent' => 'true'
+	);
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::getPType()
-     */
-    public function getPType(): string
-    {
-        return 'block';
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getPType()
+	 */
+	public function getPType(): string
+	{
+		return 'block';
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::getType()
-     */
-    public function getType(): string
-    {
-        // return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
-        return 'baseonly';
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getType()
+	 */
+	public function getType(): string
+	{
+		// return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
+		return 'baseonly';
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see Doku_Parser_Mode::getSort()
-     */
-    public function getSort(): int
-    {
-        return 904;
-    }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see Doku_Parser_Mode::getSort()
+	 */
+	public function getSort(): int
+	{
+		return 904;
+	}
 
-    /**
-     * Connect to our special pattern.
-     *
-     * @see Doku_Parser_Mode::connectTo()
-     */
-    public function connectTo($mode): void
-    {
-        // look for: <olmap_agslayer id="olmap" name="cloud"
-        // url="http://geoservices2.wallonie.be/arcgis/rest/services/APP_KAYAK/KAYAK/MapServer/export"
-        // attribution="wallonie.be" visible="true" layers="show:0,1,2,3,4,7"></olmap_agslayer>
-        // sample:
-        // http://geoservices2.wallonie.be/arcgis/rest/services/APP_KAYAK/KAYAK/MapServer/export?LAYERS=show%3A0%2C1%2C2%2C3%2C4%2C7&TRANSPARENT=true&FORMAT=png&BBOX=643294.029959%2C6467184.088252%2C645740.014863%2C6469630.073157&SIZE=256%2C256&F=html&BBOXSR=3857&IMAGESR=3857
-        $this->Lexer->addSpecialPattern(
-            '<olmap_agslayer ?[^>\n]*>.*?</olmap_agslayer>',
-            $mode,
-            'plugin_openlayersmap_agslayer'
-        );
-    }
+	/**
+	 * Connect to our special pattern.
+	 *
+	 * @see Doku_Parser_Mode::connectTo()
+	 */
+	public function connectTo($mode): void
+	{
+		// look for: <olmap_agslayer id="olmap" name="cloud"
+		// url="http://geoservices2.wallonie.be/arcgis/rest/services/APP_KAYAK/KAYAK/MapServer/export"
+		// attribution="wallonie.be" visible="true" layers="show:0,1,2,3,4,7"></olmap_agslayer>
+		// sample:
+		// http://geoservices2.wallonie.be/arcgis/rest/services/APP_KAYAK/KAYAK/MapServer/export?LAYERS=show%3A0%2C1%2C2%2C3%2C4%2C7&TRANSPARENT=true&FORMAT=png&BBOX=643294.029959%2C6467184.088252%2C645740.014863%2C6469630.073157&SIZE=256%2C256&F=html&BBOXSR=3857&IMAGESR=3857
+		$this->Lexer->addSpecialPattern(
+			'<olmap_agslayer ?[^>\n]*>.*?</olmap_agslayer>',
+			$mode,
+			'plugin_openlayersmap_agslayer'
+		);
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::handle()
-     */
-    public function handle($match, $state, $pos, Doku_Handler $handler): array
-    {
-        $param = array();
-        $data  = $this->dflt;
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::handle()
+	 */
+	public function handle($match, $state, $pos, Doku_Handler $handler): array
+	{
+		$param = array();
+		$data  = $this->dflt;
 
-        preg_match_all('/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER);
+		preg_match_all('/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER);
 
-        foreach ($param as $kvpair) {
-            list ($matched, $key, $val) = $kvpair;
-            if (isset ($data [$key])) {
-                $key         = strtolower($key);
-                $data [$key] = $val;
-            }
-        }
-        return $data;
-    }
+		foreach ($param as $kvpair) {
+			list ($matched, $key, $val) = $kvpair;
+			if (isset ($data [$key])) {
+				$key         = strtolower($key);
+				$data [$key] = $val;
+			}
+		}
+		return $data;
+	}
 
-    /**
-     * (non-PHPdoc)
-     *
-     * @see DokuWiki_Syntax_Plugin::render()
-     */
-    public function render($format, Doku_Renderer $renderer, $data): bool
-    {
-        if ($format !== 'xhtml') {
-            return false;
-        }
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see DokuWiki_Syntax_Plugin::render()
+	 */
+	public function render($format, Doku_Renderer $renderer, $data): bool
+	{
+		if ($format !== 'xhtml') {
+			return false;
+		}
 
-        // incremented for each olmap_agslayer tag in the page source
-        static $overlaynumber = 0;
+		// incremented for each olmap_agslayer tag in the page source
+		static $overlaynumber = 0;
 
-        list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
-        foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
-        }
-        $str           .= "'type':'ags'}";
-        $renderer->doc .= base64_encode("olMapOverlays['ags" . $overlaynumber . "'] = " . $str . ";")
-            . '"></script>';
-        $overlaynumber++;
-        return true;
-    }
+		list ($id, $url, $name, $visible) = $data;
+		$renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
+		$str           = '{';
+		foreach ($data as $key => $val) {
+			$str .= "'" . $key . "' : '" . $val . "',";
+		}
+		$str           .= "'type':'ags'}";
+		$renderer->doc .= base64_encode("olMapOverlays['ags" . $overlaynumber . "'] = " . $str . ";")
+			. '"></script>';
+		$overlaynumber++;
+		return true;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -121,13 +121,13 @@
         static $overlaynumber = 0;
 
         list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
+        $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,';
+        $str = '{';
         foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
+            $str .= "'".$key."' : '".$val."',";
         }
         $str           .= "'type':'ags'}";
-        $renderer->doc .= base64_encode("olMapOverlays['ags" . $overlaynumber . "'] = " . $str . ";")
+        $renderer->doc .= base64_encode("olMapOverlays['ags".$overlaynumber."'] = ".$str.";")
             . '"></script>';
         $overlaynumber++;
         return true;