Ysurac / FlightAirMap

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;

   }

 

 }

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

Indentation +158 added lines, -158 removed lines

@@ -13,185 +13,185 @@ 
    * @return Geometry
    */
   public function read($wkt) {
-    $wkt = trim($wkt);
+	$wkt = trim($wkt);
     
-    // If it contains a ';', then it contains additional SRID data
-    if (strpos($wkt,';')) {
-      $parts = explode(';', $wkt);
-      $wkt = $parts[1];
-      $eparts = explode('=',$parts[0]);
-      $srid = $eparts[1];
-    }
-    else {
-      $srid = NULL;
-    }
+	// If it contains a ';', then it contains additional SRID data
+	if (strpos($wkt,';')) {
+	  $parts = explode(';', $wkt);
+	  $wkt = $parts[1];
+	  $eparts = explode('=',$parts[0]);
+	  $srid = $eparts[1];
+	}
+	else {
+	  $srid = NULL;
+	}
     
-    // If geos is installed, then we take a shortcut and let it parse the WKT
-    if (geoPHP::geosInstalled()) {
-      $reader = new GEOSWKTReader();
-      if ($srid) {
-        $geom = geoPHP::geosToGeometry($reader->read($wkt));
-        $geom->setSRID($srid);
-        return $geom;
-      }
-      else { 
-        return geoPHP::geosToGeometry($reader->read($wkt));
-      }
-    }
-    $wkt = str_replace(', ', ',', $wkt);
+	// If geos is installed, then we take a shortcut and let it parse the WKT
+	if (geoPHP::geosInstalled()) {
+	  $reader = new GEOSWKTReader();
+	  if ($srid) {
+		$geom = geoPHP::geosToGeometry($reader->read($wkt));
+		$geom->setSRID($srid);
+		return $geom;
+	  }
+	  else { 
+		return geoPHP::geosToGeometry($reader->read($wkt));
+	  }
+	}
+	$wkt = str_replace(', ', ',', $wkt);
     
-    // For each geometry type, check to see if we have a match at the
-    // beggining of the string. If we do, then parse using that type
-    foreach (geoPHP::geometryList() as $geom_type) {
-      $wkt_geom = strtoupper($geom_type);
-      if (strtoupper(substr($wkt, 0, strlen($wkt_geom))) == $wkt_geom) {
-        $data_string = $this->getDataString($wkt);
-        $method = 'parse'.$geom_type;
+	// For each geometry type, check to see if we have a match at the
+	// beggining of the string. If we do, then parse using that type
+	foreach (geoPHP::geometryList() as $geom_type) {
+	  $wkt_geom = strtoupper($geom_type);
+	  if (strtoupper(substr($wkt, 0, strlen($wkt_geom))) == $wkt_geom) {
+		$data_string = $this->getDataString($wkt);
+		$method = 'parse'.$geom_type;
         
-        if ($srid) {
-          $geom = $this->$method($data_string);
-          $geom->setSRID($srid);
-          return $geom;
-        }
-        else { 
-          return $this->$method($data_string);
-        }
+		if ($srid) {
+		  $geom = $this->$method($data_string);
+		  $geom->setSRID($srid);
+		  return $geom;
+		}
+		else { 
+		  return $this->$method($data_string);
+		}
         
-      }
-    }
+	  }
+	}
   }
   
   private function parsePoint($data_string) {
-    $data_string = $this->trimParens($data_string);
-    $parts = explode(' ',$data_string);
-    return new Point($parts[0], $parts[1]);
+	$data_string = $this->trimParens($data_string);
+	$parts = explode(' ',$data_string);
+	return new Point($parts[0], $parts[1]);
   }
 
   private function parseLineString($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty line
-    if ($data_string == 'EMPTY') return new LineString();
+	// If it's marked as empty, then return an empty line
+	if ($data_string == 'EMPTY') return new LineString();
     
-    $parts = explode(',',$data_string);
-    $points = array();
-    foreach ($parts as $part) {
-      $points[] = $this->parsePoint($part);
-    }
-    return new LineString($points);
+	$parts = explode(',',$data_string);
+	$points = array();
+	foreach ($parts as $part) {
+	  $points[] = $this->parsePoint($part);
+	}
+	return new LineString($points);
   }
 
   private function parsePolygon($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
     
-    // If it's marked as empty, then return an empty polygon
-    if ($data_string == 'EMPTY') return new Polygon();
+	// If it's marked as empty, then return an empty polygon
+	if ($data_string == 'EMPTY') return new Polygon();
     
-    $parts = explode('),(',$data_string);
-    $lines = array();
-    foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
-      $lines[] = $this->parseLineString($part);
-    }
-    return new Polygon($lines);
+	$parts = explode('),(',$data_string);
+	$lines = array();
+	foreach ($parts as $part) {
+	  if (!$this->beginsWith($part,'(')) $part = '(' . $part;
+	  if (!$this->endsWith($part,')'))   $part = $part . ')';
+	  $lines[] = $this->parseLineString($part);
+	}
+	return new Polygon($lines);
   }
 
   private function parseMultiPoint($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
     
-    // If it's marked as empty, then return an empty MutiPoint
-    if ($data_string == 'EMPTY') return new MultiPoint();
+	// If it's marked as empty, then return an empty MutiPoint
+	if ($data_string == 'EMPTY') return new MultiPoint();
     
-    $parts = explode(',',$data_string);
-    $points = array();
-    foreach ($parts as $part) {
-      $points[] = $this->parsePoint($part);
-    }
-    return new MultiPoint($points);
+	$parts = explode(',',$data_string);
+	$points = array();
+	foreach ($parts as $part) {
+	  $points[] = $this->parsePoint($part);
+	}
+	return new MultiPoint($points);
   }
   
   private function parseMultiLineString($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty multi-linestring
-    if ($data_string == 'EMPTY') return new MultiLineString();
+	// If it's marked as empty, then return an empty multi-linestring
+	if ($data_string == 'EMPTY') return new MultiLineString();
     
-    $parts = explode('),(',$data_string);
-    $lines = array();
-    foreach ($parts as $part) {
-      // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
-      $lines[] = $this->parseLineString($part);
-    }
-    return new MultiLineString($lines);
+	$parts = explode('),(',$data_string);
+	$lines = array();
+	foreach ($parts as $part) {
+	  // Repair the string if the explode broke it
+	  if (!$this->beginsWith($part,'(')) $part = '(' . $part;
+	  if (!$this->endsWith($part,')'))   $part = $part . ')';
+	  $lines[] = $this->parseLineString($part);
+	}
+	return new MultiLineString($lines);
   }
 
   private function parseMultiPolygon($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty multi-polygon
-    if ($data_string == 'EMPTY') return new MultiPolygon();
+	// If it's marked as empty, then return an empty multi-polygon
+	if ($data_string == 'EMPTY') return new MultiPolygon();
     
-    $parts = explode(')),((',$data_string);
-    $polys = array();
-    foreach ($parts as $part) {
-      // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
-      $polys[] = $this->parsePolygon($part);
-    }
-    return new MultiPolygon($polys);
+	$parts = explode(')),((',$data_string);
+	$polys = array();
+	foreach ($parts as $part) {
+	  // Repair the string if the explode broke it
+	  if (!$this->beginsWith($part,'((')) $part = '((' . $part;
+	  if (!$this->endsWith($part,'))'))   $part = $part . '))';
+	  $polys[] = $this->parsePolygon($part);
+	}
+	return new MultiPolygon($polys);
   }
 
   private function parseGeometryCollection($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty geom-collection
-    if ($data_string == 'EMPTY') return new GeometryCollection();
+	// If it's marked as empty, then return an empty geom-collection
+	if ($data_string == 'EMPTY') return new GeometryCollection();
     
-    $geometries = array();
-    $matches = array();
-    $str = preg_replace('/,\s*([A-Za-z])/', '|$1', $data_string);
-    $components = explode('|', trim($str));
+	$geometries = array();
+	$matches = array();
+	$str = preg_replace('/,\s*([A-Za-z])/', '|$1', $data_string);
+	$components = explode('|', trim($str));
     
-    foreach ($components as $component) {
-      $geometries[] = $this->read($component);
-    }
-    return new GeometryCollection($geometries);
+	foreach ($components as $component) {
+	  $geometries[] = $this->read($component);
+	}
+	return new GeometryCollection($geometries);
   }
 
   protected function getDataString($wkt) {
-    $first_paren = strpos($wkt, '(');
+	$first_paren = strpos($wkt, '(');
 
-    if ($first_paren !== FALSE) {
-      return substr($wkt, $first_paren);
-    }
-    return FALSE;
+	if ($first_paren !== FALSE) {
+	  return substr($wkt, $first_paren);
+	}
+	return FALSE;
   }
   
   /**
    * Trim the parenthesis and spaces
    */
   protected function trimParens($str) {
-    $str = trim($str);
+	$str = trim($str);
     
-    // We want to only strip off one set of parenthesis
-    if ($this->beginsWith($str, '(')) {
-      return substr($str,1,-1);
-    }
-    else return $str;
+	// We want to only strip off one set of parenthesis
+	if ($this->beginsWith($str, '(')) {
+	  return substr($str,1,-1);
+	}
+	else return $str;
   }
   
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
-    else return FALSE;
+	if (substr($str,0,strlen($char)) == $char) return TRUE;
+	else return FALSE;
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
-    else return FALSE;
+	if (substr($str,(0 - strlen($char))) == $char) return TRUE;
+	else return FALSE;
   }
     
   /**
@@ -202,19 +202,19 @@ 
    * @return string The WKT string representation of the input geometries
    */
   public function write(Geometry $geometry) {
-    // If geos is installed, then we take a shortcut and let it write the WKT
-    if (geoPHP::geosInstalled()) {
-      $writer = new GEOSWKTWriter();
-      $writer->setTrim(TRUE);
-      return $writer->write($geometry->geos());
-    }
+	// If geos is installed, then we take a shortcut and let it write the WKT
+	if (geoPHP::geosInstalled()) {
+	  $writer = new GEOSWKTWriter();
+	  $writer->setTrim(TRUE);
+	  return $writer->write($geometry->geos());
+	}
     
-    if ($geometry->isEmpty()) {
-      return strtoupper($geometry->geometryType()).' EMPTY';
-    }
-    else if ($data = $this->extractData($geometry)) {
-      return strtoupper($geometry->geometryType()).' ('.$data.')';
-    }
+	if ($geometry->isEmpty()) {
+	  return strtoupper($geometry->geometryType()).' EMPTY';
+	}
+	else if ($data = $this->extractData($geometry)) {
+	  return strtoupper($geometry->geometryType()).' ('.$data.')';
+	}
   }
   
   /**
@@ -225,28 +225,28 @@ 
    * @return string
    */
   public function extractData($geometry) {
-    $parts = array();
-    switch ($geometry->geometryType()) {
-      case 'Point':
-        return $geometry->getX().' '.$geometry->getY();
-      case 'LineString':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = $this->extractData($component);
-        }
-        return implode(', ', $parts);
-      case 'Polygon':
-      case 'MultiPoint':
-      case 'MultiLineString':
-      case 'MultiPolygon':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = '('.$this->extractData($component).')';
-        }
-        return implode(', ', $parts);
-      case 'GeometryCollection':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = strtoupper($component->geometryType()).' ('.$this->extractData($component).')';
-        }
-        return implode(', ', $parts);
-    }
+	$parts = array();
+	switch ($geometry->geometryType()) {
+	  case 'Point':
+		return $geometry->getX().' '.$geometry->getY();
+	  case 'LineString':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = $this->extractData($component);
+		}
+		return implode(', ', $parts);
+	  case 'Polygon':
+	  case 'MultiPoint':
+	  case 'MultiLineString':
+	  case 'MultiPolygon':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = '('.$this->extractData($component).')';
+		}
+		return implode(', ', $parts);
+	  case 'GeometryCollection':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = strtoupper($component->geometryType()).' ('.$this->extractData($component).')';
+		}
+		return implode(', ', $parts);
+	}
   }
 }

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

