@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | // When button "Remove all filters" is clicked |
39 | 39 | if (isset($_POST['removefilters'])) { |
40 | 40 | $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
41 | - return strpos($key,'filter_') === 0; |
|
41 | + return strpos($key,'filter_') === 0; |
|
42 | 42 | }); |
43 | 43 | foreach ($allfilters as $filt) { |
44 | 44 | unset($_COOKIE[$filt]); |
@@ -188,17 +188,17 @@ discard block |
||
188 | 188 | } |
189 | 189 | ?> |
190 | 190 | <?php |
191 | - if (isset($_POST['archive'])) { |
|
191 | + if (isset($_POST['archive'])) { |
|
192 | 192 | ?> |
193 | 193 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
194 | 194 | <?php |
195 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
195 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
196 | 196 | ?> |
197 | 197 | |
198 | 198 | <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script> |
199 | 199 | <?php |
200 | - } |
|
201 | - } else { |
|
200 | + } |
|
201 | + } else { |
|
202 | 202 | ?> |
203 | 203 | <?php |
204 | 204 | /* if (isset($globalBeta) && $globalBeta) { |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | */ |
211 | 211 | ?> |
212 | 212 | <?php |
213 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
213 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
214 | 214 | ?> |
215 | 215 | <?php |
216 | 216 | // if (isset($globalBeta) && $globalBeta) { |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | <script src="<?php print $globalURL; ?>/js/map-satellite.2d.js.php?<?php print time(); ?>"></script> |
242 | 242 | <?php |
243 | 243 | } |
244 | - } |
|
244 | + } |
|
245 | 245 | ?> |
246 | 246 | <?php |
247 | 247 | // } |
248 | 248 | ?> |
249 | 249 | <?php |
250 | - } |
|
250 | + } |
|
251 | 251 | } |
252 | 252 | ?> |
253 | 253 | <?php |
@@ -424,34 +424,34 @@ discard block |
||
424 | 424 | |
425 | 425 | <ul class="nav navbar-nav"> |
426 | 426 | <?php |
427 | - if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) { |
|
427 | + if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) { |
|
428 | 428 | ?> |
429 | 429 | <li><a href="<?php print $globalURL; ?>/news"><?php echo _("News"); ?></a></li> |
430 | 430 | <?php |
431 | - } |
|
431 | + } |
|
432 | 432 | ?> |
433 | 433 | |
434 | 434 | <?php |
435 | - $sub = false; |
|
436 | - if ( |
|
435 | + $sub = false; |
|
436 | + if ( |
|
437 | 437 | ( |
438 | - (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
438 | + (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
439 | 439 | ) || |
440 | 440 | ( |
441 | - isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
441 | + isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
442 | 442 | ) || |
443 | 443 | ( |
444 | - isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
444 | + isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
445 | 445 | ) || |
446 | 446 | ( |
447 | - isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
447 | + isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
448 | 448 | ) |
449 | - ) { |
|
449 | + ) { |
|
450 | 450 | $sub = true; |
451 | - } |
|
451 | + } |
|
452 | 452 | ?> |
453 | 453 | <?php |
454 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
454 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
455 | 455 | ?> |
456 | 456 | <li class="dropdown"> |
457 | 457 | <?php |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | <ul class="dropdown-menu multi-level"> |
463 | 463 | <li class="dropdown-submenu"> |
464 | 464 | <?php |
465 | - } |
|
465 | + } |
|
466 | 466 | ?> |
467 | 467 | <?php |
468 | 468 | if (isset($globalNewsFeeds['aircraft']) && !empty($globalNewsFeeds['aircraft'])) { |
@@ -477,25 +477,25 @@ discard block |
||
477 | 477 | <ul class="dropdown-menu"> |
478 | 478 | <li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li> |
479 | 479 | <?php |
480 | - if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
480 | + if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
481 | 481 | ?> |
482 | 482 | <li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li> |
483 | 483 | <?php |
484 | - } |
|
484 | + } |
|
485 | 485 | ?> |
486 | 486 | <li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li> |
487 | 487 | <?php |
488 | - if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
488 | + if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
489 | 489 | ?> |
490 | 490 | <li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li> |
491 | 491 | <?php |
492 | - } |
|
493 | - if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
492 | + } |
|
493 | + if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
494 | 494 | |
495 | 495 | ?> |
496 | 496 | <li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li> |
497 | 497 | <?php |
498 | - } |
|
498 | + } |
|
499 | 499 | ?> |
500 | 500 | <li><hr /></li> |
501 | 501 | <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li> |
@@ -503,43 +503,43 @@ discard block |
||
503 | 503 | <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li> |
504 | 504 | <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li> |
505 | 505 | <?php |
506 | - if ($globalACARS) { |
|
507 | - if (isset($globalDemo) && $globalDemo) { |
|
508 | - ?> |
|
506 | + if ($globalACARS) { |
|
507 | + if (isset($globalDemo) && $globalDemo) { |
|
508 | + ?> |
|
509 | 509 | <li><hr /></li> |
510 | 510 | <li><i><?php echo _('ACARS data not available publicly'); ?></i></li> |
511 | 511 | <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li> |
512 | 512 | <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li> |
513 | 513 | <?php |
514 | - } else { |
|
515 | - ?> |
|
514 | + } else { |
|
515 | + ?> |
|
516 | 516 | <li><hr /></li> |
517 | 517 | <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li> |
518 | 518 | <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li> |
519 | 519 | <?php |
520 | - } |
|
521 | - } |
|
522 | - ?> |
|
520 | + } |
|
521 | + } |
|
522 | + ?> |
|
523 | 523 | <?php |
524 | - if (isset($globalAccidents) && $globalAccidents) { |
|
525 | - ?> |
|
524 | + if (isset($globalAccidents) && $globalAccidents) { |
|
525 | + ?> |
|
526 | 526 | <li><hr /></li> |
527 | 527 | <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li> |
528 | 528 | <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li> |
529 | 529 | <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li> |
530 | 530 | <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li> |
531 | 531 | <?php |
532 | - } |
|
533 | - ?> |
|
532 | + } |
|
533 | + ?> |
|
534 | 534 | <li><hr /></li> |
535 | 535 | <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li> |
536 | 536 | <?php |
537 | 537 | if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) { |
538 | - ?> |
|
538 | + ?> |
|
539 | 539 | <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li> |
540 | 540 | <?php |
541 | 541 | } |
542 | - ?> |
|
542 | + ?> |
|
543 | 543 | </ul> |
544 | 544 | </li> |
545 | 545 | <li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li> |
@@ -566,14 +566,14 @@ discard block |
||
566 | 566 | </ul> |
567 | 567 | <?php |
568 | 568 | } |
569 | - } |
|
569 | + } |
|
570 | 570 | ?> |
571 | 571 | <?php |
572 | - if (isset($globalMarine) && $globalMarine) { |
|
572 | + if (isset($globalMarine) && $globalMarine) { |
|
573 | 573 | ?> |
574 | 574 | <li class="dropdown"> |
575 | 575 | <?php |
576 | - if ($sub) { |
|
576 | + if ($sub) { |
|
577 | 577 | ?> |
578 | 578 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Marines"); ?> <b class="caret"></b></a> |
579 | 579 | <ul class="dropdown-menu multi-level"> |
@@ -607,14 +607,14 @@ discard block |
||
607 | 607 | } |
608 | 608 | ?> |
609 | 609 | <?php |
610 | - } |
|
610 | + } |
|
611 | 611 | ?> |
612 | 612 | <?php |
613 | - if (isset($globalTracker) && $globalTracker) { |
|
613 | + if (isset($globalTracker) && $globalTracker) { |
|
614 | 614 | ?> |
615 | 615 | <li class="dropdown"> |
616 | 616 | <?php |
617 | - if ($sub) { |
|
617 | + if ($sub) { |
|
618 | 618 | ?> |
619 | 619 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a> |
620 | 620 | <ul class="dropdown-menu multi-level"> |
@@ -648,14 +648,14 @@ discard block |
||
648 | 648 | } |
649 | 649 | ?> |
650 | 650 | <?php |
651 | - } |
|
651 | + } |
|
652 | 652 | ?> |
653 | 653 | <?php |
654 | - if (isset($globalSatellite) && $globalSatellite) { |
|
654 | + if (isset($globalSatellite) && $globalSatellite) { |
|
655 | 655 | ?> |
656 | 656 | <li class="dropdown"> |
657 | 657 | <?php |
658 | - if ($sub) { |
|
658 | + if ($sub) { |
|
659 | 659 | ?> |
660 | 660 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellites"); ?> <b class="caret"></b></a> |
661 | 661 | <ul class="dropdown-menu multi-level"> |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | } |
692 | 692 | ?> |
693 | 693 | <?php |
694 | - } |
|
694 | + } |
|
695 | 695 | ?> |
696 | 696 | |
697 | 697 | <li class="dropdown"> |
@@ -700,12 +700,12 @@ discard block |
||
700 | 700 | <li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li> |
701 | 701 | <li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li> |
702 | 702 | <?php |
703 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
703 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
704 | 704 | ?> |
705 | 705 | <li><hr /></li> |
706 | 706 | <li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li> |
707 | 707 | <?php |
708 | - } |
|
708 | + } |
|
709 | 709 | ?> |
710 | 710 | <?php if (isset($globalContribute) && $globalContribute) { ?> |
711 | 711 | <li><hr /></li> |
@@ -726,14 +726,14 @@ discard block |
||
726 | 726 | <form> |
727 | 727 | <select class="selectpicker" data-width="120px" onchange="language(this);"> |
728 | 728 | <?php |
729 | - $Language = new Language(); |
|
730 | - $alllang = $Language->getLanguages(); |
|
731 | - foreach ($alllang as $key => $lang) { |
|
732 | - print '<option value="'.$key.'"'; |
|
733 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
734 | - print '>'.$lang[0].'</option>'; |
|
735 | - } |
|
736 | - ?> |
|
729 | + $Language = new Language(); |
|
730 | + $alllang = $Language->getLanguages(); |
|
731 | + foreach ($alllang as $key => $lang) { |
|
732 | + print '<option value="'.$key.'"'; |
|
733 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
734 | + print '>'.$lang[0].'</option>'; |
|
735 | + } |
|
736 | + ?> |
|
737 | 737 | </select> |
738 | 738 | </form> |
739 | 739 | </div> |
@@ -765,18 +765,18 @@ discard block |
||
765 | 765 | ?> |
766 | 766 | <div class="top-header clear" role="main"> |
767 | 767 | <?php |
768 | - if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
768 | + if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
769 | 769 | ?> |
770 | 770 | <div id="archive-map"></div> |
771 | 771 | <?php |
772 | - } |
|
772 | + } |
|
773 | 773 | ?> |
774 | 774 | </div> |
775 | 775 | <?php |
776 | 776 | } |
777 | 777 | if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false)) |
778 | 778 | { |
779 | - ?> |
|
779 | + ?> |
|
780 | 780 | <div class="top-header clear" role="main"> |
781 | 781 | <div id="map"></div> |
782 | 782 | <link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" /> |
@@ -787,15 +787,15 @@ discard block |
||
787 | 787 | var zoom = 13; |
788 | 788 | //create the map |
789 | 789 | <?php |
790 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
790 | + if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
791 | 791 | ?> |
792 | 792 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
793 | 793 | <?php |
794 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
794 | + } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
795 | 795 | ?> |
796 | 796 | map = L.map('map', { zoomControl:true }); |
797 | 797 | <?php |
798 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
798 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
799 | 799 | ?> |
800 | 800 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
801 | 801 | var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map); |
@@ -803,22 +803,22 @@ discard block |
||
803 | 803 | var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
804 | 804 | var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
805 | 805 | <?php |
806 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
806 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
807 | 807 | ?> |
808 | 808 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
809 | 809 | <?php |
810 | - } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
810 | + } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
811 | 811 | ?> |
812 | 812 | map = L.map('map', { zoomControl:true }); |
813 | 813 | <?php |
814 | - } |
|
814 | + } |
|
815 | 815 | ?> |
816 | 816 | //initialize the layer group for the aircrft markers |
817 | 817 | var layer_data = L.layerGroup(); |
818 | 818 | |
819 | 819 | //a few title layers |
820 | 820 | <?php |
821 | - if ($globalMapProvider == 'Mapbox') { |
|
821 | + if ($globalMapProvider == 'Mapbox') { |
|
822 | 822 | ?> |
823 | 823 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
824 | 824 | maxZoom: 18, |
@@ -829,14 +829,14 @@ discard block |
||
829 | 829 | token : '<?php print $globalMapboxToken; ?>' |
830 | 830 | }).addTo(map); |
831 | 831 | <?php |
832 | - } elseif ($globalMapProvider == 'Mapbox-GL') { |
|
832 | + } elseif ($globalMapProvider == 'Mapbox-GL') { |
|
833 | 833 | ?> |
834 | 834 | L.mapboxGL({ |
835 | 835 | accessToken: '<?php print $globalMapboxToken; ?>', |
836 | 836 | style: 'mapbox://styles/mapbox/bright-v8' |
837 | 837 | }).addTo(map); |
838 | 838 | <?php |
839 | - } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
839 | + } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
840 | 840 | ?> |
841 | 841 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', { |
842 | 842 | maxZoom: 18, |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>' |
846 | 846 | }).addTo(map); |
847 | 847 | <?php |
848 | - } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
848 | + } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
849 | 849 | ?> |
850 | 850 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', { |
851 | 851 | maxZoom: 18, |
@@ -854,27 +854,27 @@ discard block |
||
854 | 854 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"' |
855 | 855 | }).addTo(map); |
856 | 856 | <?php |
857 | - } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
857 | + } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
858 | 858 | ?> |
859 | 859 | var googleLayer = new L.Google('ROADMAP'); |
860 | 860 | map.addLayer(googleLayer); |
861 | 861 | <?php |
862 | - } elseif ($globalMapProvider == 'Google-Satellite') { |
|
862 | + } elseif ($globalMapProvider == 'Google-Satellite') { |
|
863 | 863 | ?> |
864 | 864 | var googleLayer = new L.Google('SATELLITE'); |
865 | 865 | map.addLayer(googleLayer); |
866 | 866 | <?php |
867 | - } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
867 | + } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
868 | 868 | ?> |
869 | 869 | var googleLayer = new L.Google('HYBRID'); |
870 | 870 | map.addLayer(googleLayer); |
871 | 871 | <?php |
872 | - } elseif ($globalMapProvider == 'Google-Terrain') { |
|
872 | + } elseif ($globalMapProvider == 'Google-Terrain') { |
|
873 | 873 | ?> |
874 | 874 | var googleLayer = new L.Google('Terrain'); |
875 | 875 | map.addLayer(googleLayer); |
876 | 876 | <?php |
877 | - } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
877 | + } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
878 | 878 | $customid = $globalMapProvider; |
879 | 879 | ?> |
880 | 880 | L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', { |
@@ -884,7 +884,7 @@ discard block |
||
884 | 884 | attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
885 | 885 | }).addTo(map); |
886 | 886 | <?php |
887 | - } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) { |
|
887 | + } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) { |
|
888 | 888 | ?> |
889 | 889 | var center = map.getCenter(); |
890 | 890 | map.options.crs = L.CRS.EPSG4326; |
@@ -899,8 +899,8 @@ discard block |
||
899 | 899 | attribution: 'Natural Earth' |
900 | 900 | }).addTo(map); |
901 | 901 | <?php |
902 | - //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
903 | - } else { |
|
902 | + //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
903 | + } else { |
|
904 | 904 | ?> |
905 | 905 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
906 | 906 | maxZoom: 18, |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | }).addTo(map); |
910 | 910 | |
911 | 911 | <?php |
912 | - } |
|
912 | + } |
|
913 | 913 | ?> |
914 | 914 | </script> |
915 | 915 | </div> |