Ysurac / FlightAirMap

require/libs/geoPHP/tests/tests/20120702Test.php

Spacing +58 added lines, -58 removed lines

@@ -40,7 +40,7 @@ 
       array('name' => 'setSRID', 'argument' => '4326'),
     );
 
-    foreach($methods as $method) {
+    foreach ($methods as $method) {
       $argument = NULL;
       $method_name = $method['name'];
       if (isset($method['argument'])) {
@@ -61,32 +61,32 @@ 
       case 'y':
       case 'x':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'geometryN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'startPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method startPoint() to MultiLineString.
@@ -95,10 +95,10 @@ 
         break;
       case 'endPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method endPoint() to MultiLineString.
@@ -107,32 +107,32 @@ 
         break;
       case 'isRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'isClosed':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'pointN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method pointN() to MultiLineString.
@@ -141,35 +141,35 @@ 
         break;
       case 'exteriorRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numInteriorRings':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'interiorRingN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'setSRID':
@@ -177,112 +177,112 @@ 
         break;
       case 'SRID':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'getBBox':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'centroid':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'length':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
+          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on '.$method_name);
         }
         break;
       case 'numGeometries':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numPoints':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'dimension':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'boundary':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'greatCircleLength':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
+          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on '.$method_name);
         }
         break;
       case 'haversineLength':
       case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
     }
   }
 }

require/libs/geoPHP/tests/tests/geosTest.php

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 
   function testGeos() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -45,7 +45,7 @@ 
           array('name' => 'hausdorffDistance', 'argument' => $geometry),
         );
 
-        foreach($geosMethods as $method) {
+        foreach ($geosMethods as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -57,24 +57,24 @@ 
             case 'equals':
             case 'geos':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             default:
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
           }
         }

require/libs/geoPHP/tests/tests/aliasesTest.php

Spacing +19 added lines, -19 removed lines

@@ -10,7 +10,7 @@ 
 
   function testAliases() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -28,7 +28,7 @@ 
           array('name' => 'asBinary'),
         );
 
-        foreach($aliases as $alias) {
+        foreach ($aliases as $alias) {
           $argument = NULL;
           $alias_name = $alias['name'];
           if (isset($alias['argument'])) {
@@ -38,67 +38,67 @@ 
           switch ($alias_name) {
             case 'getSRID':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getGeos':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getX':
             case 'getY':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getArea':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getCentroid':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'asText':
             case 'asBinary':
             case 'getGeomType':
-              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               break;
             default:
-              $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+              $this->assertTrue($geometry->$alias_name($argument), 'Failed on '.$alias_name);
           }
         }
 

require/libs/geoPHP/tests/tests/adaptersTest.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
   function testAdapters() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $input = file_get_contents('./input/'.$file);
@@ -20,7 +20,7 @@ 
         foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
           if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
             $output = $geometry->out($adapter_key);
-            $this->assertNotNull($output, "Empty output on "  . $adapter_key);
+            $this->assertNotNull($output, "Empty output on ".$adapter_key);
             if ($output) {
               $adapter_loader = new $adapter_class();
               $test_geom_1 = $adapter_loader->read($output);

require/libs/geoPHP/tests/tests/placeholdersTest.php

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 
   function testPlaceholders() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -26,7 +26,7 @@ 
           array('name' => 'm'),
         );
 
-        foreach($placeholders as $method) {
+        foreach ($placeholders as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -37,13 +37,13 @@ 
             case 'm':
             case 'z':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             case 'coordinateDimension':
@@ -52,17 +52,17 @@ 
             case 'is3D':
             case 'hasZ':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             default:
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+              $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
           }
         }
 

require/libs/geoPHP/tests/test.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
   }
 
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $format = $parts[1];
       $value = file_get_contents('./input/'.$file);
@@ -88,7 +88,7 @@ 
   $geometry->difference($geometry);
   $geometry->symDifference($geometry);
   $geometry->union($geometry);
-  $geometry->simplify(0);// @@TODO: Adjust this once we can deal with empty geometries
+  $geometry->simplify(0); // @@TODO: Adjust this once we can deal with empty geometries
   $geometry->disjoint($geometry);
   $geometry->touches($geometry);
   $geometry->intersects($geometry);
@@ -127,7 +127,7 @@ 
         }
       }
       else {
-        print "Empty output on "  . $adapter_key . "\n";
+        print "Empty output on ".$adapter_key."\n";
       }
     }
   }
