mprins / dokuwiki-plugin-openlayersmap

admin/purge.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
     public function getMenuIcon(): string
     {
         $plugin = $this->getPluginName();
-        return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
+        return DOKU_PLUGIN.$plugin.'/admin/purge.svg';
     }
 
     /**
@@ -53,13 +53,13 @@ 
             return;
         }
         if (isset($_REQUEST['purgetiles'])) {
-            $path = $conf['cachedir'] . '/olmaptiles';
+            $path = $conf['cachedir'].'/olmaptiles';
             if ($this->rrmdir($path)) {
                 msg($this->getLang('admin_purged_tiles'), 0);
             }
         }
         if (isset($_REQUEST['purgemaps'])) {
-            $path = $conf['mediadir'] . '/olmapmaps';
+            $path = $conf['mediadir'].'/olmapmaps';
             if ($this->rrmdir($path)) {
                 msg($this->getLang('admin_purged_maps'), 0);
             }
@@ -106,7 +106,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>');
@@ -116,7 +116,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();

syntax/olmap.php

Braces +3 added lines, -2 removed lines

@@ -607,8 +607,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 +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
                 $_nocache = true;
                 $imgUrl   .= $this->getBing($gmap, $overlay) . "&.png";
             }
-         /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
+            /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
             // MapQuest
             if (! $this->getConf ( 'mapquestAPIKey' )) {
                 // no API key for MapQuest, use OSM

Spacing +72 added lines, -72 removed lines

@@ -115,14 +115,14 @@ 
             if (!$this->getConf('bingAPIKey')) {
                 // in case there is no Bing api key we'll use OSM
                 $_firstimageID = $this->getStaticOSM($gmap, $overlay);
-                $imgUrl        .= $_firstimageID;
+                $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
@@ -141,14 +141,14 @@ 
         } else {
             // default OSM
             $_firstimageID = $this->getStaticOSM($gmap, $overlay);
-            $imgUrl        .= $_firstimageID;
+            $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";
 
@@ -157,13 +157,13 @@ 
             $imgUrl .= "&nocache";
         }
 
-        $imgUrl .= " |" . $gmap ['summary'] . " }}";
+        $imgUrl .= " |".$gmap ['summary']." }}";
 
         $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) . "', ";
+            $param .= is_numeric($val) ? "$key: $val, " : "$key: '".hsc($val)."', ";
         }
         if (!empty($param)) {
             $param = substr($param, 0, -2);
@@ -190,12 +190,12 @@ 
 
                 $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);
@@ -205,9 +205,9 @@ 
                     <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'])) {
@@ -217,8 +217,8 @@ 
                 . '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'])) {
@@ -228,14 +228,14 @@ 
                 . '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);
 
@@ -256,7 +256,7 @@ 
         // parse match for instructions, break into key value pairs
         $gmap = $this->dflt;
         foreach ($gmap as $key => &$value) {
-            $defval = $this->getConf('default_' . $key);
+            $defval = $this->getConf('default_'.$key);
             if ($defval !== '') {
                 $value = $defval;
             }
@@ -358,29 +358,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) {
             $imgUrl .= "&zoom=17";
         } else {
-            $imgUrl .= "&zoom=" . $gmap ['zoom'];
+            $imgUrl .= "&zoom=".$gmap ['zoom'];
         }
         if ($overlay !== []) {
             $rowId = 0;
             foreach ($overlay as $data) {
                 [$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'];
+        $imgUrl .= "&language=".$conf ['lang'];
         if ($this->getConf('googleAPIkey')) {
-            $imgUrl .= "&key=" . $this->getConf('googleAPIkey');
+            $imgUrl .= "&key=".$this->getConf('googleAPIkey');
         }
         return $imgUrl;
     }
@@ -473,7 +473,7 @@ 
             if (($geophp = plugin_load('helper', 'geophp')) === null) {
                 Logger::debug('geophp plugin is not available for use.', $geophp);
             }
-            $size = str_replace("px", "", $gmap ['width']) . "x"
+            $size = str_replace("px", "", $gmap ['width'])."x"
                 . str_replace("px", "", $gmap ['height']);
 
             $markers = [];
@@ -493,19 +493,19 @@ 
                     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';
@@ -542,25 +542,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) {
                 // actually this could even be 18, but that seems overkill
                 $imgUrl .= "&zoom=16";
             } else {
-                $imgUrl .= "&zoom=" . $gmap ['zoom'];
+                $imgUrl .= "&zoom=".$gmap ['zoom'];
             }
 
             if ($overlay !== []) {
-                $rowId  = 0;
+                $rowId = 0;
                 $imgUrl .= "&markers=";
                 foreach ($overlay as $data) {
                     [$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);
             }
@@ -595,13 +595,13 @@ 
                 $maptype = 'Road';
                 break;
         }
-        $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/" . $maptype;// . "/";
+        $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)
@@ -609,9 +609,9 @@ 
 
         //$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');
+        $imgUrl .= "&key=".$this->getConf('bingAPIKey');
         if ($overlay !== []) {
             $rowId = 0;
             foreach ($overlay as $data) {
@@ -630,7 +630,7 @@ 
         }
         global $conf;
         $imgUrl .= "&fmt=png";
-        $imgUrl .= "&c=" . $conf ['lang'];
+        $imgUrl .= "&c=".$conf ['lang'];
         return $imgUrl;
     }
 
@@ -676,7 +676,7 @@ 
             $latPos = "N";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
+        return hsc($dms.$latPos);
     }
 
     /**
@@ -692,7 +692,7 @@ 
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º'.$min.'\''.$sec.'"';
         return $dms;
     }
 
@@ -710,7 +710,7 @@ 
             $lonPos = "E";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
+        return hsc($dms.$lonPos);
     }
 
     /**
@@ -752,50 +752,50 @@ 
             if (!$initialised) {
                 $initialised = true;
                 // render necessary script tags only once
-                $olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol/ol.js"></script>
-<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol/ol-layerswitcher.js"></script>';
+                $olscript = '<script defer="defer" src="'.DOKU_BASE.'lib/plugins/openlayersmap/ol/ol.js"></script>
+<script defer="defer" src="' . DOKU_BASE.'lib/plugins/openlayersmap/ol/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 stadiaEnable=' . ($stadiaEnable ? '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 stadiaEnable='.($stadiaEnable ? '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>';
+            $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.'-static" class="olStaticMap">'
+                    . p_render($format, p_get_instructions($staticImgUrl), $info).'</div>';
             }
-            $renderer->doc .= '<div id="' . $mapid . '-clearer" class="clearer"><p>&nbsp;</p></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 id="' . $mapid . '-table-span" class="olPOItableSpan">
-                    <table id="' . $mapid . '-table" class="olPOItable">
-                    <caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle') . '</caption>
+                <div id="' . $mapid.'-table-span" class="olPOItableSpan">
+                    <table id="' . $mapid.'-table" class="olPOItable">
+                    <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
+                    $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";