@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | preg_match('(lon[:|=]\"-?\d*\.?\d*\")', $match, $mainLon); |
94 | 94 | $mainLat = substr($mainLat [0], 5, -1); |
95 | 95 | $mainLon = substr($mainLon [0], 5, -1); |
96 | - if(!is_numeric($mainLat)) { |
|
96 | + if (!is_numeric($mainLat)) { |
|
97 | 97 | $mainLat = $this->dflt ['lat']; |
98 | 98 | } |
99 | - if(!is_numeric($mainLon)) { |
|
99 | + if (!is_numeric($mainLon)) { |
|
100 | 100 | $mainLon = $this->dflt ['lon']; |
101 | 101 | } |
102 | 102 | |
@@ -107,23 +107,23 @@ discard block |
||
107 | 107 | $_nocache = false; |
108 | 108 | // choose maptype based on the specified tag |
109 | 109 | $imgUrl = "{{"; |
110 | - if(stripos($gmap ['baselyr'], 'google') !== false) { |
|
110 | + if (stripos($gmap ['baselyr'], 'google') !== false) { |
|
111 | 111 | |
112 | 112 | $imgUrl .= $this->getGoogle($gmap, $overlay); |
113 | 113 | $imgUrl .= "&.png"; |
114 | - } elseif(stripos($gmap ['baselyr'], 'bing') !== false) { |
|
114 | + } elseif (stripos($gmap ['baselyr'], 'bing') !== false) { |
|
115 | 115 | // Bing |
116 | - if(!$this->getConf('bingAPIKey')) { |
|
116 | + if (!$this->getConf('bingAPIKey')) { |
|
117 | 117 | // in case there is no Bing api key we'll use OSM |
118 | 118 | $_firstimageID = $this->getStaticOSM($gmap, $overlay); |
119 | - $imgUrl .= $_firstimageID; |
|
120 | - if($this->getConf('optionStaticMapGenerator') == 'remote') { |
|
119 | + $imgUrl .= $_firstimageID; |
|
120 | + if ($this->getConf('optionStaticMapGenerator') == 'remote') { |
|
121 | 121 | $imgUrl .= "&.png"; |
122 | 122 | } |
123 | 123 | } else { |
124 | 124 | // seems that Bing doesn't like the DW client, turn off caching |
125 | 125 | $_nocache = true; |
126 | - $imgUrl .= $this->getBing($gmap, $overlay) . "&.png"; |
|
126 | + $imgUrl .= $this->getBing($gmap, $overlay)."&.png"; |
|
127 | 127 | } |
128 | 128 | } /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) { |
129 | 129 | // MapQuest |
@@ -141,33 +141,33 @@ discard block |
||
141 | 141 | } */ else { |
142 | 142 | // default OSM |
143 | 143 | $_firstimageID = $this->getStaticOSM($gmap, $overlay); |
144 | - $imgUrl .= $_firstimageID; |
|
145 | - if($this->getConf('optionStaticMapGenerator') == 'remote') { |
|
144 | + $imgUrl .= $_firstimageID; |
|
145 | + if ($this->getConf('optionStaticMapGenerator') == 'remote') { |
|
146 | 146 | $imgUrl .= "&.png"; |
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | 150 | // append dw p_render specific params and render |
151 | - $imgUrl .= "?" . str_replace("px", "", $gmap ['width']) . "x" |
|
151 | + $imgUrl .= "?".str_replace("px", "", $gmap ['width'])."x" |
|
152 | 152 | . str_replace("px", "", $gmap ['height']); |
153 | 153 | $imgUrl .= "&nolink"; |
154 | 154 | |
155 | 155 | // add nocache option for selected services |
156 | - if($_nocache) { |
|
156 | + if ($_nocache) { |
|
157 | 157 | $imgUrl .= "&nocache"; |
158 | 158 | } |
159 | 159 | |
160 | - $imgUrl .= " |" . $gmap ['summary'] . " }}"; |
|
160 | + $imgUrl .= " |".$gmap ['summary']." }}"; |
|
161 | 161 | |
162 | 162 | // dbglog($imgUrl,"complete image tags is:"); |
163 | 163 | |
164 | 164 | $mapid = $gmap ['id']; |
165 | 165 | // create a javascript parameter string for the map |
166 | 166 | $param = ''; |
167 | - foreach($gmap as $key => $val) { |
|
168 | - $param .= is_numeric($val) ? "$key: $val, " : "$key: '" . hsc($val) . "', "; |
|
167 | + foreach ($gmap as $key => $val) { |
|
168 | + $param .= is_numeric($val) ? "$key: $val, " : "$key: '".hsc($val)."', "; |
|
169 | 169 | } |
170 | - if(!empty ($param)) { |
|
170 | + if (!empty ($param)) { |
|
171 | 171 | $param = substr($param, 0, -2); |
172 | 172 | } |
173 | 173 | unset ($gmap ['id']); |
@@ -176,13 +176,13 @@ discard block |
||
176 | 176 | $poi = ''; |
177 | 177 | $poitable = ''; |
178 | 178 | $rowId = 0; |
179 | - if(!empty ($overlay)) { |
|
180 | - foreach($overlay as $data) { |
|
179 | + if (!empty ($overlay)) { |
|
180 | + foreach ($overlay as $data) { |
|
181 | 181 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
182 | 182 | $rowId++; |
183 | 183 | $poi .= ", {lat:$lat,lon:$lon,txt:'$text',angle:$angle,opacity:$opacity,img:'$img',rowId: $rowId}"; |
184 | 184 | |
185 | - if($this->getConf('displayformat') === 'DMS') { |
|
185 | + if ($this->getConf('displayformat') === 'DMS') { |
|
186 | 186 | $lat = $this->convertLat($lat); |
187 | 187 | $lon = $this->convertLon($lon); |
188 | 188 | } else { |
@@ -192,52 +192,52 @@ discard block |
||
192 | 192 | |
193 | 193 | $poitable .= ' |
194 | 194 | <tr> |
195 | - <td class="rowId">' . $rowId . '</td> |
|
196 | - <td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/icons/' . $img . '" alt="' |
|
197 | - . substr($img, 0, -4) . $this->getlang('alt_legend_poi') . '" /></td> |
|
198 | - <td class="lat" title="' . $this->getLang('olmapPOIlatTitle') . '">' . $lat . '</td> |
|
199 | - <td class="lon" title="' . $this->getLang('olmapPOIlonTitle') . '">' . $lon . '</td> |
|
200 | - <td class="txt">' . $text . '</td> |
|
195 | + <td class="rowId">' . $rowId.'</td> |
|
196 | + <td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/icons/'.$img.'" alt="' |
|
197 | + . substr($img, 0, -4).$this->getlang('alt_legend_poi').'" /></td> |
|
198 | + <td class="lat" title="' . $this->getLang('olmapPOIlatTitle').'">'.$lat.'</td> |
|
199 | + <td class="lon" title="' . $this->getLang('olmapPOIlonTitle').'">'.$lon.'</td> |
|
200 | + <td class="txt">' . $text.'</td> |
|
201 | 201 | </tr>'; |
202 | 202 | } |
203 | 203 | $poi = substr($poi, 2); |
204 | 204 | } |
205 | - if(!empty ($gmap ['kmlfile'])) { |
|
205 | + if (!empty ($gmap ['kmlfile'])) { |
|
206 | 206 | $poitable .= ' |
207 | 207 | <tr> |
208 | 208 | <td class="rowId"><img src="' . DOKU_BASE |
209 | 209 | . 'lib/plugins/openlayersmap/toolbar/kml_file.png" alt="KML file" /></td> |
210 | - <td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="' |
|
211 | - . $this->getlang('alt_legend_kml') . '" /></td> |
|
212 | - <td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']) . '</td> |
|
210 | + <td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="' |
|
211 | + . $this->getlang('alt_legend_kml').'" /></td> |
|
212 | + <td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']).'</td> |
|
213 | 213 | </tr>'; |
214 | 214 | } |
215 | - if(!empty ($gmap ['gpxfile'])) { |
|
215 | + if (!empty ($gmap ['gpxfile'])) { |
|
216 | 216 | $poitable .= ' |
217 | 217 | <tr> |
218 | 218 | <td class="rowId"><img src="' . DOKU_BASE |
219 | 219 | . 'lib/plugins/openlayersmap/toolbar/gpx_file.png" alt="GPX file" /></td> |
220 | 220 | <td class="icon"><img src="' . DOKU_BASE |
221 | 221 | . 'lib/plugins/openlayersmap/toolbar/gpx_line.png" alt="' |
222 | - . $this->getlang('alt_legend_gpx') . '" /></td> |
|
223 | - <td class="txt" colspan="3">GPX track: ' . $this->getFileName($gmap ['gpxfile']) . '</td> |
|
222 | + . $this->getlang('alt_legend_gpx').'" /></td> |
|
223 | + <td class="txt" colspan="3">GPX track: ' . $this->getFileName($gmap ['gpxfile']).'</td> |
|
224 | 224 | </tr>'; |
225 | 225 | } |
226 | - if(!empty ($gmap ['geojsonfile'])) { |
|
226 | + if (!empty ($gmap ['geojsonfile'])) { |
|
227 | 227 | $poitable .= ' |
228 | 228 | <tr> |
229 | 229 | <td class="rowId"><img src="' . DOKU_BASE |
230 | 230 | . 'lib/plugins/openlayersmap/toolbar/geojson_file.png" alt="GeoJSON file" /></td> |
231 | 231 | <td class="icon"><img src="' . DOKU_BASE |
232 | 232 | . 'lib/plugins/openlayersmap/toolbar/geojson_line.png" alt="' |
233 | - . $this->getlang('alt_legend_geojson') . '" /></td> |
|
234 | - <td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName($gmap ['geojsonfile']) . '</td> |
|
233 | + . $this->getlang('alt_legend_geojson').'" /></td> |
|
234 | + <td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName($gmap ['geojsonfile']).'</td> |
|
235 | 235 | </tr>'; |
236 | 236 | } |
237 | 237 | |
238 | 238 | $autozoom = empty ($gmap ['autozoom']) ? $this->getConf('autoZoomMap') : $gmap ['autozoom']; |
239 | - $js = "{mapOpts: {" . $param . ", displayformat: '" . $this->getConf('displayformat') |
|
240 | - . "', autozoom: " . $autozoom . "}, poi: [$poi]};"; |
|
239 | + $js = "{mapOpts: {".$param.", displayformat: '".$this->getConf('displayformat') |
|
240 | + . "', autozoom: ".$autozoom."}, poi: [$poi]};"; |
|
241 | 241 | // unescape the json |
242 | 242 | $poitable = stripslashes($poitable); |
243 | 243 | |
@@ -265,21 +265,21 @@ discard block |
||
265 | 265 | preg_match_all('/(\w*)="(.*?)"/us', $str_params, $param, PREG_SET_ORDER); |
266 | 266 | // parse match for instructions, break into key value pairs |
267 | 267 | $gmap = $this->dflt; |
268 | - foreach($gmap as $key => &$value) { |
|
269 | - $defval = $this->getConf('default_' . $key); |
|
270 | - if($defval !== '') { |
|
268 | + foreach ($gmap as $key => &$value) { |
|
269 | + $defval = $this->getConf('default_'.$key); |
|
270 | + if ($defval !== '') { |
|
271 | 271 | $value = $defval; |
272 | 272 | } |
273 | 273 | } |
274 | 274 | unset ($value); |
275 | - foreach($param as $kvpair) { |
|
275 | + foreach ($param as $kvpair) { |
|
276 | 276 | list ($match, $key, $val) = $kvpair; |
277 | 277 | $key = strtolower($key); |
278 | - if(isset ($gmap [$key])) { |
|
279 | - if($key == 'summary') { |
|
278 | + if (isset ($gmap [$key])) { |
|
279 | + if ($key == 'summary') { |
|
280 | 280 | // preserve case for summary field |
281 | 281 | $gmap [$key] = $val; |
282 | - } elseif($key == 'id') { |
|
282 | + } elseif ($key == 'id') { |
|
283 | 283 | // preserve case for id field |
284 | 284 | $gmap [$key] = $val; |
285 | 285 | } else { |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | ); |
316 | 316 | // create poi array |
317 | 317 | $overlay = array(); |
318 | - foreach($point as $pt) { |
|
318 | + foreach ($point as $pt) { |
|
319 | 319 | list ($match, $lat, $lon, $angle, $opacity, $img, $text) = $pt; |
320 | 320 | $lat = is_numeric($lat) ? $lat : 0; |
321 | 321 | $lon = is_numeric($lon) ? $lon : 0; |
@@ -349,10 +349,10 @@ discard block |
||
349 | 349 | */ |
350 | 350 | private function getGoogle(array $gmap, array $overlay): string { |
351 | 351 | $sUrl = $this->getConf('iconUrlOverload'); |
352 | - if(!$sUrl) { |
|
352 | + if (!$sUrl) { |
|
353 | 353 | $sUrl = DOKU_URL; |
354 | 354 | } |
355 | - switch($gmap ['baselyr']) { |
|
355 | + switch ($gmap ['baselyr']) { |
|
356 | 356 | case 'google hybrid' : |
357 | 357 | $maptype = 'hybrid'; |
358 | 358 | break; |
@@ -372,29 +372,29 @@ discard block |
||
372 | 372 | // see: https://developers.google.com/maps/documentation/staticmaps/index#Viewports |
373 | 373 | // 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 |
374 | 374 | $imgUrl = "https://maps.googleapis.com/maps/api/staticmap?"; |
375 | - $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x" |
|
375 | + $imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x" |
|
376 | 376 | . str_replace("px", "", $gmap ['height']); |
377 | 377 | //if (!$this->getConf( 'autoZoomMap')) { // no need for center & zoom params } |
378 | - $imgUrl .= "¢er=" . $gmap ['lat'] . "," . $gmap ['lon']; |
|
378 | + $imgUrl .= "¢er=".$gmap ['lat'].",".$gmap ['lon']; |
|
379 | 379 | // max is 21 (== building scale), but that's overkill.. |
380 | - if($gmap ['zoom'] > 17) { |
|
380 | + if ($gmap ['zoom'] > 17) { |
|
381 | 381 | $imgUrl .= "&zoom=17"; |
382 | 382 | } else { |
383 | - $imgUrl .= "&zoom=" . $gmap ['zoom']; |
|
383 | + $imgUrl .= "&zoom=".$gmap ['zoom']; |
|
384 | 384 | } |
385 | - if(!empty ($overlay)) { |
|
385 | + if (!empty ($overlay)) { |
|
386 | 386 | $rowId = 0; |
387 | - foreach($overlay as $data) { |
|
387 | + foreach ($overlay as $data) { |
|
388 | 388 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
389 | - $imgUrl .= "&markers=icon%3a" . $sUrl . "lib/plugins/openlayersmap/icons/" . $img . "%7c" |
|
390 | - . $lat . "," . $lon . "%7clabel%3a" . ++$rowId; |
|
389 | + $imgUrl .= "&markers=icon%3a".$sUrl."lib/plugins/openlayersmap/icons/".$img."%7c" |
|
390 | + . $lat.",".$lon."%7clabel%3a".++$rowId; |
|
391 | 391 | } |
392 | 392 | } |
393 | - $imgUrl .= "&format=png&maptype=" . $maptype; |
|
393 | + $imgUrl .= "&format=png&maptype=".$maptype; |
|
394 | 394 | global $conf; |
395 | - $imgUrl .= "&language=" . $conf ['lang']; |
|
396 | - if($this->getConf('googleAPIkey')) { |
|
397 | - $imgUrl .= "&key=" . $this->getConf('googleAPIkey'); |
|
395 | + $imgUrl .= "&language=".$conf ['lang']; |
|
396 | + if ($this->getConf('googleAPIkey')) { |
|
397 | + $imgUrl .= "&key=".$this->getConf('googleAPIkey'); |
|
398 | 398 | } |
399 | 399 | // dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::getGoogle: Google image url is:'); |
400 | 400 | return $imgUrl; |
@@ -477,23 +477,23 @@ discard block |
||
477 | 477 | private function getStaticOSM(array $gmap, array $overlay) { |
478 | 478 | global $conf; |
479 | 479 | |
480 | - if($this->getConf('optionStaticMapGenerator') == 'local') { |
|
480 | + if ($this->getConf('optionStaticMapGenerator') == 'local') { |
|
481 | 481 | // using local basemap composer |
482 | - if(!$myMap = plugin_load('helper', 'openlayersmap_staticmap')) { |
|
482 | + if (!$myMap = plugin_load('helper', 'openlayersmap_staticmap')) { |
|
483 | 483 | dbglog( |
484 | 484 | $myMap, |
485 | 485 | 'openlayersmap_staticmap plugin is not available for use.' |
486 | 486 | ); |
487 | 487 | } |
488 | - if(!$geophp = plugin_load('helper', 'geophp')) { |
|
488 | + if (!$geophp = plugin_load('helper', 'geophp')) { |
|
489 | 489 | dbglog($geophp, 'geophp plugin is not available for use.'); |
490 | 490 | } |
491 | - $size = str_replace("px", "", $gmap ['width']) . "x" |
|
491 | + $size = str_replace("px", "", $gmap ['width'])."x" |
|
492 | 492 | . str_replace("px", "", $gmap ['height']); |
493 | 493 | |
494 | 494 | $markers = array(); |
495 | - if(!empty ($overlay)) { |
|
496 | - foreach($overlay as $data) { |
|
495 | + if (!empty ($overlay)) { |
|
496 | + foreach ($overlay as $data) { |
|
497 | 497 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
498 | 498 | $iconStyle = substr($img, 0, strlen($img) - 4); |
499 | 499 | $markers [] = array( |
@@ -505,26 +505,26 @@ discard block |
||
505 | 505 | } |
506 | 506 | |
507 | 507 | $apikey = ''; |
508 | - switch($gmap ['baselyr']) { |
|
508 | + switch ($gmap ['baselyr']) { |
|
509 | 509 | case 'mapnik' : |
510 | 510 | case 'openstreetmap' : |
511 | 511 | $maptype = 'openstreetmap'; |
512 | 512 | break; |
513 | 513 | case 'transport' : |
514 | 514 | $maptype = 'transport'; |
515 | - $apikey = '?apikey=' . $this->getConf('tfApiKey'); |
|
515 | + $apikey = '?apikey='.$this->getConf('tfApiKey'); |
|
516 | 516 | break; |
517 | 517 | case 'landscape' : |
518 | 518 | $maptype = 'landscape'; |
519 | - $apikey = '?apikey=' . $this->getConf('tfApiKey'); |
|
519 | + $apikey = '?apikey='.$this->getConf('tfApiKey'); |
|
520 | 520 | break; |
521 | 521 | case 'outdoors' : |
522 | 522 | $maptype = 'outdoors'; |
523 | - $apikey = '?apikey=' . $this->getConf('tfApiKey'); |
|
523 | + $apikey = '?apikey='.$this->getConf('tfApiKey'); |
|
524 | 524 | break; |
525 | 525 | case 'cycle map' : |
526 | 526 | $maptype = 'cycle'; |
527 | - $apikey = '?apikey=' . $this->getConf('tfApiKey'); |
|
527 | + $apikey = '?apikey='.$this->getConf('tfApiKey'); |
|
528 | 528 | break; |
529 | 529 | case 'hike and bike map' : |
530 | 530 | $maptype = 'hikeandbike'; |
@@ -553,25 +553,25 @@ discard block |
||
553 | 553 | // ol-marker|47.921629720114,18.027343747285,ol-marker-gold|47.951071133739,19.257812497236, |
554 | 554 | // ol-marker-blue|47.180141361692,19.257812497236,ol-marker-green |
555 | 555 | $imgUrl = "https://staticmap.openstreetmap.de/staticmap.php"; |
556 | - $imgUrl .= "?center=" . $gmap ['lat'] . "," . $gmap ['lon']; |
|
557 | - $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x" |
|
556 | + $imgUrl .= "?center=".$gmap ['lat'].",".$gmap ['lon']; |
|
557 | + $imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x" |
|
558 | 558 | . str_replace("px", "", $gmap ['height']); |
559 | 559 | |
560 | - if($gmap ['zoom'] > 16) { |
|
560 | + if ($gmap ['zoom'] > 16) { |
|
561 | 561 | // actually this could even be 18, but that seems overkill |
562 | 562 | $imgUrl .= "&zoom=16"; |
563 | 563 | } else { |
564 | - $imgUrl .= "&zoom=" . $gmap ['zoom']; |
|
564 | + $imgUrl .= "&zoom=".$gmap ['zoom']; |
|
565 | 565 | } |
566 | 566 | |
567 | - if(!empty ($overlay)) { |
|
568 | - $rowId = 0; |
|
567 | + if (!empty ($overlay)) { |
|
568 | + $rowId = 0; |
|
569 | 569 | $imgUrl .= "&markers="; |
570 | - foreach($overlay as $data) { |
|
570 | + foreach ($overlay as $data) { |
|
571 | 571 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
572 | 572 | $rowId++; |
573 | 573 | $iconStyle = "lightblue$rowId"; |
574 | - $imgUrl .= "$lat,$lon,$iconStyle%7c"; |
|
574 | + $imgUrl .= "$lat,$lon,$iconStyle%7c"; |
|
575 | 575 | } |
576 | 576 | $imgUrl = substr($imgUrl, 0, -3); |
577 | 577 | } |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | * @return string |
591 | 591 | */ |
592 | 592 | private function getBing(array $gmap, array $overlay): string { |
593 | - switch($gmap ['baselyr']) { |
|
593 | + switch ($gmap ['baselyr']) { |
|
594 | 594 | case 've hybrid' : |
595 | 595 | case 'bing hybrid' : |
596 | 596 | $maptype = 'AerialWithLabels'; |
@@ -607,33 +607,33 @@ discard block |
||
607 | 607 | $maptype = 'Road'; |
608 | 608 | break; |
609 | 609 | } |
610 | - $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/" . $maptype;// . "/"; |
|
611 | - if($this->getConf('autoZoomMap')) { |
|
610 | + $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/".$maptype; // . "/"; |
|
611 | + if ($this->getConf('autoZoomMap')) { |
|
612 | 612 | $bbox = $this->calcBBOX($overlay, $gmap ['lat'], $gmap ['lon']); |
613 | 613 | //$imgUrl .= "?ma=" . $bbox ['minlat'] . "," . $bbox ['minlon'] . "," |
614 | 614 | // . $bbox ['maxlat'] . "," . $bbox ['maxlon']; |
615 | - $imgUrl .= "?ma=" . $bbox ['minlat'] . "%2C" . $bbox ['minlon'] . "%2C" . $bbox ['maxlat'] |
|
616 | - . "%2C" . $bbox ['maxlon']; |
|
615 | + $imgUrl .= "?ma=".$bbox ['minlat']."%2C".$bbox ['minlon']."%2C".$bbox ['maxlat'] |
|
616 | + . "%2C".$bbox ['maxlon']; |
|
617 | 617 | $imgUrl .= "&dcl=1"; |
618 | 618 | } |
619 | - if(strpos($imgUrl, "?") === false) |
|
619 | + if (strpos($imgUrl, "?") === false) |
|
620 | 620 | $imgUrl .= "?"; |
621 | 621 | |
622 | 622 | //$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," |
623 | 623 | // . str_replace ( "px", "", $gmap ['height'] ); |
624 | - $imgUrl .= "&ms=" . str_replace("px", "", $gmap ['width']) . "%2C" |
|
624 | + $imgUrl .= "&ms=".str_replace("px", "", $gmap ['width'])."%2C" |
|
625 | 625 | . str_replace("px", "", $gmap ['height']); |
626 | - $imgUrl .= "&key=" . $this->getConf('bingAPIKey'); |
|
627 | - if(!empty ($overlay)) { |
|
626 | + $imgUrl .= "&key=".$this->getConf('bingAPIKey'); |
|
627 | + if (!empty ($overlay)) { |
|
628 | 628 | $rowId = 0; |
629 | - foreach($overlay as $data) { |
|
629 | + foreach ($overlay as $data) { |
|
630 | 630 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
631 | 631 | // TODO icon style lookup, see: http://msdn.microsoft.com/en-us/library/ff701719.aspx for iconStyle |
632 | 632 | $iconStyle = 32; |
633 | 633 | $rowId++; |
634 | 634 | // NOTE: the max number of pushpins is 18! or we have to use POST |
635 | 635 | // (http://msdn.microsoft.com/en-us/library/ff701724.aspx) |
636 | - if($rowId == 18) { |
|
636 | + if ($rowId == 18) { |
|
637 | 637 | break; |
638 | 638 | } |
639 | 639 | //$imgUrl .= "&pp=$lat,$lon;$iconStyle;$rowId"; |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | } |
644 | 644 | global $conf; |
645 | 645 | $imgUrl .= "&fmt=png"; |
646 | - $imgUrl .= "&c=" . $conf ['lang']; |
|
646 | + $imgUrl .= "&c=".$conf ['lang']; |
|
647 | 647 | // dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::getBing: bing image url is:'); |
648 | 648 | return $imgUrl; |
649 | 649 | } |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | private function calcBBOX(array $overlay, float $lat, float $lon): array { |
663 | 663 | $lats = array($lat); |
664 | 664 | $lons = array($lon); |
665 | - foreach($overlay as $data) { |
|
665 | + foreach ($overlay as $data) { |
|
666 | 666 | list ($lat, $lon, $text, $angle, $opacity, $img) = $data; |
667 | 667 | $lats [] = $lat; |
668 | 668 | $lons [] = $lon; |
@@ -690,13 +690,13 @@ discard block |
||
690 | 690 | * @todo move this into a shared library |
691 | 691 | */ |
692 | 692 | private function convertLat(float $decimaldegrees): string { |
693 | - if(strpos($decimaldegrees, '-') !== false) { |
|
693 | + if (strpos($decimaldegrees, '-') !== false) { |
|
694 | 694 | $latPos = "S"; |
695 | 695 | } else { |
696 | 696 | $latPos = "N"; |
697 | 697 | } |
698 | 698 | $dms = $this->convertDDtoDMS(abs($decimaldegrees)); |
699 | - return hsc($dms . $latPos); |
|
699 | + return hsc($dms.$latPos); |
|
700 | 700 | } |
701 | 701 | |
702 | 702 | /** |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | $secs = ($decimaldegrees - $dms) * 3600; |
712 | 712 | $min = floor($secs / 60); |
713 | 713 | $sec = round($secs - ($min * 60), 3); |
714 | - $dms .= 'º' . $min . '\'' . $sec . '"'; |
|
714 | + $dms .= 'º'.$min.'\''.$sec.'"'; |
|
715 | 715 | return $dms; |
716 | 716 | } |
717 | 717 | |
@@ -723,13 +723,13 @@ discard block |
||
723 | 723 | * @todo move this into a shared library |
724 | 724 | */ |
725 | 725 | private function convertLon(float $decimaldegrees): string { |
726 | - if(strpos($decimaldegrees, '-') !== false) { |
|
726 | + if (strpos($decimaldegrees, '-') !== false) { |
|
727 | 727 | $lonPos = "W"; |
728 | 728 | } else { |
729 | 729 | $lonPos = "E"; |
730 | 730 | } |
731 | 731 | $dms = $this->convertDDtoDMS(abs($decimaldegrees)); |
732 | - return hsc($dms . $lonPos); |
|
732 | + return hsc($dms.$lonPos); |
|
733 | 733 | } |
734 | 734 | |
735 | 735 | /** |
@@ -760,60 +760,60 @@ discard block |
||
760 | 760 | // dbglog($data, 'olmap::render() data.'); |
761 | 761 | list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data; |
762 | 762 | |
763 | - if($format == 'xhtml') { |
|
763 | + if ($format == 'xhtml') { |
|
764 | 764 | $olscript = ''; |
765 | 765 | $stamenEnable = $this->getConf('enableStamen'); |
766 | 766 | $osmEnable = $this->getConf('enableOSM'); |
767 | 767 | $enableBing = $this->getConf('enableBing'); |
768 | 768 | |
769 | 769 | $scriptEnable = ''; |
770 | - if(!$initialised) { |
|
770 | + if (!$initialised) { |
|
771 | 771 | $initialised = true; |
772 | 772 | // render necessary script tags only once |
773 | - $olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol7/ol.js"></script> |
|
774 | -<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol7/ol-layerswitcher.js"></script>'; |
|
773 | + $olscript = '<script defer="defer" src="'.DOKU_BASE.'lib/plugins/openlayersmap/ol7/ol.js"></script> |
|
774 | +<script defer="defer" src="' . DOKU_BASE.'lib/plugins/openlayersmap/ol7/ol-layerswitcher.js"></script>'; |
|
775 | 775 | |
776 | 776 | $scriptEnable = '<script defer="defer" src="data:text/javascript;base64,'; |
777 | 777 | $scriptSrc = $olscript ? 'const olEnable=true;' : 'const olEnable=false;'; |
778 | - $scriptSrc .= 'const osmEnable=' . ($osmEnable ? 'true' : 'false') . ';'; |
|
779 | - $scriptSrc .= 'const stamenEnable=' . ($stamenEnable ? 'true' : 'false') . ';'; |
|
780 | - $scriptSrc .= 'const bEnable=' . ($enableBing ? 'true' : 'false') . ';'; |
|
781 | - $scriptSrc .= 'const bApiKey="' . $this->getConf('bingAPIKey') . '";'; |
|
782 | - $scriptSrc .= 'const tfApiKey="' . $this->getConf('tfApiKey') . '";'; |
|
783 | - $scriptSrc .= 'const gApiKey="' . $this->getConf('googleAPIkey') . '";'; |
|
778 | + $scriptSrc .= 'const osmEnable='.($osmEnable ? 'true' : 'false').';'; |
|
779 | + $scriptSrc .= 'const stamenEnable='.($stamenEnable ? 'true' : 'false').';'; |
|
780 | + $scriptSrc .= 'const bEnable='.($enableBing ? 'true' : 'false').';'; |
|
781 | + $scriptSrc .= 'const bApiKey="'.$this->getConf('bingAPIKey').'";'; |
|
782 | + $scriptSrc .= 'const tfApiKey="'.$this->getConf('tfApiKey').'";'; |
|
783 | + $scriptSrc .= 'const gApiKey="'.$this->getConf('googleAPIkey').'";'; |
|
784 | 784 | $scriptSrc .= 'olMapData = []; let olMaps = {}; let olMapOverlays = {};'; |
785 | 785 | $scriptEnable .= base64_encode($scriptSrc); |
786 | 786 | $scriptEnable .= '"></script>'; |
787 | 787 | } |
788 | 788 | $renderer->doc .= "$olscript\n$scriptEnable"; |
789 | - $renderer->doc .= '<div class="olMapHelp">' . $this->locale_xhtml("help") . '</div>'; |
|
790 | - if($this->getConf('enableA11y')) { |
|
791 | - $renderer->doc .= '<div id="' . $mapid . '-static" class="olStaticMap">' |
|
792 | - . p_render($format, p_get_instructions($staticImgUrl), $info) . '</div>'; |
|
789 | + $renderer->doc .= '<div class="olMapHelp">'.$this->locale_xhtml("help").'</div>'; |
|
790 | + if ($this->getConf('enableA11y')) { |
|
791 | + $renderer->doc .= '<div id="'.$mapid.'-static" class="olStaticMap">' |
|
792 | + . p_render($format, p_get_instructions($staticImgUrl), $info).'</div>'; |
|
793 | 793 | } |
794 | - $renderer->doc .= '<div id="' . $mapid . '-clearer" class="clearer"><p> </p></div>'; |
|
795 | - if($this->getConf('enableA11y')) { |
|
794 | + $renderer->doc .= '<div id="'.$mapid.'-clearer" class="clearer"><p> </p></div>'; |
|
795 | + if ($this->getConf('enableA11y')) { |
|
796 | 796 | // render a table of the POI for the print and a11y presentation, it is hidden using javascript |
797 | 797 | $renderer->doc .= ' |
798 | - <div class="olPOItableSpan" id="' . $mapid . '-table-span"> |
|
799 | - <table class="olPOItable" id="' . $mapid . '-table"> |
|
800 | - <caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle') . '</caption> |
|
798 | + <div class="olPOItableSpan" id="' . $mapid.'-table-span"> |
|
799 | + <table class="olPOItable" id="' . $mapid.'-table"> |
|
800 | + <caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle').'</caption> |
|
801 | 801 | <thead class="olPOITblHeader"> |
802 | 802 | <tr> |
803 | 803 | <th class="rowId" scope="col">id</th> |
804 | - <th class="icon" scope="col">' . $this->getLang('olmapPOIicon') . '</th> |
|
805 | - <th class="lat" scope="col" title="' . $this->getLang('olmapPOIlatTitle') . '">' |
|
806 | - . $this->getLang('olmapPOIlat') . '</th> |
|
807 | - <th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle') . '">' |
|
808 | - . $this->getLang('olmapPOIlon') . '</th> |
|
809 | - <th class="txt" scope="col">' . $this->getLang('olmapPOItxt') . '</th> |
|
804 | + <th class="icon" scope="col">' . $this->getLang('olmapPOIicon').'</th> |
|
805 | + <th class="lat" scope="col" title="' . $this->getLang('olmapPOIlatTitle').'">' |
|
806 | + . $this->getLang('olmapPOIlat').'</th> |
|
807 | + <th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle').'">' |
|
808 | + . $this->getLang('olmapPOIlon').'</th> |
|
809 | + <th class="txt" scope="col">' . $this->getLang('olmapPOItxt').'</th> |
|
810 | 810 | </tr> |
811 | 811 | </thead>'; |
812 | - if($poitabledesc != '') { |
|
813 | - $renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">' . $poitabledesc |
|
812 | + if ($poitabledesc != '') { |
|
813 | + $renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">'.$poitabledesc |
|
814 | 814 | . '</td></tr></tfoot>'; |
815 | 815 | } |
816 | - $renderer->doc .= '<tbody class="olPOITblBody">' . $poitable . '</tbody> |
|
816 | + $renderer->doc .= '<tbody class="olPOITblBody">'.$poitable.'</tbody> |
|
817 | 817 | </table> |
818 | 818 | </div>'; |
819 | 819 | $renderer->doc .= "\n"; |
@@ -824,28 +824,28 @@ discard block |
||
824 | 824 | $renderer->doc .= '"></script>'; |
825 | 825 | $mapnumber++; |
826 | 826 | return true; |
827 | - } elseif($format == 'metadata') { |
|
828 | - if(!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) { |
|
827 | + } elseif ($format == 'metadata') { |
|
828 | + if (!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) { |
|
829 | 829 | // render geo metadata, unless they are the default |
830 | 830 | $renderer->meta ['geo'] ['lat'] = $mainLat; |
831 | 831 | $renderer->meta ['geo'] ['lon'] = $mainLon; |
832 | - if($geophp = plugin_load('helper', 'geophp')) { |
|
832 | + if ($geophp = plugin_load('helper', 'geophp')) { |
|
833 | 833 | // if we have the geoPHP helper, add the geohash |
834 | 834 | |
835 | 835 | // fails with older php versions.. |
836 | 836 | // $renderer->meta['geo']['geohash'] = (new Point($mainLon,$mainLat))->out('geohash'); |
837 | - $p = new Point ($mainLon, $mainLat); |
|
837 | + $p = new Point($mainLon, $mainLat); |
|
838 | 838 | $renderer->meta ['geo'] ['geohash'] = $p->out('geohash'); |
839 | 839 | } |
840 | 840 | } |
841 | 841 | |
842 | - if(($this->getConf('enableA11y')) && (!empty ($_firstimage))) { |
|
842 | + if (($this->getConf('enableA11y')) && (!empty ($_firstimage))) { |
|
843 | 843 | // add map local image into relation/firstimage if not already filled and when it is a local image |
844 | 844 | |
845 | 845 | global $ID; |
846 | 846 | $rel = p_get_metadata($ID, 'relation', METADATA_RENDER_USING_CACHE); |
847 | 847 | // $img = $rel ['firstimage']; |
848 | - if(empty ($rel ['firstimage']) /* || $img == $_firstimage*/) { |
|
848 | + if (empty ($rel ['firstimage']) /* || $img == $_firstimage*/) { |
|
849 | 849 | //dbglog ( $_firstimage, |
850 | 850 | // 'olmap::render#rendering image relation metadata for _firstimage as $img was empty or same.' ); |
851 | 851 | // This seems to never work; the firstimage entry in the .meta file is empty |