@@ -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]); |
@@ -409,34 +409,34 @@ discard block |
||
409 | 409 | |
410 | 410 | <ul class="nav navbar-nav"> |
411 | 411 | <?php |
412 | - if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) { |
|
412 | + if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) { |
|
413 | 413 | ?> |
414 | 414 | <li><a href="<?php print $globalURL; ?>/news"><?php echo _("News"); ?></a></li> |
415 | 415 | <?php |
416 | - } |
|
416 | + } |
|
417 | 417 | ?> |
418 | 418 | |
419 | 419 | <?php |
420 | - $sub = false; |
|
421 | - if ( |
|
420 | + $sub = false; |
|
421 | + if ( |
|
422 | 422 | ( |
423 | - (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
423 | + (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
424 | 424 | ) || |
425 | 425 | ( |
426 | - isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
426 | + isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
427 | 427 | ) || |
428 | 428 | ( |
429 | - isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
429 | + isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
430 | 430 | ) || |
431 | 431 | ( |
432 | - isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
432 | + isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
433 | 433 | ) |
434 | - ) { |
|
434 | + ) { |
|
435 | 435 | $sub = true; |
436 | - } |
|
436 | + } |
|
437 | 437 | ?> |
438 | 438 | <?php |
439 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
439 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
440 | 440 | ?> |
441 | 441 | <li class="dropdown"> |
442 | 442 | <?php |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | <ul class="dropdown-menu multi-level"> |
448 | 448 | <li class="dropdown-submenu"> |
449 | 449 | <?php |
450 | - } |
|
450 | + } |
|
451 | 451 | ?> |
452 | 452 | <?php |
453 | 453 | if (isset($globalNewsFeeds['aircraft']) && !empty($globalNewsFeeds['aircraft'])) { |
@@ -462,25 +462,25 @@ discard block |
||
462 | 462 | <ul class="dropdown-menu"> |
463 | 463 | <li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li> |
464 | 464 | <?php |
465 | - if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
465 | + if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
466 | 466 | ?> |
467 | 467 | <li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li> |
468 | 468 | <?php |
469 | - } |
|
469 | + } |
|
470 | 470 | ?> |
471 | 471 | <li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li> |
472 | 472 | <?php |
473 | - if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
473 | + if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
474 | 474 | ?> |
475 | 475 | <li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li> |
476 | 476 | <?php |
477 | - } |
|
478 | - if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
477 | + } |
|
478 | + if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
479 | 479 | |
480 | 480 | ?> |
481 | 481 | <li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li> |
482 | 482 | <?php |
483 | - } |
|
483 | + } |
|
484 | 484 | ?> |
485 | 485 | <li><hr /></li> |
486 | 486 | <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li> |
@@ -488,43 +488,43 @@ discard block |
||
488 | 488 | <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li> |
489 | 489 | <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li> |
490 | 490 | <?php |
491 | - if ($globalACARS) { |
|
492 | - if (isset($globalDemo) && $globalDemo) { |
|
493 | - ?> |
|
491 | + if ($globalACARS) { |
|
492 | + if (isset($globalDemo) && $globalDemo) { |
|
493 | + ?> |
|
494 | 494 | <li><hr /></li> |
495 | 495 | <li><i><?php echo _('ACARS data not available publicly'); ?></i></li> |
496 | 496 | <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li> |
497 | 497 | <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li> |
498 | 498 | <?php |
499 | - } else { |
|
500 | - ?> |
|
499 | + } else { |
|
500 | + ?> |
|
501 | 501 | <li><hr /></li> |
502 | 502 | <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li> |
503 | 503 | <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li> |
504 | 504 | <?php |
505 | - } |
|
506 | - } |
|
507 | - ?> |
|
505 | + } |
|
506 | + } |
|
507 | + ?> |
|
508 | 508 | <?php |
509 | - if (isset($globalAccidents) && $globalAccidents) { |
|
510 | - ?> |
|
509 | + if (isset($globalAccidents) && $globalAccidents) { |
|
510 | + ?> |
|
511 | 511 | <li><hr /></li> |
512 | 512 | <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li> |
513 | 513 | <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li> |
514 | 514 | <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li> |
515 | 515 | <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li> |
516 | 516 | <?php |
517 | - } |
|
518 | - ?> |
|
517 | + } |
|
518 | + ?> |
|
519 | 519 | <li><hr /></li> |
520 | 520 | <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li> |
521 | 521 | <?php |
522 | 522 | if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) { |
523 | - ?> |
|
523 | + ?> |
|
524 | 524 | <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li> |
525 | 525 | <?php |
526 | 526 | } |
527 | - ?> |
|
527 | + ?> |
|
528 | 528 | </ul> |
529 | 529 | </li> |
530 | 530 | <li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li> |
@@ -551,14 +551,14 @@ discard block |
||
551 | 551 | </ul> |
552 | 552 | <?php |
553 | 553 | } |
554 | - } |
|
554 | + } |
|
555 | 555 | ?> |
556 | 556 | <?php |
557 | - if (isset($globalMarine) && $globalMarine) { |
|
557 | + if (isset($globalMarine) && $globalMarine) { |
|
558 | 558 | ?> |
559 | 559 | <li class="dropdown"> |
560 | 560 | <?php |
561 | - if ($sub) { |
|
561 | + if ($sub) { |
|
562 | 562 | ?> |
563 | 563 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Marines"); ?> <b class="caret"></b></a> |
564 | 564 | <ul class="dropdown-menu multi-level"> |
@@ -601,14 +601,14 @@ discard block |
||
601 | 601 | } |
602 | 602 | ?> |
603 | 603 | <?php |
604 | - } |
|
604 | + } |
|
605 | 605 | ?> |
606 | 606 | <?php |
607 | - if (isset($globalTracker) && $globalTracker) { |
|
607 | + if (isset($globalTracker) && $globalTracker) { |
|
608 | 608 | ?> |
609 | 609 | <li class="dropdown"> |
610 | 610 | <?php |
611 | - if ($sub) { |
|
611 | + if ($sub) { |
|
612 | 612 | ?> |
613 | 613 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a> |
614 | 614 | <ul class="dropdown-menu multi-level"> |
@@ -642,14 +642,14 @@ discard block |
||
642 | 642 | } |
643 | 643 | ?> |
644 | 644 | <?php |
645 | - } |
|
645 | + } |
|
646 | 646 | ?> |
647 | 647 | <?php |
648 | - if (isset($globalSatellite) && $globalSatellite) { |
|
648 | + if (isset($globalSatellite) && $globalSatellite) { |
|
649 | 649 | ?> |
650 | 650 | <li class="dropdown"> |
651 | 651 | <?php |
652 | - if ($sub) { |
|
652 | + if ($sub) { |
|
653 | 653 | ?> |
654 | 654 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellites"); ?> <b class="caret"></b></a> |
655 | 655 | <ul class="dropdown-menu multi-level"> |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | } |
686 | 686 | ?> |
687 | 687 | <?php |
688 | - } |
|
688 | + } |
|
689 | 689 | ?> |
690 | 690 | |
691 | 691 | <li class="dropdown"> |
@@ -693,13 +693,13 @@ discard block |
||
693 | 693 | <ul class="dropdown-menu"> |
694 | 694 | <li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li> |
695 | 695 | <?php |
696 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
696 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
697 | 697 | ?> |
698 | 698 | <li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li> |
699 | 699 | <li><hr /></li> |
700 | 700 | <li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li> |
701 | 701 | <?php |
702 | - } |
|
702 | + } |
|
703 | 703 | ?> |
704 | 704 | <?php if (isset($globalContribute) && $globalContribute) { ?> |
705 | 705 | <li><hr /></li> |
@@ -723,13 +723,13 @@ discard block |
||
723 | 723 | <form> |
724 | 724 | <select class="selectpicker" data-width="120px" onchange="language(this);"> |
725 | 725 | <?php |
726 | - foreach ($alllang as $key => $lang) { |
|
727 | - print '<option value="'.$key.'"'; |
|
728 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
729 | - if ($lang[0] == 'Deutsch') print '>'.$lang[0].' (βeta)</option>'; |
|
730 | - else print '>'.$lang[0].'</option>'; |
|
731 | - } |
|
732 | - ?> |
|
726 | + foreach ($alllang as $key => $lang) { |
|
727 | + print '<option value="'.$key.'"'; |
|
728 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
729 | + if ($lang[0] == 'Deutsch') print '>'.$lang[0].' (βeta)</option>'; |
|
730 | + else print '>'.$lang[0].'</option>'; |
|
731 | + } |
|
732 | + ?> |
|
733 | 733 | </select> |
734 | 734 | </form> |
735 | 735 | </div> |
@@ -762,18 +762,18 @@ discard block |
||
762 | 762 | ?> |
763 | 763 | <div class="top-header clear" role="main"> |
764 | 764 | <?php |
765 | - if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
765 | + if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
766 | 766 | ?> |
767 | 767 | <div id="archive-map"></div> |
768 | 768 | <?php |
769 | - } |
|
769 | + } |
|
770 | 770 | ?> |
771 | 771 | </div> |
772 | 772 | <?php |
773 | 773 | } |
774 | 774 | 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)) |
775 | 775 | { |
776 | - ?> |
|
776 | + ?> |
|
777 | 777 | <div class="top-header clear" role="main"> |
778 | 778 | <div id="map"></div> |
779 | 779 | <link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" /> |
@@ -784,15 +784,15 @@ discard block |
||
784 | 784 | var zoom = 13; |
785 | 785 | //create the map |
786 | 786 | <?php |
787 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
787 | + if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
788 | 788 | ?> |
789 | 789 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
790 | 790 | <?php |
791 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
791 | + } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
792 | 792 | ?> |
793 | 793 | map = L.map('map', { zoomControl:true }); |
794 | 794 | <?php |
795 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
795 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
796 | 796 | ?> |
797 | 797 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
798 | 798 | 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); |
@@ -800,22 +800,22 @@ discard block |
||
800 | 800 | 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); |
801 | 801 | 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); |
802 | 802 | <?php |
803 | - } 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'])) { |
|
803 | + } 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'])) { |
|
804 | 804 | ?> |
805 | 805 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
806 | 806 | <?php |
807 | - } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
807 | + } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
808 | 808 | ?> |
809 | 809 | map = L.map('map', { zoomControl:true }); |
810 | 810 | <?php |
811 | - } |
|
811 | + } |
|
812 | 812 | ?> |
813 | 813 | //initialize the layer group for the aircrft markers |
814 | 814 | var layer_data = L.layerGroup(); |
815 | 815 | |
816 | 816 | //a few title layers |
817 | 817 | <?php |
818 | - if ($globalMapProvider == 'Mapbox') { |
|
818 | + if ($globalMapProvider == 'Mapbox') { |
|
819 | 819 | ?> |
820 | 820 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
821 | 821 | maxZoom: 18, |
@@ -826,14 +826,14 @@ discard block |
||
826 | 826 | token : '<?php print $globalMapboxToken; ?>' |
827 | 827 | }).addTo(map); |
828 | 828 | <?php |
829 | - } elseif ($globalMapProvider == 'Mapbox-GL') { |
|
829 | + } elseif ($globalMapProvider == 'Mapbox-GL') { |
|
830 | 830 | ?> |
831 | 831 | L.mapboxGL({ |
832 | 832 | accessToken: '<?php print $globalMapboxToken; ?>', |
833 | 833 | style: 'mapbox://styles/mapbox/bright-v8' |
834 | 834 | }).addTo(map); |
835 | 835 | <?php |
836 | - } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
836 | + } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
837 | 837 | ?> |
838 | 838 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', { |
839 | 839 | maxZoom: 18, |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>' |
843 | 843 | }).addTo(map); |
844 | 844 | <?php |
845 | - } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
845 | + } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
846 | 846 | ?> |
847 | 847 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', { |
848 | 848 | maxZoom: 18, |
@@ -851,27 +851,27 @@ discard block |
||
851 | 851 | '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"' |
852 | 852 | }).addTo(map); |
853 | 853 | <?php |
854 | - } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
854 | + } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
855 | 855 | ?> |
856 | 856 | var googleLayer = new L.Google('ROADMAP'); |
857 | 857 | map.addLayer(googleLayer); |
858 | 858 | <?php |
859 | - } elseif ($globalMapProvider == 'Google-Satellite') { |
|
859 | + } elseif ($globalMapProvider == 'Google-Satellite') { |
|
860 | 860 | ?> |
861 | 861 | var googleLayer = new L.Google('SATELLITE'); |
862 | 862 | map.addLayer(googleLayer); |
863 | 863 | <?php |
864 | - } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
864 | + } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
865 | 865 | ?> |
866 | 866 | var googleLayer = new L.Google('HYBRID'); |
867 | 867 | map.addLayer(googleLayer); |
868 | 868 | <?php |
869 | - } elseif ($globalMapProvider == 'Google-Terrain') { |
|
869 | + } elseif ($globalMapProvider == 'Google-Terrain') { |
|
870 | 870 | ?> |
871 | 871 | var googleLayer = new L.Google('Terrain'); |
872 | 872 | map.addLayer(googleLayer); |
873 | 873 | <?php |
874 | - } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
874 | + } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
875 | 875 | $customid = $globalMapProvider; |
876 | 876 | ?> |
877 | 877 | L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', { |
@@ -881,7 +881,7 @@ discard block |
||
881 | 881 | attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
882 | 882 | }).addTo(map); |
883 | 883 | <?php |
884 | - } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) { |
|
884 | + } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) { |
|
885 | 885 | ?> |
886 | 886 | var center = map.getCenter(); |
887 | 887 | map.options.crs = L.CRS.EPSG4326; |
@@ -896,8 +896,8 @@ discard block |
||
896 | 896 | attribution: 'Natural Earth' |
897 | 897 | }).addTo(map); |
898 | 898 | <?php |
899 | - //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
900 | - } else { |
|
899 | + //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
900 | + } else { |
|
901 | 901 | ?> |
902 | 902 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
903 | 903 | maxZoom: 18, |
@@ -906,7 +906,7 @@ discard block |
||
906 | 906 | }).addTo(map); |
907 | 907 | |
908 | 908 | <?php |
909 | - } |
|
909 | + } |
|
910 | 910 | ?> |
911 | 911 | </script> |
912 | 912 | </div> |