Ysurac / FlightAirMap

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

Indentation +268 added lines, -268 removed lines

@@ -9,281 +9,281 @@
   }
 
   function testMethods() {
-    $format = 'gpx';
-    $value = file_get_contents('./input/20120702.gpx');
-    $geometry = geoPHP::load($value, $format);
+	$format = 'gpx';
+	$value = file_get_contents('./input/20120702.gpx');
+	$geometry = geoPHP::load($value, $format);
 
-    $methods = array(
-      array('name' => 'area'),
-      array('name' => 'boundary'),
-      array('name' => 'getBBox'),
-      array('name' => 'centroid'),
-      array('name' => 'length'),
-      array('name' => 'greatCircleLength', 'argument' => 6378137),
-      array('name' => 'haversineLength'),
-      array('name' => 'y'),
-      array('name' => 'x'),
-      array('name' => 'numGeometries'),
-      array('name' => 'geometryN', 'argument' => '1'),
-      array('name' => 'startPoint'),
-      array('name' => 'endPoint'),
-      array('name' => 'isRing'),
-      array('name' => 'isClosed'),
-      array('name' => 'numPoints'),
-      array('name' => 'pointN', 'argument' => '1'),
-      array('name' => 'exteriorRing'),
-      array('name' => 'numInteriorRings'),
-      array('name' => 'interiorRingN', 'argument' => '1'),
-      array('name' => 'dimension'),
-      array('name' => 'geometryType'),
-      array('name' => 'SRID'),
-      array('name' => 'setSRID', 'argument' => '4326'),
-    );
+	$methods = array(
+	  array('name' => 'area'),
+	  array('name' => 'boundary'),
+	  array('name' => 'getBBox'),
+	  array('name' => 'centroid'),
+	  array('name' => 'length'),
+	  array('name' => 'greatCircleLength', 'argument' => 6378137),
+	  array('name' => 'haversineLength'),
+	  array('name' => 'y'),
+	  array('name' => 'x'),
+	  array('name' => 'numGeometries'),
+	  array('name' => 'geometryN', 'argument' => '1'),
+	  array('name' => 'startPoint'),
+	  array('name' => 'endPoint'),
+	  array('name' => 'isRing'),
+	  array('name' => 'isClosed'),
+	  array('name' => 'numPoints'),
+	  array('name' => 'pointN', 'argument' => '1'),
+	  array('name' => 'exteriorRing'),
+	  array('name' => 'numInteriorRings'),
+	  array('name' => 'interiorRingN', 'argument' => '1'),
+	  array('name' => 'dimension'),
+	  array('name' => 'geometryType'),
+	  array('name' => 'SRID'),
+	  array('name' => 'setSRID', 'argument' => '4326'),
+	);
 
-    foreach($methods as $method) {
-      $argument = NULL;
-      $method_name = $method['name'];
-      if (isset($method['argument'])) {
-        $argument = $method['argument'];
-      }
-      $this->_methods_tester($geometry, $method_name, $argument);
-    }
+	foreach($methods as $method) {
+	  $argument = NULL;
+	  $method_name = $method['name'];
+	  if (isset($method['argument'])) {
+		$argument = $method['argument'];
+	  }
+	  $this->_methods_tester($geometry, $method_name, $argument);
+	}
   }
 
   function _methods_tester($geometry, $method_name, $argument) {
 
-    if (!method_exists($geometry, $method_name)) {
-      $this->fail("Method ".$method_name.'() doesn\'t exists.');
-      return;
-    }
+	if (!method_exists($geometry, $method_name)) {
+	  $this->fail("Method ".$method_name.'() doesn\'t exists.');
+	  return;
+	}
 
-    switch ($method_name) {
-      case 'y':
-      case 'x':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method startPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'endPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method endPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method pointN() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'exteriorRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'setSRID':
-        //TODO: The method setSRID() should return TRUE.
-        break;
-      case 'SRID':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $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);
-        }
-        break;
-      case 'numGeometries':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $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);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $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);
-        }
-        break;
-      case 'haversineLength':
-      case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-    }
+	switch ($method_name) {
+	  case 'y':
+	  case 'x':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method startPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'endPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method endPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method pointN() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'exteriorRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'setSRID':
+		//TODO: The method setSRID() should return TRUE.
+		break;
+	  case 'SRID':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $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);
+		}
+		break;
+	  case 'numGeometries':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $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);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $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);
+		}
+		break;
+	  case 'haversineLength':
+	  case 'area':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  case 'geometryType':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  default:
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+	}
   }
 }
 

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