Indentation +90 added lines, -90 removed lines

@@ -30,55 +30,55 @@ 
    * @return Geometry|GeometryCollection
    */
   public function read($address, $return_type = 'point', $bounds = FALSE, $return_multiple = FALSE) {
-    if (is_array($address)) $address = join(',', $address);
+	if (is_array($address)) $address = join(',', $address);
     
-    if (gettype($bounds) == 'object') {
-      $bounds = $bounds->getBBox();
-    }
-    if (gettype($bounds) == 'array') {
-      $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
-      $bounds_string = '';
-    }
+	if (gettype($bounds) == 'object') {
+	  $bounds = $bounds->getBBox();
+	}
+	if (gettype($bounds) == 'array') {
+	  $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
+	}
+	else {
+	  $bounds_string = '';
+	}
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
-    $url .= $bounds_string;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?address='. urlencode($address);
+	$url .= $bounds_string;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_multiple == FALSE) {
-        if ($return_type == 'point') {
-          return $this->getPoint();
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          return $this->getPolygon();
-        }
-      }
-      if ($return_multiple == TRUE) {
-        if ($return_type == 'point') {
-          $points = array();
-          foreach ($this->result->results as $delta => $item) {
-            $points[] = $this->getPoint($delta);
-          }
-          return new MultiPoint($points);
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          $polygons = array();
-          foreach ($this->result->results as $delta => $item) {
-            $polygons[] = $this->getPolygon($delta);
-          }
-          return new MultiPolygon($polygons);
-        }
-      }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Geocoder');
-      return FALSE;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_multiple == FALSE) {
+		if ($return_type == 'point') {
+		  return $this->getPoint();
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  return $this->getPolygon();
+		}
+	  }
+	  if ($return_multiple == TRUE) {
+		if ($return_type == 'point') {
+		  $points = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$points[] = $this->getPoint($delta);
+		  }
+		  return new MultiPoint($points);
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  $polygons = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$polygons[] = $this->getPolygon($delta);
+		  }
+		  return new MultiPolygon($polygons);
+		}
+	  }
+	}
+	else {
+	  if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
+	  else throw new Exception('Unknown error in Google Geocoder');
+	  return FALSE;
+	}
   }
 
   /**
@@ -90,69 +90,69 @@ 
    * @return string Does a reverse geocode of the geometry
    */
   public function write(Geometry $geometry, $return_type = 'string') {
-    $centroid = $geometry->getCentroid();
-    $lat = $centroid->getY();
-    $lon = $centroid->getX();
+	$centroid = $geometry->getCentroid();
+	$lat = $centroid->getY();
+	$lon = $centroid->getX();
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?latlng='.$lat.','.$lon;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?latlng='.$lat.','.$lon;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_type == 'string') {
-        return $this->result->results[0]->formatted_address;
-      }
-      if ($return_type == 'array') {
-        return $this->result->results[0]->address_components;
-      }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Reverse Geocoder');
-      return FALSE;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_type == 'string') {
+		return $this->result->results[0]->formatted_address;
+	  }
+	  if ($return_type == 'array') {
+		return $this->result->results[0]->address_components;
+	  }
+	}
+	else {
+	  if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
+	  else throw new Exception('Unknown error in Google Reverse Geocoder');
+	  return FALSE;
+	}
   }
   
   private function getPoint($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->location->lat;
-    $lon = $this->result->results[$delta]->geometry->location->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->location->lat;
+	$lon = $this->result->results[$delta]->geometry->location->lng;
+	return new Point($lon, $lat);
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
-      $this->getTopLeft($delta),
-      $this->getTopRight($delta),
-      $this->getBottomRight($delta),
-      $this->getBottomLeft($delta),
-      $this->getTopLeft($delta),
-    );
-    $outer_ring = new LineString($points);
-    return new Polygon(array($outer_ring));
+	$points = array (
+	  $this->getTopLeft($delta),
+	  $this->getTopRight($delta),
+	  $this->getBottomRight($delta),
+	  $this->getBottomLeft($delta),
+	  $this->getTopLeft($delta),
+	);
+	$outer_ring = new LineString($points);
+	return new Polygon(array($outer_ring));
   }
 
   private function getTopLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	return new Point($lon, $lat);
   }
 
   private function getTopRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
   
   private function getBottomLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-     return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	 return new Point($lon, $lat);
   }
 
   private function getBottomRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
 }

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

