Ysurac / FlightAirMap

tsk-geojson.php

Indentation +11 added lines, -11 removed lines

@@ -23,8 +23,8 @@ 
 		$id = $spotter_item['Waypoint']['@attributes']['id'];
 		if ($id == 0 || !is_numeric($id)) $id = $j;
 		$output .= '{"type": "Feature",';
-		    $output .= '"id": '.$id.',';
-		    $output .= '"properties": {';
+			$output .= '"id": '.$id.',';
+			$output .= '"properties": {';
 			$output .= '"type": "'.$spotter_item['@attributes']['type'].'",';
 			//$output .= '"id": "'.$spotter_item['Waypoint']['@attributes']['id'].'",';
 			$output .= '"name": "'.$spotter_item['Waypoint']['@attributes']['name'].'",';
@@ -35,31 +35,31 @@ 
 			} elseif ($spotter_item['@attributes']['type'] == 'Finish') {
 				$output .= '"icon": "/images/tsk/tsk-finish.png"';
 			} else $output .= '"icon": "/images/tsk/number_'.$id.'.png"';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
+				$output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 		$j++;
 	}
 	// Lines
 	$output .= '{"type": "Feature",';
-	    $output .= '"properties": {';
+		$output .= '"properties": {';
 		$output .= '"type": "'.$spotter_array['@attributes']['type'].'"';
-	    $output .= '},';
-	    $output .= '"geometry": {';
+		$output .= '},';
+		$output .= '"geometry": {';
 		$output .= '"type": "LineString",';
 		$output .= '"coordinates": [';
 	foreach($spotter_array['Point'] as $spotter_item)
 	{
-			    $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
+				$output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
 	}
 	$output  = substr($output, 0, -1);
 		$output .= ']';
-	    $output .= '}';
+		$output .= '}';
 	$output .= '},';
 	$output  = substr($output, 0, -1);
 }

js/map.2d.js.php

Indentation +7 added lines, -7 removed lines

@@ -343,7 +343,7 @@ 
 	};
 
 <?php
-    if (isset($_GET['tsk'])) {
+	if (isset($_GET['tsk'])) {
 ?>
 	function tskPopup (feature, layer) {
 		var output = '';
@@ -378,7 +378,7 @@ 
 	};
 	update_tsk();
 <?php
-    }
+	}
 ?>
 	map.on('moveend', function() {
 		//if (map.getZoom() > 7) {
@@ -394,10 +394,10 @@ 
 setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
 
 <?php
-    // Add support for custom json via $globalMapJson
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
+	// Add support for custom json via $globalMapJson
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
 	foreach ($globalMapJson as $json) {
-	    if (isset($json['url'])) {
+		if (isset($json['url'])) {
 ?>
 update_genLayer('<?php print $json['url']; ?>');
 <?php
@@ -406,9 +406,9 @@ 
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
 <?php
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 //adds the bootstrap tooltip to the map icons