Indentation +68 added lines, -68 removed lines

@@ -9,78 +9,78 @@
   }
 
   function testGeos() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $geosMethods = array(
-          array('name' => 'geos'),
-          array('name' => 'setGeos', 'argument' => $geometry->geos()),
-          array('name' => 'PointOnSurface'),
-          array('name' => 'equals', 'argument' => $geometry),
-          array('name' => 'equalsExact', 'argument' => $geometry),
-          array('name' => 'relate', 'argument' => $geometry),
-          array('name' => 'checkValidity'),
-          array('name' => 'isSimple'),
-          array('name' => 'buffer', 'argument' => '10'),
-          array('name' => 'intersection', 'argument' => $geometry),
-          array('name' => 'convexHull'),
-          array('name' => 'difference', 'argument' => $geometry),
-          array('name' => 'symDifference', 'argument' => $geometry),
-          array('name' => 'union', 'argument' => $geometry),
-          array('name' => 'simplify', 'argument' => '0'),
-          array('name' => 'disjoint', 'argument' => $geometry),
-          array('name' => 'touches', 'argument' => $geometry),
-          array('name' => 'intersects', 'argument' => $geometry),
-          array('name' => 'crosses', 'argument' => $geometry),
-          array('name' => 'within', 'argument' => $geometry),
-          array('name' => 'contains', 'argument' => $geometry),
-          array('name' => 'overlaps', 'argument' => $geometry),
-          array('name' => 'covers', 'argument' => $geometry),
-          array('name' => 'coveredBy', 'argument' => $geometry),
-          array('name' => 'distance', 'argument' => $geometry),
-          array('name' => 'hausdorffDistance', 'argument' => $geometry),
-        );
+		$geosMethods = array(
+		  array('name' => 'geos'),
+		  array('name' => 'setGeos', 'argument' => $geometry->geos()),
+		  array('name' => 'PointOnSurface'),
+		  array('name' => 'equals', 'argument' => $geometry),
+		  array('name' => 'equalsExact', 'argument' => $geometry),
+		  array('name' => 'relate', 'argument' => $geometry),
+		  array('name' => 'checkValidity'),
+		  array('name' => 'isSimple'),
+		  array('name' => 'buffer', 'argument' => '10'),
+		  array('name' => 'intersection', 'argument' => $geometry),
+		  array('name' => 'convexHull'),
+		  array('name' => 'difference', 'argument' => $geometry),
+		  array('name' => 'symDifference', 'argument' => $geometry),
+		  array('name' => 'union', 'argument' => $geometry),
+		  array('name' => 'simplify', 'argument' => '0'),
+		  array('name' => 'disjoint', 'argument' => $geometry),
+		  array('name' => 'touches', 'argument' => $geometry),
+		  array('name' => 'intersects', 'argument' => $geometry),
+		  array('name' => 'crosses', 'argument' => $geometry),
+		  array('name' => 'within', 'argument' => $geometry),
+		  array('name' => 'contains', 'argument' => $geometry),
+		  array('name' => 'overlaps', 'argument' => $geometry),
+		  array('name' => 'covers', 'argument' => $geometry),
+		  array('name' => 'coveredBy', 'argument' => $geometry),
+		  array('name' => 'distance', 'argument' => $geometry),
+		  array('name' => 'hausdorffDistance', 'argument' => $geometry),
+		);
 
-        foreach($geosMethods as $method) {
-          $argument = NULL;
-          $method_name = $method['name'];
-          if (isset($method['argument'])) {
-            $argument = $method['argument'];
-          }
+		foreach($geosMethods as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          switch ($method_name) {
-            case 'isSimple':
-            case 'equals':
-            case 'geos':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $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);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-          }
-        }
+		  switch ($method_name) {
+			case 'isSimple':
+			case 'equals':
+			case 'geos':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$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);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+		  }
+		}
 
-      }
-    }
+	  }
+	}
   }
 
 }

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

Indentation +91 added lines, -91 removed lines

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

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

Indentation +42 added lines, -42 removed lines