@@ -171,7 +171,7 @@ 
 
   $methods = array(
     //'boundary', //@@TODO: Uncomment this and fix errors
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+    'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
     'getBBox',
     'x',
     'y',
@@ -204,7 +204,7 @@ 
 
     // Now check base on type
     if ($geos_type == 'object') {
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
 
       // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
       // Using Pythagorean theorem
@@ -212,7 +212,7 @@ 
       $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
       // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-      if ($haus_dist / $scale > 0.5) {
+      if ($haus_dist/$scale > 0.5) {
         print 'Output mismatch on '.$method.":\n";
         print 'GEOS : '.$geos_result->out('wkt')."\n";
         print 'NORM : '.$norm_result->out('wkt')."\n";
@@ -237,7 +237,7 @@ 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
+    if ($detected) print 'detected as '.$detected."\n";
     else print "not detected\n";
   }
   // Make sure it loads using auto-detect

require/libs/geoPHP/tests/postgis.php

Spacing +7 added lines, -7 removed lines

@@ -9,12 +9,12 @@ 
   include_once('../geoPHP.inc');
   
   // Your database test table should contain 3 columns: name (text), type (text), geom (geometry)
-  $host =     'localhost';
+  $host = 'localhost';
   $database = 'phayes';
-  $table =    'test';
-  $column =   'geom';
-  $user =     'phayes';
-  $pass =     'supersecret';
+  $table = 'test';
+  $column = 'geom';
+  $user = 'phayes';
+  $pass = 'supersecret';
   
   $connection = pg_connect("host=$host dbname=$database user=$user password=$pass");
   
@@ -25,7 +25,7 @@ 
   // ----------------------------
   
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $name = $parts[0];
       $format = $parts[1];
@@ -58,7 +58,7 @@ 
   // SELECT and INSERT directly, with no wrapping functions
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
+    $wkb = pack('H*', $item['geom']); // Unpacking the hex blob
     $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
   
     // Let's re-insert directly into postGIS

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

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     $srid = $geometry->SRID();
     $wkt = '';
     if ($srid) {
-      $wkt = 'SRID=' . $srid . ';';
+      $wkt = 'SRID='.$srid.';';
       $wkt .= $geometry->out('wkt');
       return $wkt;
     }

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

Spacing +11 added lines, -11 removed lines

@@ -44,21 +44,21 @@ 
   public function geomFromText($text) {

     // Change to lower-case, strip all CDATA, and de-namespace

     $text = strtolower($text);

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

         

     // Load into DOMDOcument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid GeoRSS: ". $text);

+      throw new Exception("Invalid GeoRSS: ".$text);

     }

     

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From GeoRSS: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -82,9 +82,9 @@ 
   

   protected function getPointsFromCoords($string) {

     $coords = array();

-    $latlon = explode(' ',$string);

+    $latlon = explode(' ', $string);

     foreach ($latlon as $key => $item) {

-      if (!($key % 2)) {

+      if (!($key%2)) {

         // It's a latitude

         $lat = $item;

       }

@@ -139,7 +139,7 @@ 
     $polygons = array();

     $box_elements = $this->xmlobj->getElementsByTagName('box');

     foreach ($box_elements as $box) {

-      $parts = explode(' ',trim($box->firstChild->nodeValue));

+      $parts = explode(' ', trim($box->firstChild->nodeValue));

       $components = array(

         new Point($parts[3], $parts[2]),

         new Point($parts[3], $parts[0]),

@@ -159,7 +159,7 @@ 
     $points = array();

     $circle_elements = $this->xmlobj->getElementsByTagName('circle');

     foreach ($circle_elements as $circle) {

-      $parts = explode(' ',trim($circle->firstChild->nodeValue));

+      $parts = explode(' ', trim($circle->firstChild->nodeValue));

       $points[] = new Point($parts[1], $parts[0]);

     }

     return $points;

@@ -196,7 +196,7 @@ 
     $output = '<'.$this->nss.'line>';

     foreach ($geom->getComponents() as $k => $point) {

       $output .= $point->getY().' '.$point->getX();

-      if ($k < ($geom->numGeometries() -1)) $output .= ' ';

+      if ($k < ($geom->numGeometries() - 1)) $output .= ' ';

     }

     $output .= '</'.$this->nss.'line>';

     return $output;

@@ -207,7 +207,7 @@ 
     $exterior_ring = $geom->exteriorRing();

     foreach ($exterior_ring->getComponents() as $k => $point) {

       $output .= $point->getY().' '.$point->getX();

-      if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';

+      if ($k < ($exterior_ring->numGeometries() - 1)) $output .= ' ';

     }

     $output .= '</'.$this->nss.'polygon>';

     return $output;