Indentation +62 added lines, -62 removed lines

@@ -13,33 +13,33 @@ 
    * @return Geometry
    */
   public function read($wkb, $is_hex_string = FALSE) {
-    if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
-    }
+	if ($is_hex_string) {
+	  $wkb = pack('H*',$wkb);
+	}
     
-    // Open the wkb up in memory so we can examine the SRID
-    $mem = fopen('php://memory', 'r+');
-    fwrite($mem, $wkb);
-    fseek($mem, 0);
-    $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
-    if ($base_info['s']) {
-      $srid = current(unpack("Lsrid", fread($mem, 4)));
-    }
-    else {
-      $srid = NULL;
-    }
-    fclose($mem);
+	// Open the wkb up in memory so we can examine the SRID
+	$mem = fopen('php://memory', 'r+');
+	fwrite($mem, $wkb);
+	fseek($mem, 0);
+	$base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
+	if ($base_info['s']) {
+	  $srid = current(unpack("Lsrid", fread($mem, 4)));
+	}
+	else {
+	  $srid = NULL;
+	}
+	fclose($mem);
     
-    // Run the wkb through the normal WKB reader to get the geometry
-    $wkb_reader = new WKB();
-    $geom = $wkb_reader->read($wkb);
+	// Run the wkb through the normal WKB reader to get the geometry
+	$wkb_reader = new WKB();
+	$geom = $wkb_reader->read($wkb);
     
