Ysurac / FlightAirMap

require/libs/geoPHP/lib/adapters/WKB.class.php

Braces +4 added lines, -3 removed lines

@@ -94,7 +94,9 @@ 
     $line_length = unpack('L',fread($mem,4));

 

     // Return an empty linestring if there is no line-length

-    if (!$line_length[1]) return new LineString();

+    if (!$line_length[1]) {
+    	return new LineString();
+    }
 

     // Read the nubmer of points x2 (each point is two coords) into decimal-floats

     $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));

@@ -190,8 +192,7 @@ 
     if ($write_as_hex) {

       $unpacked = unpack('H*',$wkb);

       return $unpacked[1];

-    }

-    else {

+    } else {

       return $wkb;

     }

   }

require/libs/geoPHP/lib/adapters/KML.class.php

Braces +4 added lines, -3 removed lines

@@ -89,8 +89,7 @@ 
           }

         }

       }

-    }

-    else {

+    } else {

       // The document does not have a placemark, try to create a valid geometry from the root element

       $node_name = $this->xmlobj->documentElement->nodeName == 'multigeometry' ? 'geometrycollection' : $this->xmlobj->documentElement->nodeName;

       if (array_key_exists($node_name, $geom_types)) {

@@ -220,7 +219,9 @@ 
       $str .= '<'.$this->nss.'coordinates>';

       $i=0;

       foreach ($geom->getComponents() as $comp) {

-        if ($i != 0) $str .= ' ';

+        if ($i != 0) {
+        	$str .= ' ';
+        }
         $str .= $comp->getX() .','. $comp->getY();

         $i++;

       }

require/libs/geoPHP/lib/geometry/Polygon.class.php

Braces +27 added lines, -11 removed lines

@@ -9,7 +9,9 @@ 
   protected $geom_type = 'Polygon';
 
   public function area($exterior_only = FALSE, $signed = FALSE) {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     
     if ($this->geos() && $exterior_only == FALSE) {
       return $this->geos()->area();
@@ -19,15 +21,20 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $a = '0';
     foreach($pts as $k => $p){
       $j = ($k + 1) % $c;
       $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
     }
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+    if ($signed) {
+    	$area = ($a / 2);
+    } else {
+    	$area = abs(($a / 2));
+    }
     
     if ($exterior_only == TRUE) {
       return $area;
@@ -42,7 +49,9 @@ 
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
     
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -52,7 +61,9 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $cn = array('x' => '0', 'y' => '0');
     $a = $this->area(TRUE, TRUE);
     
@@ -98,12 +109,16 @@ 
   }
 
   public function exteriorRing() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+    	return new LineString();
+    }
     return $this->components[0];
   }
   
   public function numInteriorRings() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return $this->numGeometries()-1;
   }
   
@@ -112,7 +127,9 @@ 
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return 2;
   }
 
@@ -187,8 +204,7 @@ 
     // If the number of edges we passed through is even, then it's in the polygon.
     if ($intersections % 2 != 0) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }

require/libs/geoPHP/lib/geometry/Point.class.php

Braces +2 added lines, -1 removed lines

@@ -71,8 +71,9 @@
   public function z() {
     if ($this->dimention == 3) {
       return $this->coords[2];
+    } else {
+    	return NULL;
     }
-    else return NULL;
   }
 
   // A point's centroid is itself

require/libs/geoPHP/lib/geometry/Collection.class.php

Braces +18 added lines, -11 removed lines

@@ -24,8 +24,7 @@ 
     foreach ($components as $component) {
       if ($component instanceof Geometry) {
         $this->components[] = $component;
-      }
-      else {
+      } else {
         throw new Exception("Cannot create a collection with non-geometries");
       }
     }
@@ -41,7 +40,9 @@ 
   }
 
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
 
     if ($this->geos()) {
       $geos_centroid = $this->geos()->centroid();
@@ -59,7 +60,9 @@ 
   }
 
   public function getBBox() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
 
     if ($this->geos()) {
       $envelope = $this->geos()->envelope();
@@ -127,7 +130,9 @@ 
 
   // By default, the boundary of a collection is the boundary of it's components
   public function boundary() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+    	return new LineString();
+    }
 
     if ($this->geos()) {
       return $this->geos()->boundary();
@@ -149,8 +154,7 @@ 
     $n = intval($n);
     if (array_key_exists($n-1, $this->components)) {
       return $this->components[$n-1];
-    }
-    else {
+    } else {
       return NULL;
     }
   }
@@ -193,10 +197,11 @@ 
   public function isEmpty() {
     if (!count($this->components)) {
       return TRUE;
-    }
-    else {
+    } else {
       foreach ($this->components as $component) {
-        if (!$component->isEmpty()) return FALSE;
+        if (!$component->isEmpty()) {
+        	return FALSE;
+        }
       }
       return TRUE;
     }
@@ -263,7 +268,9 @@ 
 
     // A collection is simple if all it's components are simple
     foreach ($this->components as $component) {
-      if (!$component->isSimple()) return FALSE;
+      if (!$component->isSimple()) {
+      	return FALSE;
+      }
     }
 
     return TRUE;

require/libs/geoPHP/lib/geometry/LineString.class.php

Braces +3 added lines, -1 removed lines

@@ -54,7 +54,9 @@
   }
 
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return 1;
   }
 