@@ -9,56 +9,56 @@
   }
 
   function testAdapters() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $input = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($input, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$input = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($input, $format);
 
-        // Test adapter output and input. Do a round-trip and re-test
-        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);
-            if ($output) {
-              $adapter_loader = new $adapter_class();
-              $test_geom_1 = $adapter_loader->read($output);
-              $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
-            }
-          }
-        }
+		// Test adapter output and input. Do a round-trip and re-test
+		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);
+			if ($output) {
+			  $adapter_loader = new $adapter_class();
+			  $test_geom_1 = $adapter_loader->read($output);
+			  $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
+			}
+		  }
+		}
 
-        // Test to make sure adapter work the same wether GEOS is ON or OFF
-        // Cannot test methods if GEOS is not intstalled
-        if (!geoPHP::geosInstalled()) return;
+		// Test to make sure adapter work the same wether GEOS is ON or OFF
+		// Cannot test methods if GEOS is not intstalled
+		if (!geoPHP::geosInstalled()) return;
 
-        foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
-          if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
-            // Turn GEOS on
-            geoPHP::geosInstalled(TRUE);
+		foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
+		  if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+			// Turn GEOS on
+			geoPHP::geosInstalled(TRUE);
 
-            $output = $geometry->out($adapter_key);
-            if ($output) {
-              $adapter_loader = new $adapter_class();
+			$output = $geometry->out($adapter_key);
+			if ($output) {
+			  $adapter_loader = new $adapter_class();
 
-              $test_geom_1 = $adapter_loader->read($output);
+			  $test_geom_1 = $adapter_loader->read($output);
 
-              // Turn GEOS off
-              geoPHP::geosInstalled(FALSE);
+			  // Turn GEOS off
+			  geoPHP::geosInstalled(FALSE);
 
-              $test_geom_2 = $adapter_loader->read($output);
+			  $test_geom_2 = $adapter_loader->read($output);
 
-              // Turn GEOS back On
-              geoPHP::geosInstalled(TRUE);
+			  // Turn GEOS back On
+			  geoPHP::geosInstalled(TRUE);
 
-              // Check to make sure a both are the same with geos and without
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
-            }
-          }
-        }
-      }
-    }
+			  // Check to make sure a both are the same with geos and without
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
+			}
+		  }
+		}
+	  }
+	}
   }
 }

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

Indentation +55 added lines, -55 removed lines

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

require/libs/geoPHP/tests/test.php

Indentation +106 added lines, -106 removed lines

@@ -11,24 +11,24 @@ 
   include_once('../geoPHP.inc');
 
   if (geoPHP::geosInstalled()) {
-    print "GEOS is installed.\n";
+	print "GEOS is installed.\n";
   }
   else {
-    print "GEOS is not installed.\n";
+	print "GEOS is not installed.\n";
   }
 
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
-    if ($parts[0]) {
-      $format = $parts[1];
-      $value = file_get_contents('./input/'.$file);
-      print '---- Testing '.$file."\n";
-      $geometry = geoPHP::load($value, $format);
-      test_adapters($geometry, $format, $value);
-      test_methods($geometry);
-      test_geometry($geometry);
-      test_detection($value, $format, $file);
-    }
+	$parts = explode('.',$file);
+	if ($parts[0]) {
+	  $format = $parts[1];
+	  $value = file_get_contents('./input/'.$file);
+	  print '---- Testing '.$file."\n";
+	  $geometry = geoPHP::load($value, $format);
+	  test_adapters($geometry, $format, $value);
+	  test_methods($geometry);
+	  test_geometry($geometry);
+	  test_detection($value, $format, $file);
+	}
   }
   print "Testing Done!";
 }
@@ -115,21 +115,21 @@ 
 function test_adapters($geometry, $format, $input) {
   // Test adapter output and input. Do a round-trip and re-test
   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);
-      if ($output) {
-        $adapter_loader = new $adapter_class();
-        $test_geom_1 = $adapter_loader->read($output);
-        $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
-
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
-          print "Mismatched adapter output in ".$adapter_class."\n";
-        }
-      }
-      else {
-        print "Empty output on "  . $adapter_key . "\n";
-      }
-    }
+	if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+	  $output = $geometry->out($adapter_key);
+	  if ($output) {
+		$adapter_loader = new $adapter_class();
+		$test_geom_1 = $adapter_loader->read($output);
+		$test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
+
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
+		  print "Mismatched adapter output in ".$adapter_class."\n";
+		}
+	  }
+	  else {
+		print "Empty output on "  . $adapter_key . "\n";
+	  }
+	}
   }
 
   // Test to make sure adapter work the same wether GEOS is ON or OFF