-    // If there is an SRID, add it to the geometry
-    if ($srid) {
-      $geom->setSRID($srid);
-    }
+	// If there is an SRID, add it to the geometry
+	if ($srid) {
+	  $geom->setSRID($srid);
+	}
     
-    return $geom;
+	return $geom;
   }
   
   /**
@@ -50,47 +50,47 @@ 
    * @return string The Extended-WKB binary string representation of the input geometries
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
-    // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+	// We always write into NDR (little endian)
+	$wkb = pack('c',1);
     
-    switch ($geometry->getGeomType()) {
-      case 'Point';
-        $wkb .= pack('L',1);
-        $wkb .= $this->writePoint($geometry);
-        break;
-      case 'LineString';
-        $wkb .= pack('L',2);
-        $wkb .= $this->writeLineString($geometry);
-        break;
-      case 'Polygon';
-        $wkb .= pack('L',3);
-        $wkb .= $this->writePolygon($geometry);
-        break;
-      case 'MultiPoint';
-        $wkb .= pack('L',4);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'MultiLineString';
-        $wkb .= pack('L',5);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'MultiPolygon';
-        $wkb .= pack('L',6);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'GeometryCollection';
-        $wkb .= pack('L',7);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-    }
+	switch ($geometry->getGeomType()) {
+	  case 'Point';
+		$wkb .= pack('L',1);
+		$wkb .= $this->writePoint($geometry);
+		break;
+	  case 'LineString';
+		$wkb .= pack('L',2);
+		$wkb .= $this->writeLineString($geometry);
+		break;
+	  case 'Polygon';
+		$wkb .= pack('L',3);
+		$wkb .= $this->writePolygon($geometry);
+		break;
+	  case 'MultiPoint';
+		$wkb .= pack('L',4);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'MultiLineString';
+		$wkb .= pack('L',5);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'MultiPolygon';
+		$wkb .= pack('L',6);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'GeometryCollection';
+		$wkb .= pack('L',7);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	}
     
-    if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
-      return $unpacked[1];
-    }
-    else {
-      return $wkb;
-    }
+	if ($write_as_hex) {
+	  $unpacked = unpack('H*',$wkb);
+	  return $unpacked[1];
+	}
+	else {
+	  return $wkb;
+	}
   }
 
 }

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

Indentation +118 added lines, -118 removed lines

@@ -16,21 +16,21 @@ 
    * @see GeoAdapter::read()
    */
   public function read($hash, $as_grid = FALSE) {
-    $ll = $this->decode($hash);
-    if (!$as_grid) {
-      return new Point($ll['medlon'], $ll['medlat']);
-    }
-    else {
-      return new Polygon(array(
-        new LineString(array(
-          new Point($ll['minlon'], $ll['maxlat']),
-          new Point($ll['maxlon'], $ll['maxlat']),
-          new Point($ll['maxlon'], $ll['minlat']),
-          new Point($ll['minlon'], $ll['minlat']),
-          new Point($ll['minlon'], $ll['maxlat']),
-        ))
-      ));
-    }
+	$ll = $this->decode($hash);
+	if (!$as_grid) {
+	  return new Point($ll['medlon'], $ll['medlat']);
+	}
+	else {
+	  return new Polygon(array(
+		new LineString(array(
+		  new Point($ll['minlon'], $ll['maxlat']),
+		  new Point($ll['maxlon'], $ll['maxlat']),
+		  new Point($ll['maxlon'], $ll['minlat']),
+		  new Point($ll['minlon'], $ll['minlat']),
+		  new Point($ll['minlon'], $ll['maxlat']),
+		))
+	  ));
+	}
   }
 
   /**
@@ -40,32 +40,32 @@ 
    * @see GeoAdapter::write()
    */
   public function write(Geometry $geometry, $precision = NULL){
-    if ($geometry->isEmpty()) return '';
+	if ($geometry->isEmpty()) return '';
 
-    if($geometry->geometryType() === 'Point'){
-      return $this->encodePoint($geometry, $precision);
-    }
-    else {
-      // The geohash is the hash grid ID that fits the envelope
-      $envelope = $geometry->envelope();
-      $geohashes = array();
-      $geohash = '';
-      foreach ($envelope->getPoints() as $point) {
-        $geohashes[] = $this->encodePoint($point, 0.0000001);
-      }
-      $i = 0;
-      while ($i < strlen($geohashes[0])) {
-        $char = $geohashes[0][$i];
-        foreach ($geohashes as $hash) {
-          if ($hash[$i] != $char) {
-            return $geohash;
-          }
-        }
-        $geohash .= $char;
-        $i++;
-      }
-      return $geohash;
-    }
+	if($geometry->geometryType() === 'Point'){
+	  return $this->encodePoint($geometry, $precision);
+	}
+	else {
+	  // The geohash is the hash grid ID that fits the envelope
+	  $envelope = $geometry->envelope();
+	  $geohashes = array();
+	  $geohash = '';
+	  foreach ($envelope->getPoints() as $point) {
+		$geohashes[] = $this->encodePoint($point, 0.0000001);
+	  }
+	  $i = 0;
+	  while ($i < strlen($geohashes[0])) {
+		$char = $geohashes[0][$i];
+		foreach ($geohashes as $hash) {
+		  if ($hash[$i] != $char) {
+			return $geohash;
+		  }
+		}
+		$geohash .= $char;
+		$i++;
+	  }
+	  return $geohash;
+	}
   }
 
   /**
@@ -75,51 +75,51 @@ 
    * @see https://github.com/asonge/php-geohash/issues/1
    */
   private function encodePoint($point, $precision = NULL){
-    if ($precision === NULL) {
-      $lap = strlen($point->y())-strpos($point->y(),".");
-      $lop = strlen($point->x())-strpos($point->x(),".");
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
-    }
+	if ($precision === NULL) {
+	  $lap = strlen($point->y())-strpos($point->y(),".");
+	  $lop = strlen($point->x())-strpos($point->x(),".");
+	  $precision = pow(10,-max($lap-1,$lop-1,0))/2;
+	}
 
-    $minlat =  -90;
-    $maxlat =   90;
-    $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    $i = 0;
-    $error = 180;
-    $hash='';
-    while($error>=$precision) {
-      $chr = 0;
-      for($b=4;$b>=0;--$b) {
-        if((1&$b) == (1&$i)) {
-          // even char, even bit OR odd char, odd bit...a lon
-          $next = ($minlon+$maxlon)/2;
-          if($point->x()>$next) {
-            $chr |= pow(2,$b);
-            $minlon = $next;
-          } else {
-            $maxlon = $next;
-          }
-          $lonE /= 2;
-        } else {
-          // odd char, even bit OR even char, odd bit...a lat
-          $next = ($minlat+$maxlat)/2;
-          if($point->y()>$next) {
-            $chr |= pow(2,$b);
-            $minlat = $next;
-          } else {
-            $maxlat = $next;
-          }
-          $latE /= 2;
-        }
-      }
-      $hash .= $this->table[$chr];
-      $i++;
-      $error = min($latE,$lonE);
-    }
-    return $hash;
+	$minlat =  -90;
+	$maxlat =   90;
+	$minlon = -180;
+	$maxlon =  180;
+	$latE   =   90;
+	$lonE   =  180;
+	$i = 0;
+	$error = 180;
+	$hash='';
+	while($error>=$precision) {
+	  $chr = 0;
+	  for($b=4;$b>=0;--$b) {
+		if((1&$b) == (1&$i)) {
+		  // even char, even bit OR odd char, odd bit...a lon
+		  $next = ($minlon+$maxlon)/2;
+		  if($point->x()>$next) {
+			$chr |= pow(2,$b);
+			$minlon = $next;
+		  } else {
+			$maxlon = $next;
+		  }
+		  $lonE /= 2;
+		} else {
+		  // odd char, even bit OR even char, odd bit...a lat
+		  $next = ($minlat+$maxlat)/2;
+		  if($point->y()>$next) {
+			$chr |= pow(2,$b);
+			$minlat = $next;
+		  } else {
+			$maxlat = $next;
+		  }
+		  $latE /= 2;
+		}
+	  }
+	  $hash .= $this->table[$chr];
+	  $i++;
+	  $error = min($latE,$lonE);
+	}
+	return $hash;
   }
 
   /**
@@ -128,39 +128,39 @@ 
    * @see https://github.com/asonge/php-geohash/issues/1
    */
   private function decode($hash){
-    $ll = array();
-    $minlat =  -90;
-    $maxlat =   90;
-    $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    for($i=0,$c=strlen($hash);$i<$c;$i++) {
-      $v = strpos($this->table,$hash[$i]);
-      if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        $latE /= 8;
-        $lonE /= 4;
-      } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        $latE /= 4;
-        $lonE /= 8;
-      }
-    }
-    $ll['minlat'] = $minlat;
-    $ll['minlon'] = $minlon;
-    $ll['maxlat'] = $maxlat;
-    $ll['maxlon'] = $maxlon;
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
-    return $ll;
+	$ll = array();
+	$minlat =  -90;
+	$maxlat =   90;
+	$minlon = -180;
+	$maxlon =  180;
+	$latE   =   90;
+	$lonE   =  180;
+	for($i=0,$c=strlen($hash);$i<$c;$i++) {
+	  $v = strpos($this->table,$hash[$i]);
+	  if(1&$i) {
+		if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		$latE /= 8;
+		$lonE /= 4;
+	  } else {
+		if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		$latE /= 4;
+		$lonE /= 8;
+	  }
+	}
+	$ll['minlat'] = $minlat;
+	$ll['minlon'] = $minlon;
+	$ll['maxlat'] = $maxlat;
+	$ll['maxlon'] = $maxlon;
+	$ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
+	$ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+	return $ll;
   }
 }

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