require/libs/geoPHP/lib/geometry/Geometry.class.php

Braces +6 added lines, -7 removed lines

@@ -57,7 +57,9 @@ 
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+    if ($this->isEmpty()) {
+    	return new Polygon();
+    }
 
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->envelope());
@@ -148,8 +150,7 @@ 
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
       $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
+    } else {
       $this->geos = FALSE;
     }
     return $this->geos;
@@ -175,8 +176,7 @@ 
     if ($this->geos()) {
       if ($pattern) {
         return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
+      } else {
         return $this->geos()->relate($geometry->geos());
       }
     }
@@ -227,8 +227,7 @@ 
           $geom = $geom->union($item->geos());
         }
         return geoPHP::geosToGeometry($geom);
-      }
-      else {
+      } else {
         return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
       }
     }

require/libs/geoPHP/geoPHP.inc

Braces +42 added lines, -21 removed lines

@@ -52,7 +52,9 @@ 
     if (!$type) {

       // If the user is trying to load a Geometry from a Geometry... Just pass it back

       if (is_object($data)) {

-        if ($data instanceOf Geometry) return $data;

+        if ($data instanceOf Geometry) {
+        	return $data;
+        }
       }

       

       $detected = geoPHP::detectFormat($data);

@@ -120,7 +122,9 @@ 
 

   static function geosInstalled($force = NULL) {

     static $geos_installed = NULL;

-    if ($force !== NULL) $geos_installed = $force;

+    if ($force !== NULL) {
+    	$geos_installed = $force;
+    }
     if ($geos_installed !== NULL) {

       return $geos_installed;

     }

@@ -148,8 +152,12 @@ 
   static function geometryReduce($geometry) {

     // If it's an array of one, then just parse the one

     if (is_array($geometry)) {

-      if (empty($geometry)) return FALSE;

-      if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));

+      if (empty($geometry)) {
+      	return FALSE;
+      }
+      if (count($geometry) == 1) {
+      	return geoPHP::geometryReduce(array_shift($geometry));
+      }
     }

 

     // If the geometry cannot even theoretically be reduced more, then pass it back

@@ -168,8 +176,7 @@ 
         $components = $geometry->getComponents();

         if (count($components) == 1) {

           return $components[0];

-        }

-        else {

+        } else {

           return $geometry;

         }

       }

@@ -192,8 +199,7 @@ 
             $geometries[] = $component;

             $geom_types[] = $component->geometryType();

           }

-        }

-        else {

+        } else {

           $geometries[] = $item;

           $geom_types[] = $item->geometryType();

         }

@@ -209,13 +215,11 @@ 
     if (count($geom_types) == 1) {

       if (count($geometries) == 1) {

         return $geometries[0];

-      }

-      else {

+      } else {

         $class = 'Multi'.$geom_types[0];

         return new $class($geometries);

       }

-    }

-    else {

+    } else {

       return new GeometryCollection($geometries);

     }

   }

@@ -230,7 +234,9 @@ 
     $bytes = unpack("c*", fread($mem, 11));

 

     // If bytes is empty, then we were passed empty input

-    if (empty($bytes)) return FALSE;

+    if (empty($bytes)) {
+    	return FALSE;
+    }
 

     // First char is a tab, space or carriage-return. trim it and try again

     if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {

@@ -240,8 +246,11 @@ 
     // Detect WKB or EWKB -- first byte is 1 (little endian indicator)

     if ($bytes[1] == 1) {

       // If SRID byte is TRUE (1), it's EWKB

-      if ($bytes[5]) return 'ewkb';

-      else return 'wkb';

+      if ($bytes[5]) {
+      	return 'ewkb';
+      } else {
+      	return 'wkb';
+      }
     }

 

     // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)

@@ -274,12 +283,24 @@ 
     if ($bytes[1] == 60) {

       // grab the first 256 characters

       $string = substr($input, 0, 256);

-      if (strpos($string, '<kml') !== FALSE)        return 'kml';

-      if (strpos($string, '<coordinate') !== FALSE) return 'kml';

-      if (strpos($string, '<gpx') !== FALSE)        return 'gpx';

-      if (strpos($string, '<georss') !== FALSE)     return 'georss';

-      if (strpos($string, '<rss') !== FALSE)        return 'georss';

-      if (strpos($string, '<feed') !== FALSE)       return 'georss';

+      if (strpos($string, '<kml') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<coordinate') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<gpx') !== FALSE) {
+      	return 'gpx';
+      }
+      if (strpos($string, '<georss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<rss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<feed') !== FALSE) {
+      	return 'georss';
+      }
     }

 

     // We need an 8 byte string for geohash and unpacked WKB / WKT