@@ -137,30 +137,30 @@ 
   if (!geoPHP::geosInstalled()) return;
 
   foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
-    if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
-      // Turn GEOS on
-      geoPHP::geosInstalled(TRUE);
+	if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+	  // Turn GEOS on
+	  geoPHP::geosInstalled(TRUE);
 
-      $output = $geometry->out($adapter_key);
-      if ($output) {
-        $adapter_loader = new $adapter_class();
+	  $output = $geometry->out($adapter_key);
+	  if ($output) {
+		$adapter_loader = new $adapter_class();
 
-        $test_geom_1 = $adapter_loader->read($output);
+		$test_geom_1 = $adapter_loader->read($output);
 
-        // Turn GEOS off
-        geoPHP::geosInstalled(FALSE);
+		// Turn GEOS off
+		geoPHP::geosInstalled(FALSE);
 
-        $test_geom_2 = $adapter_loader->read($output);
+		$test_geom_2 = $adapter_loader->read($output);
 
-        // Turn GEOS back On
-        geoPHP::geosInstalled(TRUE);
+		// Turn GEOS back On
+		geoPHP::geosInstalled(TRUE);
 
-        // Check to make sure a both are the same with geos and without
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
-          print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
-        }
-      }
-    }
+		// Check to make sure a both are the same with geos and without
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
+		  print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
+		}
+	  }
+	}
   }
 }
 
@@ -170,75 +170,75 @@ 
   if (!geoPHP::geosInstalled()) return;
 
   $methods = array(
-    //'boundary', //@@TODO: Uncomment this and fix errors
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
-    'getBBox',
-    'x',
-    'y',
-    'startPoint',
-    'endPoint',
-    'isRing',
-    'isClosed',
-    'numPoints',
+	//'boundary', //@@TODO: Uncomment this and fix errors
+	'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+	'getBBox',
+	'x',
+	'y',
+	'startPoint',
+	'endPoint',
+	'isRing',
+	'isClosed',
+	'numPoints',
   );
 
   foreach ($methods as $method) {
-    // Turn GEOS on
-    geoPHP::geosInstalled(TRUE);
-    $geos_result = $geometry->$method();
-
-    // Turn GEOS off
-    geoPHP::geosInstalled(FALSE);
-    $norm_result = $geometry->$method();
-
-    // Turn GEOS back On
-    geoPHP::geosInstalled(TRUE);
-
-    $geos_type = gettype($geos_result);
-    $norm_type = gettype($norm_result);
-
-    if ($geos_type != $norm_type) {
-      print 'Type mismatch on '.$method."\n";
-      continue;
-    }
-
-    // Now check base on type
-    if ($geos_type == 'object') {
-      $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
-      $bb = $geos_result->getBBox();
-      $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) {
-        print 'Output mismatch on '.$method.":\n";
-        print 'GEOS : '.$geos_result->out('wkt')."\n";
-        print 'NORM : '.$norm_result->out('wkt')."\n";
-        continue;
-      }
-    }
-
-    if ($geos_type == 'boolean' || $geos_type == 'string') {
-      if ($geos_result !== $norm_result) {
-        print 'Output mismatch on '.$method.":\n";
-        print 'GEOS : '.(string) $geos_result."\n";
-        print 'NORM : '.(string) $norm_result."\n";
-        continue;
-      }
-    }
-
-    //@@TODO: Run tests for output of types arrays and float
-    //@@TODO: centroid function is non-compliant for collections and strings
+	// Turn GEOS on
+	geoPHP::geosInstalled(TRUE);
+	$geos_result = $geometry->$method();
+
+	// Turn GEOS off
+	geoPHP::geosInstalled(FALSE);
+	$norm_result = $geometry->$method();
+
+	// Turn GEOS back On
+	geoPHP::geosInstalled(TRUE);
+
+	$geos_type = gettype($geos_result);
+	$norm_type = gettype($norm_result);
+
+	if ($geos_type != $norm_type) {
+	  print 'Type mismatch on '.$method."\n";
+	  continue;
+	}
+
+	// Now check base on type
+	if ($geos_type == 'object') {
+	  $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
+	  $bb = $geos_result->getBBox();
+	  $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) {
+		print 'Output mismatch on '.$method.":\n";
+		print 'GEOS : '.$geos_result->out('wkt')."\n";
+		print 'NORM : '.$norm_result->out('wkt')."\n";
+		continue;
+	  }
+	}
+
+	if ($geos_type == 'boolean' || $geos_type == 'string') {
+	  if ($geos_result !== $norm_result) {
+		print 'Output mismatch on '.$method.":\n";
+		print 'GEOS : '.(string) $geos_result."\n";
+		print 'NORM : '.(string) $norm_result."\n";
+		continue;
+	  }
+	}
+
+	//@@TODO: Run tests for output of types arrays and float
+	//@@TODO: centroid function is non-compliant for collections and strings
   }
 }
 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
