mprins / dokuwiki-plugin-openlayersmap

helper/staticmap.php

Spacing +4 added lines, -4 removed lines

@@ -97,11 +97,11 @@ 
         }
         // normalize WxH
         list($width, $height) = explode('x', $size);
-        $width = (int)$width;
+        $width = (int) $width;
         if ($width > $this->maxWidth) {
             $width = $this->maxWidth;
         }
-        $height = (int)$height;
+        $height = (int) $height;
         if ($height > $this->maxHeight) {
             $height = $this->maxHeight;
         }
@@ -114,7 +114,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'],
@@ -146,6 +146,6 @@ 
             $id = substr($id, 1);
         }
         $id = str_replace(":", "/", $id);
-        return $conf['mediadir'] . '/' . $id;
+        return $conf['mediadir'].'/'.$id;
     }
 }

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'));
             }
         }
         if (isset($_REQUEST['purgemaps'])) {
-            $path = $conf['mediadir'] . '/olmapmaps';
+            $path = $conf['mediadir'].'/olmapmaps';
             if ($this->rrmdir($path)) {
                 msg($this->getLang('admin_purged_maps'));
             }
@@ -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();

_test/general.test.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     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

Spacing +72 added lines, -72 removed lines

@@ -126,14 +126,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
@@ -151,14 +151,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";
 
@@ -167,7 +167,7 @@ 
             $imgUrl .= "&nocache";
         }
 
-        $imgUrl .= " |" . $gmap ['summary'] . " }}";
+        $imgUrl .= " |".$gmap ['summary']." }}";
 
         // Logger::debug("complete image tags is:",$imgUrl);
 
@@ -175,7 +175,7 @@ 
         // 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);
@@ -202,12 +202,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);
@@ -217,9 +217,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'])) {
@@ -229,8 +229,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'])) {
@@ -240,14 +240,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);
 
@@ -277,7 +277,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;
             }
@@ -387,29 +387,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 (!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 .= "&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');
         }
         // Logger::debug('syntax_plugin_openlayersmap_olmap::getGoogle: Google image url is:',$imgUrl);
         return $imgUrl;
@@ -502,7 +502,7 @@ 
             if (!$geophp = plugin_load('helper', 'geophp')) {
                 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 = array();
@@ -526,19 +526,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';
@@ -575,25 +575,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 (!empty ($overlay)) {
-                $rowId  = 0;
+                $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 .= "$lat,$lon,$iconStyle%7c";
                 }
                 $imgUrl = substr($imgUrl, 0, -3);
             }