require/class.SpotterServer.php

Braces +72 added lines, -25 removed lines

@@ -36,81 +36,128 @@
 		    $data['hex'] = trim($line['hex']);
 		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 		        $data['datetime'] = $line['datetime'];
-		    } else $data['datetime'] = date('Y-m-d H:i:s');
+		    } else {
+		    	$data['datetime'] = date('Y-m-d H:i:s');
+		    }
 		    if (!isset($line['aircraft_icao'])) {
 		        $Spotter = new Spotter();
 		        $aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
 		        $Spotter->db = null;
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+			    if ($line['aircraft_type'] == 'PARA_GLIDER') {
+			    	$aircraft_icao = 'GLID';
+			    } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+			    	$aircraft_icao = 'UHEL';
+			    } elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+			    	$aircraft_icao = 'TOWPLANE';
+			    } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+			    	$aircraft_icao = 'POWAIRC';
+			    }
 			}
 			$data['aircraft_icao'] = $aircraft_icao;
-		    } else $data['aircraft_icao'] = $line['aircraft_icao'];
+		    } else {
+		    	$data['aircraft_icao'] = $line['aircraft_icao'];
+		    }
 		    //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 		}
 		if (isset($line['registration']) && $line['registration'] != '') {
 		    $data['registration'] = $line['registration'];
-		} else $data['registration'] = null;
+		} else {
+			$data['registration'] = null;
+		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
 		    $data['waypoints'] = $line['waypoints'];
-		} else $data['waypoints'] = null;
+		} else {
+			$data['waypoints'] = null;
+		}
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
 		    $data['ident'] = trim($line['ident']);
-		} else $data['ident'] = null;
+		} else {
+			$data['ident'] = null;
+		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
 		    if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			$data['latitude'] = $line['latitude'];
-		    } else $data['latitude'] = null;
+		    } else {
+		    	$data['latitude'] = null;
+		    }
 		    if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-		        if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+		        if ($line['longitude'] > 180) {
+		        	$line['longitude'] = $line['longitude'] - 360;
+		        }
 			$data['longitude'] = $line['longitude'];
-		    } else $data['longitude'] = null;
+		    } else {
+		    	$data['longitude'] = null;
+		    }
 		} else {
 		    $data['latitude'] = null;
 		    $data['longitude'] = null;
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
 		    $data['verticalrate'] = $line['verticalrate'];
-		} else $data['verticalrate'] = null;
+		} else {
+			$data['verticalrate'] = null;
+		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
 		    $data['emergency'] = $line['emergency'];
-		} else $data['emergency'] = null;
+		} else {
+			$data['emergency'] = null;
+		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    $data['ground'] = $line['ground'];
-		} else $data['ground'] = null;
+		} else {
+			$data['ground'] = null;
+		}
 		if (isset($line['speed']) && $line['speed'] != '') {
 		    $data['speed'] = round($line['speed']);
-		} else $data['speed'] = null;
+		} else {
+			$data['speed'] = null;
+		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    $data['squawk'] = $line['squawk'];
-		} else $data['squawk'] = null;
+		} else {
+			$data['squawk'] = null;
+		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			$data['altitude'] = round($line['altitude']);
-  		} else $data['altitude'] = null;
+  		} else {
+  			$data['altitude'] = null;
+  		}
 		if (isset($line['heading']) && $line['heading'] != '') {
 		    $data['heading'] = round($line['heading']);
-  		} else $data['heading'] = null;
+  		} else {
+  			$data['heading'] = null;
+  		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
 		    $data['source_name'] = $line['source_name'];
-  		} else $data['source_name'] = null;
+  		} else {
+  			$data['source_name'] = null;
+  		}
 		if (isset($line['over_country']) && $line['over_country'] != '') {
 		    $data['over_country'] = $line['over_country'];
-  		} else $data['over_country'] = null;
+  		} else {
+  			$data['over_country'] = null;
+  		}
   		if (isset($line['noarchive']) && $line['noarchive']) {
   		    $data['noarchive'] = true;
-  		} else $data['noarchive'] = false;
+  		} else {
+  			$data['noarchive'] = false;
+  		}
   		$data['format_source'] = $line['format_source'];
-  		if (isset($line['id_source'])) $id_source = $line['id_source'];
+  		if (isset($line['id_source'])) {
+  			$id_source = $line['id_source'];
+  		}
   		if (isset($data['hex'])) {
   		    echo '.';
   		    $id_user = $globalServerUserID;
-  		    if ($id_user == NULL) $id_user = 1;
-  		    if (!isset($id_source)) $id_source = 1;
+  		    if ($id_user == NULL) {
+  		    	$id_user = 1;
+  		    }
+  		    if (!isset($id_source)) {
+  		    	$id_source = 1;
+  		    }
   		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
 		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
 		    try {