-    else print "not detected\n";
+	if ($detected) print 'detected as ' . $detected . "\n";
+	else print "not detected\n";
   }
   // Make sure it loads using auto-detect
   geoPHP::load($value);

require/libs/geoPHP/tests/postgis.php

Indentation +26 added lines, -26 removed lines

@@ -25,18 +25,18 @@ 
   // ----------------------------
   
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
-    if ($parts[0]) {
-      $name = $parts[0];
-      $format = $parts[1];
-      $value = file_get_contents('./input/'.$file);
-      print '---- Testing '.$file."\n";
-      flush();
-      $geometry = geoPHP::load($value, $format);
-      test_postgis($name, $format, $geometry, $connection, 'wkb');
-      $geometry->setSRID(4326);
-      test_postgis($name, $format, $geometry, $connection, 'ewkb');
-    }
+	$parts = explode('.',$file);
+	if ($parts[0]) {
+	  $name = $parts[0];
+	  $format = $parts[1];
+	  $value = file_get_contents('./input/'.$file);
+	  print '---- Testing '.$file."\n";
+	  flush();
+	  $geometry = geoPHP::load($value, $format);
+	  test_postgis($name, $format, $geometry, $connection, 'wkb');
+	  $geometry->setSRID(4326);
+	  test_postgis($name, $format, $geometry, $connection, 'ewkb');
+	}
   }
   print "Testing Done!";
 }
@@ -51,32 +51,32 @@ 
   // SELECT using asBinary PostGIS
   $result = pg_fetch_all(pg_query($connection, "SELECT asBinary(geom) as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
-    $geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
+	$wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
+	$geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
   }
   
   // 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
-    $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
+	$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
-    // We need to unpack the WKB
-    $unpacked = unpack('H*', $geom->out($format));
-    $insert_string = $unpacked[1];
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
+	// Let's re-insert directly into postGIS
+	// We need to unpack the WKB
+	$unpacked = unpack('H*', $geom->out($format));
+	$insert_string = $unpacked[1];
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
   }
 
   // SELECT and INSERT using as EWKT (ST_GeomFromEWKT and ST_AsEWKT)
   $result = pg_fetch_all(pg_query($connection, "SELECT ST_AsEWKT(geom) as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkt = $item['geom']; // Make sure to unescape the hex blob
-    $geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
+	$wkt = $item['geom']; // Make sure to unescape the hex blob
+	$geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
 
-    // Let's re-insert directly into postGIS
-    $insert_string = $geom->out('ewkt');
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
+	// Let's re-insert directly into postGIS
+	$insert_string = $geom->out('ewkt');
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
   }
 }
 

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

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
    * @return string The Extended-WKT string representation of the input geometries
    */
   public function write(Geometry $geometry) {
-    $srid = $geometry->SRID();
-    $wkt = '';
-    if ($srid) {
-      $wkt = 'SRID=' . $srid . ';';
-      $wkt .= $geometry->out('wkt');
-      return $wkt;
-    }
-    else {
-      return $geometry->out('wkt');
-    }
+	$srid = $geometry->SRID();
+	$wkt = '';
+	if ($srid) {
+	  $wkt = 'SRID=' . $srid . ';';
+	  $wkt .= $geometry->out('wkt');
+	  return $wkt;
+	}
+	else {
+	  return $geometry->out('wkt');
+	}
   }
 }

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

Indentation +140 added lines, -140 removed lines

