|
@@ -14,37 +14,37 @@ discard block |
|
|
block discarded – undo |
|
14
|
14
|
{ |
|
15
|
15
|
$coords = explode(',',$_GET['coord']); |
|
16
|
16
|
if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
|
17
|
|
- || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
|
17
|
+ || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
18
|
18
|
//$spotter_array = $Source->getAllLocationInfo(); |
|
19
|
19
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords)); |
|
20
|
20
|
} |
|
21
|
21
|
if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
|
22
|
|
- || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
|
22
|
+ || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
23
|
23
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords)); |
|
24
|
24
|
} |
|
25
|
25
|
if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
|
26
|
|
- || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
|
26
|
+ || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
27
|
27
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords)); |
|
28
|
28
|
} |
|
29
|
29
|
|
|
30
|
30
|
if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
|
31
|
|
- || (!isset($_COOKIE['show_Fire']) && (!isset($globalMapFire) || $globalMapFire === TRUE))) { |
|
|
31
|
+ || (!isset($_COOKIE['show_Fire']) && (!isset($globalMapFire) || $globalMapFire === TRUE))) { |
|
32
|
32
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords)); |
|
33
|
33
|
} |
|
34
|
34
|
|
|
35
|
35
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
|
36
|
36
|
} else { |
|
37
|
37
|
if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
|
38
|
|
- || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
|
38
|
+ || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
39
|
39
|
//$spotter_array = $Source->getAllLocationInfo(); |
|
40
|
40
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
|
41
|
41
|
} |
|
42
|
42
|
if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
|
43
|
|
- || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
|
43
|
+ || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
44
|
44
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
|
45
|
45
|
} |
|
46
|
46
|
if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
|
47
|
|
- || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
|
47
|
+ || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
48
|
48
|
$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
|
49
|
49
|
} |
|
50
|
50
|
/* |
|
@@ -65,7 +65,7 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
date_default_timezone_set('UTC'); |
|
66
|
66
|
//waypoint plotting |
|
67
|
67
|
$output .= '{"type": "Feature",'; |
|
68
|
|
- $output .= '"properties": {'; |
|
|
68
|
+ $output .= '"properties": {'; |
|
69
|
69
|
$output .= '"id": "'.$spotter_item['id'].'",'; |
|
70
|
70
|
$output .= '"location_id": "'.$spotter_item['location_id'].'",'; |
|
71
|
71
|
$output .= '"name": "'.$spotter_item['name'].'",'; |
|
@@ -83,13 +83,13 @@ discard block |
|
|
block discarded – undo |
|
83
|
83
|
if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
|
84
|
84
|
} |
|
85
|
85
|
$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
|
86
|
|
- $output .= '},'; |
|
87
|
|
- $output .= '"geometry": {'; |
|
|
86
|
+ $output .= '},'; |
|
|
87
|
+ $output .= '"geometry": {'; |
|
88
|
88
|
$output .= '"type": "Point",'; |
|
89
|
89
|
$output .= '"coordinates": ['; |
|
90
|
|
- $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
|
90
|
+ $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
91
|
91
|
$output .= ']'; |
|
92
|
|
- $output .= '}'; |
|
|
92
|
+ $output .= '}'; |
|
93
|
93
|
$output .= '},'; |
|
94
|
94
|
} |
|
95
|
95
|
$output = substr($output, 0, -1); |
Ysurac /
FlightAirMap
