Inspection of "Fix weather remove" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c7e8c6...d82745 )

by Yannick

created 2017-05-28 21:04 UTC

Status

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
 // Compressed GeoJson is used if true
@@ -20,10 +20,10 @@  discard block
 block discarded – undo
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 	else $enddate = time();
-	setcookie("archive_begin",$begindate);
-	setcookie("archive_end",$enddate);
-	setcookie("archive_update",$lastupd);
-	setcookie("archive_speed",$archivespeed);
+	setcookie("archive_begin", $begindate);
+	setcookie("archive_end", $enddate);
+	setcookie("archive_update", $lastupd);
+	setcookie("archive_speed", $archivespeed);
 ?>
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -74,16 +74,16 @@  discard block
 block discarded – undo
 <?php
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['flightaware_id'])) {
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
 	}
@@ -213,19 +213,19 @@  discard block
 block discarded – undo
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);

Please login to merge, or discard this patch.

Braces +95 added lines, -25 removed lines patch added patch discarded remove patch

@@ -4,10 +4,15 @@  discard block
 block discarded – undo
 
 setcookie("MapFormat",'2d');
 
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
+if (!isset($globalOpenWeatherMapKey)) {
+	$globalOpenWeatherMapKey = '';
+}
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 if (isset($_GET['archive'])) {
 	$archive = true;
 	//$archiveupdatetime = 50;
@@ -18,8 +23,11 @@  discard block
 block discarded – undo
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 	//$lastupd = 20;
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-	else $enddate = time();
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+		$enddate = $_GET['enddate'];
+	} else {
+		$enddate = time();
+	}
 	setcookie("archive_begin",$begindate);
 	setcookie("archive_end",$enddate);
 	setcookie("archive_update",$lastupd);
@@ -106,7 +114,17 @@  discard block
 block discarded – undo
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 ?>
@@ -119,9 +137,19 @@  discard block
 block discarded – undo
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom-1;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -146,16 +174,27 @@  discard block
 block discarded – undo
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -167,7 +206,12 @@  discard block
 block discarded – undo
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -213,20 +257,26 @@  discard block
 block discarded – undo
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -249,9 +299,24 @@  discard block
 block discarded – undo
 		$customid = $MapType;
 ?>
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
 	}).addTo(map);
 
@@ -285,7 +350,12 @@  discard block
 block discarded – undo
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,

Please login to merge, or discard this patch.

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2	require_once('../require/settings.php');
3	3	require_once('../require/class.Language.php');
4	4
5		-setcookie("MapFormat",'2d');
	5	+setcookie("MapFormat", '2d');
6	6
7	7	if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
8	8	// Compressed GeoJson is used if true
		@@ -20,10 +20,10 @@ discard block
		block discarded – undo
20	20	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21	21	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22	22	else $enddate = time();
23		- setcookie("archive_begin",$begindate);
24		- setcookie("archive_end",$enddate);
25		- setcookie("archive_update",$lastupd);
26		- setcookie("archive_speed",$archivespeed);
	23	+ setcookie("archive_begin", $begindate);
	24	+ setcookie("archive_end", $enddate);
	25	+ setcookie("archive_update", $lastupd);
	26	+ setcookie("archive_speed", $archivespeed);
27	27	?>
28	28	document.cookie = 'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
29	29	document.cookie = 'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
		@@ -74,16 +74,16 @@ discard block
		block discarded – undo
74	74	<?php
75	75	}
76	76	if (isset($_GET['ident'])) {
77		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	77	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
78	78	}
79	79	if (isset($_GET['flightaware_id'])) {
80		- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	80	+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
81	81	}
82	82	if (isset($_GET['latitude'])) {
83		- $latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
	83	+ $latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
84	84	}
85	85	if (isset($_GET['longitude'])) {
86		- $longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
	86	+ $longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
87	87	}
88	88	?>
89	89
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	\|\| navigator.userAgent.match(/BlackBerry/i)
120	120	\|\| navigator.userAgent.match(/Windows Phone/i))
121	121	{
122		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
	122	+ var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
123	123	} else {
124	124	var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
125	125	}
		@@ -213,19 +213,19 @@ discard block
		block discarded – undo
213	213	map.addLayer(yandexLayer);
214	214	<?php
215	215	} elseif ($MapType == 'Bing-Aerial') {
216		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	216	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
217	217	?>
218	218	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
219	219	map.addLayer(bingLayer);
220	220	<?php
221	221	} elseif ($MapType == 'Bing-Hybrid') {
222		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	222	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
223	223	?>
224	224	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
225	225	map.addLayer(bingLayer);
226	226	<?php
227	227	} elseif ($MapType == 'Bing-Road') {
228		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	228	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
229	229	?>
230	230	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
231	231	map.addLayer(bingLayer);

		@@ -4,10 +4,15 @@ discard block
		block discarded – undo
4	4
5	5	setcookie("MapFormat",'2d');
6	6
7		-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
	7	+if (!isset($globalOpenWeatherMapKey)) {
	8	+ $globalOpenWeatherMapKey = '';
	9	+}
8	10	// Compressed GeoJson is used if true
9		-if (!isset($globalJsonCompress)) $compress = true;
10		-else $compress = $globalJsonCompress;
	11	+if (!isset($globalJsonCompress)) {
	12	+ $compress = true;
	13	+} else {
	14	+ $compress = $globalJsonCompress;
	15	+}
11	16	if (isset($_GET['archive'])) {
12	17	$archive = true;
13	18	//$archiveupdatetime = 50;
		@@ -18,8 +23,11 @@ discard block
		block discarded – undo
18	23	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
19	24	//$lastupd = 20;
20	25	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21		- if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22		- else $enddate = time();
	26	+ if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
	27	+ $enddate = $_GET['enddate'];
	28	+ } else {
	29	+ $enddate = time();
	30	+ }
23	31	setcookie("archive_begin",$begindate);
24	32	setcookie("archive_end",$enddate);
25	33	setcookie("archive_update",$lastupd);
		@@ -106,7 +114,17 @@ discard block
		block discarded – undo
106	114	}
107	115
108	116	//create the map
109		- map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
	117	+ map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
	118	+ print $latitude;
	119	+} else {
	120	+ print $globalCenterLatitude;
	121	+}
	122	+?>,<?php if (isset($longitude)) {
	123	+ print $longitude;
	124	+} else {
	125	+ print $globalCenterLongitude;
	126	+}
	127	+?>], zoom);