@@ -630,13 +630,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) {
@@ -645,9 +645,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 (!empty ($overlay)) {
             $rowId = 0;
             foreach ($overlay as $data) {
@@ -666,7 +666,7 @@ 
         }
         global $conf;
         $imgUrl .= "&fmt=png";
-        $imgUrl .= "&c=" . $conf ['lang'];
+        $imgUrl .= "&c=".$conf ['lang'];
         // Logger::debug('syntax_plugin_openlayersmap_olmap::getBing: bing image url is:',$imgUrl);
         return $imgUrl;
     }
@@ -721,7 +721,7 @@ 
             $latPos = "N";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
+        return hsc($dms.$latPos);
     }
 
     /**
@@ -737,7 +737,7 @@ 
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º'.$min.'\''.$sec.'"';
         return $dms;
     }
 
@@ -756,7 +756,7 @@ 
             $lonPos = "E";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
+        return hsc($dms.$lonPos);
     }
 
     /**
@@ -799,50 +799,50 @@ 
             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>';
+            $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 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
+                    $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";

action.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     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" controls="1" ';
         $strOpen       .= 'baselyr="OpenStreetMap" gpxfile="" kmlfile="" geojsonfile="" summary="" >\n';
         $strOpen       .= '~~ Plugin olmap help.\n';

StaticMap.php

Indentation +11 added lines, -11 removed lines

@@ -340,17 +340,17 @@
     {
         return join(
             "&", array(
-                   $this->zoom,
-                   $this->lat,
-                   $this->lon,
-                   $this->width,
-                   $this->height,
-                   serialize($this->markers),
-                   $this->maptype,
-                   $this->kmlFileName,
-                   $this->gpxFileName,
-                   $this->geojsonFileName
-               )
+                    $this->zoom,
+                    $this->lat,
+                    $this->lon,
+                    $this->width,
+                    $this->height,
+                    serialize($this->markers),
+                    $this->maptype,
+                    $this->kmlFileName,
+                    $this->gpxFileName,
+                    $this->geojsonFileName
+                )
         );
     }
 

Spacing +34 added lines, -34 removed lines

@@ -28,7 +28,7 @@ 
 
 // phpcs:disable PSR1.Files.SideEffects
 // TODO resolve side effect
-require_once __DIR__ . '/../geophp/vendor/autoload.php';
+require_once __DIR__.'/../geophp/vendor/autoload.php';
 
 /**
  *
@@ -221,9 +221,9 @@ 
         $this->gpxFileName      = $gpx;
         $this->geojsonFileName  = $geojson;
         $this->mediaBaseDir     = $mediaDir;
-        $this->tileCacheBaseDir = $tileCacheBaseDir . '/olmaptiles';
+        $this->tileCacheBaseDir = $tileCacheBaseDir.'/olmaptiles';
         $this->useTileCache     = $this->tileCacheBaseDir !== '';
-        $this->mapCacheBaseDir  = $mediaDir . '/olmapmaps';
+        $this->mapCacheBaseDir  = $mediaDir.'/olmapmaps';
         $this->autoZoomExtent   = $autoZoomExtent;
         $this->apikey           = $apikey;
     }
@@ -265,10 +265,10 @@ 
     private function autoZoom(float $paddingFactor = 1.0): void
     {
         $geoms    = array();
-        $geoms [] = new Point ($this->lon, $this->lat);
+        $geoms [] = new Point($this->lon, $this->lat);
         if (!empty ($this->markers)) {
             foreach ($this->markers as $marker) {
-                $geoms [] = new Point ($marker ['lon'], $marker ['lat']);
+                $geoms [] = new Point($marker ['lon'], $marker ['lat']);
             }
         }
         if (file_exists($this->kmlFileName)) {
@@ -295,7 +295,7 @@ 
             return;
         }
 
-        $geom     = new GeometryCollection ($geoms);
+        $geom     = new GeometryCollection($geoms);
         $centroid = $geom->centroid();
         $bbox     = $geom->getBBox();
 
@@ -304,7 +304,7 @@ 
         $vy0 = log(tan(M_PI * (0.25 + $bbox ['miny'] / 360)));
         $vy1 = log(tan(M_PI * (0.25 + $bbox ['maxy'] / 360)));
         Logger::debug("StaticMap::autoZoom: vertical resolution: $vy0, $vy1");
-        if ($vy1 - $vy0 === 0.0){
+        if ($vy1 - $vy0 === 0.0) {
             $resolutionVertical = 0;
             Logger::debug("StaticMap::autoZoom: using $resolutionVertical");
         } else {
@@ -316,7 +316,7 @@ 
         Logger::debug("StaticMap::autoZoom: using $resolutionHorizontal");
         $resolution           = max($resolutionHorizontal, $resolutionVertical) * $paddingFactor;
         $zoom                 = $this->zoom;
-        if ($resolution > 0){
+        if ($resolution > 0) {
             $zoom             = log(360 / ($resolution * $this->tileSize), 2);
         }
 
@@ -357,11 +357,11 @@ 
     public function mapCacheIDToFilename(): string
     {
         if (!$this->mapCacheFile) {
-            $this->mapCacheFile = $this->mapCacheBaseDir . "/" . $this->maptype . "/" . $this->zoom . "/cache_"
-                . substr($this->mapCacheID, 0, 2) . "/" . substr($this->mapCacheID, 2, 2)
-                . "/" . substr($this->mapCacheID, 4);
+            $this->mapCacheFile = $this->mapCacheBaseDir."/".$this->maptype."/".$this->zoom."/cache_"
+                . substr($this->mapCacheID, 0, 2)."/".substr($this->mapCacheID, 2, 2)
+                . "/".substr($this->mapCacheID, 4);
         }
-        return $this->mapCacheFile . "." . $this->mapCacheExtension;
+        return $this->mapCacheFile.".".$this->mapCacheExtension;
     }
 
     /**
@@ -502,14 +502,14 @@ 
             return $cached;
         }
 
-        $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
+        $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; '.PHP_OS.')';
         if (function_exists("curl_init")) {
             // use cUrl
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_USERAGENT, $_UA);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-            curl_setopt($ch, CURLOPT_URL, $url . $this->apikey);
+            curl_setopt($ch, CURLOPT_URL, $url.$this->apikey);
             Logger::debug("StaticMap::fetchTile: getting: $url using curl_exec");
             $tile = curl_exec($ch);
             curl_close($ch);
@@ -519,21 +519,21 @@ 
             $opts = array(
                 'http' => array(
                     'method'          => "GET",
-                    'header'          => "Accept-language: en\r\n" . "User-Agent: $_UA\r\n" . "accept: image/png\r\n",
+                    'header'          => "Accept-language: en\r\n"."User-Agent: $_UA\r\n"."accept: image/png\r\n",
                     'request_fulluri' => true
                 )
             );
             if (isset($conf['proxy']['host'], $conf['proxy']['port'])
                 && $conf['proxy']['host'] !== ''
                 && $conf['proxy']['port'] !== '') {
-                $opts['http'] += ['proxy' => "tcp://" . $conf['proxy']['host'] . ":" . $conf['proxy']['port']];
+                $opts['http'] += ['proxy' => "tcp://".$conf['proxy']['host'].":".$conf['proxy']['port']];
             }
 
             $context = stream_context_create($opts);
             Logger::debug(
                 "StaticMap::fetchTile: getting: $url . $this->apikey using file_get_contents and options $opts"
             );
-            $tile = file_get_contents($url . $this->apikey, false, $context);
+            $tile = file_get_contents($url.$this->apikey, false, $context);
         }
         if ($tile && $this->useTileCache) {
             $this->writeTileToCache($url, $tile);
@@ -562,7 +562,7 @@ 
      */
     public function tileUrlToFilename(string $url): string
     {
-        return $this->tileCacheBaseDir . "/" . substr($url, strpos($url, '/') + 1);
+        return $this->tileCacheBaseDir."/".substr($url, strpos($url, '/') + 1);
     }
 
     /**
@@ -600,7 +600,7 @@ 
         $count               = 0;
         $color               = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor             = imagecolorallocate($this->image, 200, 200, 200);
-        $markerBaseDir       = __DIR__ . '/icons';
+        $markerBaseDir       = __DIR__.'/icons';
         $markerImageOffsetX  = 0;
         $markerImageOffsetY  = 0;
         $markerShadowOffsetX = 0;
@@ -620,7 +620,7 @@ 
             if ($markerType) {
                 foreach ($this->markerPrototypes as $markerPrototype) {
                     if (preg_match($markerPrototype ['regex'], $markerType, $matches)) {
-                        $markerFilename = $matches [0] . $markerPrototype ['extension'];
+                        $markerFilename = $matches [0].$markerPrototype ['extension'];
                         if ($markerPrototype ['offsetImage']) {
                             list ($markerImageOffsetX, $markerImageOffsetY) = explode(
                                 ",",
@@ -638,14 +638,14 @@ 
                 }
             }
             // create img resource
-            if (file_exists($markerBaseDir . '/' . $markerFilename)) {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/' . $markerFilename);
+            if (file_exists($markerBaseDir.'/'.$markerFilename)) {
+                $markerImg = imagecreatefrompng($markerBaseDir.'/'.$markerFilename);
             } else {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/marker.png');
+                $markerImg = imagecreatefrompng($markerBaseDir.'/marker.png');
             }
             // check for shadow + create shadow recource
-            if ($markerShadow && file_exists($markerBaseDir . '/' . $markerShadow)) {
-                $markerShadowImg = imagecreatefrompng($markerBaseDir . '/' . $markerShadow);
+            if ($markerShadow && file_exists($markerBaseDir.'/'.$markerShadow)) {
+                $markerShadowImg = imagecreatefrompng($markerBaseDir.'/'.$markerShadow);
             }
             // calc position
             $destX = floor(
@@ -661,8 +661,8 @@ 
                 imagecopy(
                     $this->image,
                     $markerShadowImg,
-                    $destX + (int)$markerShadowOffsetX,
-                    $destY + (int)$markerShadowOffsetY,
+                    $destX + (int) $markerShadowOffsetX,
+                    $destY + (int) $markerShadowOffsetY,
                     0,
                     0,
                     imagesx($markerShadowImg),
@@ -673,8 +673,8 @@ 
             imagecopy(
                 $this->image,
                 $markerImg,
-                $destX + (int)$markerImageOffsetX,
-                $destY + (int)$markerImageOffsetY,
+                $destX + (int) $markerImageOffsetX,
+                $destY + (int) $markerImageOffsetY,
                 0,
                 0,
                 imagesx($markerImg),
@@ -685,7 +685,7 @@ 
                 $this->image,
                 3,
                 $destX - imagesx($markerImg) + 1,
-                $destY + (int)$markerImageOffsetY + 1,
+                $destY + (int) $markerImageOffsetY + 1,
                 ++$count,
                 $bgcolor
             );
@@ -693,7 +693,7 @@ 
                 $this->image,
                 3,
                 $destX - imagesx($markerImg),
-                $destY + (int)$markerImageOffsetY,
+                $destY + (int) $markerImageOffsetY,
                 $count,
                 $color
             );
@@ -875,8 +875,8 @@ 
      */
     public function drawCopyright()
     {
-        $logoBaseDir = dirname(__FILE__) . '/' . 'logo/';
-        $logoImg     = imagecreatefrompng($logoBaseDir . $this->tileInfo ['openstreetmap'] ['logo']);
+        $logoBaseDir = dirname(__FILE__).'/'.'logo/';
+        $logoImg     = imagecreatefrompng($logoBaseDir.$this->tileInfo ['openstreetmap'] ['logo']);
         $textcolor   = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor     = imagecolorallocate($this->image, 200, 200, 200);
 
@@ -913,7 +913,7 @@ 
             $mapAuthor = "(c) OpenStreetMap maps/CC BY-SA";
         } else {
             $mapAuthor   = $this->tileInfo [$this->maptype] ['txt'];
-            $iconImg     = imagecreatefrompng($logoBaseDir . $this->tileInfo [$this->maptype] ['logo']);
+            $iconImg     = imagecreatefrompng($logoBaseDir.$this->tileInfo [$this->maptype] ['logo']);
             $xIconOffset = imagesx($iconImg);
             imagecopy(
                 $this->image,