@@ -23,7 +23,7 @@ 
    * @return Geometry|GeometryCollection

    */

   public function read($gpx) {

-    return $this->geomFromText($gpx);

+	return $this->geomFromText($gpx);

   }

 

   /**

@@ -34,195 +34,195 @@ 
    * @return string The georss string representation of the input geometries

    */

   public function write(Geometry $geometry, $namespace = FALSE) {

-    if ($namespace) {

-      $this->namespace = $namespace;

-      $this->nss = $namespace.':';    

-    }

-    return $this->geometryToGeoRSS($geometry);

+	if ($namespace) {

+	  $this->namespace = $namespace;

+	  $this->nss = $namespace.':';    

+	}

+	return $this->geometryToGeoRSS($geometry);

   }

   

   public function geomFromText($text) {

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

-    $text = strtolower($text);

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

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

+	$text = strtolower($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);

-    }

+	// Load into DOMDOcument

+	$xmlobj = new DOMDocument();

+	@$xmlobj->loadXML($text);

+	if ($xmlobj === false) {

+	  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) {

-        throw $e;

-    }

+	$this->xmlobj = $xmlobj;

+	try {

+	  $geom = $this->geomFromXML();

+	} catch(InvalidText $e) {

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

+	} catch(Exception $e) {

+		throw $e;

+	}

 

-    return $geom;

+	return $geom;

   }

   

   protected function geomFromXML() {

-    $geometries = array();

-    $geometries = array_merge($geometries, $this->parsePoints());

-    $geometries = array_merge($geometries, $this->parseLines());

-    $geometries = array_merge($geometries, $this->parsePolygons());

-    $geometries = array_merge($geometries, $this->parseBoxes());

-    $geometries = array_merge($geometries, $this->parseCircles());

+	$geometries = array();

+	$geometries = array_merge($geometries, $this->parsePoints());

+	$geometries = array_merge($geometries, $this->parseLines());

+	$geometries = array_merge($geometries, $this->parsePolygons());

+	$geometries = array_merge($geometries, $this->parseBoxes());

+	$geometries = array_merge($geometries, $this->parseCircles());

     

-    if (empty($geometries)) {

-      throw new Exception("Invalid / Empty GeoRSS");

-    }

+	if (empty($geometries)) {

+	  throw new Exception("Invalid / Empty GeoRSS");

+	}

     

-    return geoPHP::geometryReduce($geometries); 

+	return geoPHP::geometryReduce($geometries); 

   }

   

   protected function getPointsFromCoords($string) {

-    $coords = array();

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

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

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

-        // It's a latitude

-        $lat = $item;

-      }

-      else {

-        // It's a longitude

-        $lon = $item;

-        $coords[] = new Point($lon, $lat);

-      }

-    }

-    return $coords;

+	$coords = array();

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

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

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

+		// It's a latitude

+		$lat = $item;

+	  }

+	  else {

+		// It's a longitude

+		$lon = $item;

+		$coords[] = new Point($lon, $lat);

+	  }

+	}

+	return $coords;

   }

   

   protected function parsePoints() {

-    $points = array();

-    $pt_elements = $this->xmlobj->getElementsByTagName('point');

-    foreach ($pt_elements as $pt) {

-      $point_array = $this->getPointsFromCoords(trim($pt->firstChild->nodeValue));

-      $points[] = $point_array[0];

-    }

-    return $points;

+	$points = array();

+	$pt_elements = $this->xmlobj->getElementsByTagName('point');

+	foreach ($pt_elements as $pt) {

+	  $point_array = $this->getPointsFromCoords(trim($pt->firstChild->nodeValue));

+	  $points[] = $point_array[0];

+	}

+	return $points;

   }

   

   protected function parseLines() {

-    $lines = array();

-    $line_elements = $this->xmlobj->getElementsByTagName('line');

-    foreach ($line_elements as $line) {

-      $components = $this->getPointsFromCoords(trim($line->firstChild->nodeValue));

-      $lines[] = new LineString($components);

-    }

-    return $lines;

+	$lines = array();

+	$line_elements = $this->xmlobj->getElementsByTagName('line');

+	foreach ($line_elements as $line) {

+	  $components = $this->getPointsFromCoords(trim($line->firstChild->nodeValue));

+	  $lines[] = new LineString($components);

+	}

+	return $lines;

   }

   

   protected function parsePolygons() {

-    $polygons = array();

-    $poly_elements = $this->xmlobj->getElementsByTagName('polygon');

-    foreach ($poly_elements as $poly) {

-      if ($poly->hasChildNodes()) {

-        $points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));

-        $exterior_ring = new LineString($points);

-        $polygons[] = new Polygon(array($exterior_ring));

-      }