110	128	<?php
111	129	} else {
112	130	?>
		@@ -119,9 +137,19 @@ discard block
		block discarded – undo
119	137	\|\| navigator.userAgent.match(/BlackBerry/i)
120	138	\|\| navigator.userAgent.match(/Windows Phone/i))
121	139	{
122		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
	140	+ var zoom = <?php if (isset($globalLiveZoom)) {
	141	+ print $globalLiveZoom-1;
	142	+} else {
	143	+ print '8';
	144	+}
	145	+?>;
123	146	} else {
124		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
	147	+ var zoom = <?php if (isset($globalLiveZoom)) {
	148	+ print $globalLiveZoom;
	149	+} else {
	150	+ print '9';
	151	+}
	152	+?>;
125	153	}
126	154
127	155	//create the map
		@@ -146,16 +174,27 @@ discard block
		block discarded – undo
146	174	bounds = L.latLngBounds(southWest,northEast);
147	175	//a few title layers
148	176	<?php
149		- if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
150		- else $MapType = $globalMapProvider;
	177	+ if (isset($_COOKIE['MapType'])) {
	178	+ $MapType = $_COOKIE['MapType'];
	179	+ } else {
	180	+ $MapType = $globalMapProvider;
	181	+ }
151	182
152	183	if ($MapType == 'Mapbox') {
153		- if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
154		- else $MapBoxId = $_COOKIE['MapTypeId'];
155		-?>
	184	+ if ($_COOKIE['MapTypeId'] == 'default') {
	185	+ $MapBoxId = $globalMapboxId;
	186	+ } else {
	187	+ $MapBoxId = $_COOKIE['MapTypeId'];
	188	+ }
	189	+ ?>
156	190	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
157	191	maxZoom: 18,
158		- noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
	192	+ noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
	193	+ print 'false';
	194	+} else {
	195	+ print 'true';
	196	+}
	197	+?>,
159	198	attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
160	199	'<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
161	200	'Imagery © <a href="http://mapbox.com">Mapbox</a>',
		@@ -167,7 +206,12 @@ discard block
		block discarded – undo
167	206	?>
168	207	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
169	208	maxZoom: 18,
170		- noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
	209	+ noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
	210	+ print 'false';
	211	+} else {
	212	+ print 'true';
	213	+}
	214	+?>,
171	215	attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
172	216	'<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
173	217	}).addTo(map);
		@@ -213,20 +257,26 @@ discard block
		block discarded – undo
213	257	map.addLayer(yandexLayer);
214	258	<?php
215	259	} elseif ($MapType == 'Bing-Aerial') {
216		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
217		-?>
	260	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	261	+ setcookie('MapType','OpenStreetMap');
	262	+ }
	263	+ ?>
218	264	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
219	265	map.addLayer(bingLayer);
220	266	<?php
221	267	} elseif ($MapType == 'Bing-Hybrid') {
222		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
223		-?>
	268	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	269	+ setcookie('MapType','OpenStreetMap');
	270	+ }
	271	+ ?>
224	272	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
225	273	map.addLayer(bingLayer);
226	274	<?php
227	275	} elseif ($MapType == 'Bing-Road') {
228		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
229		-?>
	276	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	277	+ setcookie('MapType','OpenStreetMap');
	278	+ }
	279	+ ?>
230	280	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
231	281	map.addLayer(bingLayer);
232	282	<?php
		@@ -249,9 +299,24 @@ discard block
		block discarded – undo
249	299	$customid = $MapType;
250	300	?>
251	301	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
252		- maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
253		- minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
254		- noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
	302	+ maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
	303	+ print $globalMapCustomLayer[$customid]['maxZoom'];
	304	+} else {
	305	+ print '18';
	306	+}
	307	+?>,
	308	+ minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
	309	+ print $globalMapCustomLayer[$customid]['minZoom'];
	310	+} else {
	311	+ print '0';
	312	+}
	313	+?>,
	314	+ noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
	315	+ print 'false';
	316	+} else {
	317	+ print 'true';
	318	+}
	319	+?>,
255	320	attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
256	321	}).addTo(map);
257	322
		@@ -285,7 +350,12 @@ discard block
		block discarded – undo
285	350	}
286	351	} elseif ($globalBounding == 'circle') {
287	352	?>
288		- var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
	353	+ var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
	354	+ print $globalBoundingCircleSize;
	355	+} else {
	356	+ print '70000';
	357	+}
	358	+?>,{
289	359	color: '#92C7D1',
290	360	fillColor: '#92C7D1',
291	361	fillOpacity: 0.3,

Ysurac / FlightAirMap

Push — master ( c7e8c6...d82745 )

Status

Category

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Braces +95 added lines, -25 removed lines patch added patch discarded remove patch