Indentation +103 added lines, -103 removed lines

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

    */

   public function read($gpx) {

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

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

   }

 

   /**

@@ -34,147 +34,147 @@ 
    * @return string The GPX string representation of the input geometries

    */

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

-    if ($geometry->isEmpty()) return NULL;

-    if ($namespace) {

-      $this->namespace = $namespace;

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

-    }

-    return '<'.$this->nss.'gpx creator="geoPHP" version="1.0">'.$this->geometryToGPX($geometry).'</'.$this->nss.'gpx>';

+	if ($geometry->isEmpty()) return NULL;

+	if ($namespace) {

+	  $this->namespace = $namespace;

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

+	}

+	return '<'.$this->nss.'gpx creator="geoPHP" version="1.0">'.$this->geometryToGPX($geometry).'</'.$this->nss.'gpx>';

   }

   

   public function geomFromText($text) {

-    // Change to lower-case and strip all CDATA

-    $text = strtolower($text);

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

+	// Change to lower-case and strip all CDATA

+	$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 GPX: ". $text);

-    }

+	// Load into DOMDocument

+	$xmlobj = new DOMDocument();

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

+	if ($xmlobj === false) {

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

+	}

     

-    $this->xmlobj = $xmlobj;

-    try {

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

-    } catch(InvalidText $e) {

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

-    } catch(Exception $e) {

-        throw $e;

-    }