-      else {

-        // It's an EMPTY polygon

-        $polygons[] = new Polygon(); 

-      }

-    }

-    return $polygons;

+	$polygons = array();

+	$poly_elements = $this->xmlobj->getElementsByTagName('polygon');

+	foreach ($poly_elements as $poly) {

+	  if ($poly->hasChildNodes()) {

+		$points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));

+		$exterior_ring = new LineString($points);

+		$polygons[] = new Polygon(array($exterior_ring));

+	  }

+	  else {

+		// It's an EMPTY polygon

+		$polygons[] = new Polygon(); 

+	  }

+	}

+	return $polygons;

   }

   

   // Boxes are rendered into polygons

   protected function parseBoxes() {

-    $polygons = array();

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

-    foreach ($box_elements as $box) {

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

-      $components = array(

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

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

-        new Point($parts[1], $parts[0]),

-        new Point($parts[1], $parts[2]),

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

-      );

-      $exterior_ring = new LineString($components);

-      $polygons[] = new Polygon(array($exterior_ring));

-    }

-    return $polygons;

+	$polygons = array();

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

+	foreach ($box_elements as $box) {

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

+	  $components = array(

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

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

+		new Point($parts[1], $parts[0]),

+		new Point($parts[1], $parts[2]),

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

+	  );

+	  $exterior_ring = new LineString($components);

+	  $polygons[] = new Polygon(array($exterior_ring));

+	}

+	return $polygons;

   }

 

   // Circles are rendered into points

   // @@TODO: Add good support once we have circular-string geometry support

   protected function parseCircles() {

-    $points = array();

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

-    foreach ($circle_elements as $circle) {

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

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

-    }

-    return $points;

+	$points = array();

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

+	foreach ($circle_elements as $circle) {

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

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

+	}

+	return $points;

   }

   

   protected function geometryToGeoRSS($geom) {

-    $type = strtolower($geom->getGeomType());

-    switch ($type) {

-      case 'point':

-        return $this->pointToGeoRSS($geom);

-        break;

-      case 'linestring':

-        return $this->linestringToGeoRSS($geom);

-        break;

-      case 'polygon':

-        return $this->PolygonToGeoRSS($geom);

-        break;

-      case 'multipoint':

-      case 'multilinestring':

-      case 'multipolygon':

-      case 'geometrycollection':

-        return $this->collectionToGeoRSS($geom);

-        break;

-    }

-    return $output;

+	$type = strtolower($geom->getGeomType());

+	switch ($type) {

+	  case 'point':

+		return $this->pointToGeoRSS($geom);

+		break;

+	  case 'linestring':

+		return $this->linestringToGeoRSS($geom);

+		break;

+	  case 'polygon':

+		return $this->PolygonToGeoRSS($geom);

+		break;

+	  case 'multipoint':

+	  case 'multilinestring':

+	  case 'multipolygon':

+	  case 'geometrycollection':

+		return $this->collectionToGeoRSS($geom);

+		break;

+	}

+	return $output;

   }

   

   private function pointToGeoRSS($geom) {

-    return '<'.$this->nss.'point>'.$geom->getY().' '.$geom->getX().'</'.$this->nss.'point>';

+	return '<'.$this->nss.'point>'.$geom->getY().' '.$geom->getX().'</'.$this->nss.'point>';

   }

   

 

   private function linestringToGeoRSS($geom) {

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

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

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

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

-    }

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

-    return $output;

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

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

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

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

+	}

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

+	return $output;

   }

 

   private function polygonToGeoRSS($geom) {

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

-    $exterior_ring = $geom->exteriorRing();

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

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

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

-    }

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

-    return $output;

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

+	$exterior_ring = $geom->exteriorRing();

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

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

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

+	}

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

+	return $output;

   }

   

   public function collectionToGeoRSS($geom) {

-    $georss = '<'.$this->nss.'where>';

-    $components = $geom->getComponents();

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

-      $georss .= $this->geometryToGeoRSS($comp);

-    }

+	$georss = '<'.$this->nss.'where>';

+	$components = $geom->getComponents();

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

+	  $georss .= $this->geometryToGeoRSS($comp);

+	}

     

-    $georss .= '</'.$this->nss.'where>';

+	$georss .= '</'.$this->nss.'where>';

     

-    return $georss;

+	return $georss;

   }

 

 }