+	$this->xmlobj = $xmlobj;

+	try {

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

+	} catch(InvalidText $e) {

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

+	} catch(Exception $e) {

+		throw $e;

+	}

 

-    return $geom;

+	return $geom;

   }

   

   protected function geomFromXML() {

-    $geometries = array();

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

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

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

+	$geometries = array();

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

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

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

     

-    if (empty($geometries)) {

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

-    }

+	if (empty($geometries)) {

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

+	}

     

-    return geoPHP::geometryReduce($geometries); 

+	return geoPHP::geometryReduce($geometries); 

   }

   

   protected function childElements($xml, $nodename = '') {

-    $children = array();

-    foreach ($xml->childNodes as $child) {

-      if ($child->nodeName == $nodename) {

-        $children[] = $child;

-      }

-    }

-    return $children;

+	$children = array();

+	foreach ($xml->childNodes as $child) {

+	  if ($child->nodeName == $nodename) {

+		$children[] = $child;

+	  }

+	}

+	return $children;

   }

   

   protected function parseWaypoints() {

-    $points = array();

-    $wpt_elements = $this->xmlobj->getElementsByTagName('wpt');

-    foreach ($wpt_elements as $wpt) {

-      $lat = $wpt->attributes->getNamedItem("lat")->nodeValue;

-      $lon = $wpt->attributes->getNamedItem("lon")->nodeValue;

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

-    }

-    return $points;

+	$points = array();

+	$wpt_elements = $this->xmlobj->getElementsByTagName('wpt');

+	foreach ($wpt_elements as $wpt) {

+	  $lat = $wpt->attributes->getNamedItem("lat")->nodeValue;

+	  $lon = $wpt->attributes->getNamedItem("lon")->nodeValue;

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

+	}

+	return $points;

   }

   

   protected function parseTracks() {

-    $lines = array();

-    $trk_elements = $this->xmlobj->getElementsByTagName('trk');

-    foreach ($trk_elements as $trk) {

-      $components = array();

-      foreach ($this->childElements($trk, 'trkseg') as $trkseg) {

-        foreach ($this->childElements($trkseg, 'trkpt') as $trkpt) {

-          $lat = $trkpt->attributes->getNamedItem("lat")->nodeValue;

-          $lon = $trkpt->attributes->getNamedItem("lon")->nodeValue;

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

-        }

-      }

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

-    }

-    return $lines;

+	$lines = array();

+	$trk_elements = $this->xmlobj->getElementsByTagName('trk');

+	foreach ($trk_elements as $trk) {

+	  $components = array();

+	  foreach ($this->childElements($trk, 'trkseg') as $trkseg) {

+		foreach ($this->childElements($trkseg, 'trkpt') as $trkpt) {

+		  $lat = $trkpt->attributes->getNamedItem("lat")->nodeValue;

+		  $lon = $trkpt->attributes->getNamedItem("lon")->nodeValue;

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

+		}

+	  }

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

+	}

+	return $lines;

   }

   

   protected function parseRoutes() {

-    $lines = array();

-    $rte_elements = $this->xmlobj->getElementsByTagName('rte');

-    foreach ($rte_elements as $rte) {

-      $components = array();

-      foreach ($this->childElements($rte, 'rtept') as $rtept) {

-        $lat = $rtept->attributes->getNamedItem("lat")->nodeValue;

-        $lon = $rtept->attributes->getNamedItem("lon")->nodeValue;

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

-      }

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

-    }

-    return $lines;

+	$lines = array();

+	$rte_elements = $this->xmlobj->getElementsByTagName('rte');

+	foreach ($rte_elements as $rte) {

+	  $components = array();

+	  foreach ($this->childElements($rte, 'rtept') as $rtept) {

+		$lat = $rtept->attributes->getNamedItem("lat")->nodeValue;

+		$lon = $rtept->attributes->getNamedItem("lon")->nodeValue;

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

+	  }

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

+	}

+	return $lines;

   }

   

   protected function geometryToGPX($geom) {

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

-    switch ($type) {

-      case 'point':

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

-        break;

-      case 'linestring':

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

-        break;

-      case 'polygon':

-      case 'multipoint':

-      case 'multilinestring':

-      case 'multipolygon':

-      case 'geometrycollection':

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

-        break;

-    }

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

+	switch ($type) {

+	  case 'point':

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

+		break;

+	  case 'linestring':

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

+		break;

+	  case 'polygon':

+	  case 'multipoint':

+	  case 'multilinestring':

+	  case 'multipolygon':

+	  case 'geometrycollection':

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

+		break;

+	}

   }

   

   private function pointToGPX($geom) {

-    return '<'.$this->nss.'wpt lat="'.$geom->getY().'" lon="'.$geom->getX().'" />';

+	return '<'.$this->nss.'wpt lat="'.$geom->getY().'" lon="'.$geom->getX().'" />';

   }

   

   private function linestringToGPX($geom) {

-    $gpx = '<'.$this->nss.'trk><'.$this->nss.'trkseg>';

+	$gpx = '<'.$this->nss.'trk><'.$this->nss.'trkseg>';

     

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

-      $gpx .= '<'.$this->nss.'trkpt lat="'.$comp->getY().'" lon="'.$comp->getX().'" />';

-    }

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

+	  $gpx .= '<'.$this->nss.'trkpt lat="'.$comp->getY().'" lon="'.$comp->getX().'" />';

+	}

     

-    $gpx .= '</'.$this->nss.'trkseg></'.$this->nss.'trk>';

+	$gpx .= '</'.$this->nss.'trkseg></'.$this->nss.'trk>';

     

-    return $gpx;

+	return $gpx;

   }

   

   public function collectionToGPX($geom) {

-    $gpx = '';

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

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

-      $gpx .= $this->geometryToGPX($comp);

-    }

+	$gpx = '';

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

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

+	  $gpx .= $this->geometryToGPX($comp);

+	}

     

-    return $gpx;

+	return $gpx;

   }

 

 }