Ysurac / FlightAirMap

install/libs/sparqllib.php

Doc Comments +10 added lines

@@ -13,6 +13,9 @@ 
 function sparql_connect( $endpoint ) { return new sparql_connection( $endpoint ); }
 
 function sparql_ns( $short, $long, $db = null ) { return _sparql_a_connection( $db )->ns( $short, $long ); }
+/**
+ * @param string $sparql
+ */
 function sparql_query( $sparql, $db = null ) { return _sparql_a_connection( $db )->query( $sparql ); }
 function sparql_errno( $db = null ) { return _sparql_a_connection( $db )->errno(); }
 function sparql_error( $db = null ) { return _sparql_a_connection( $db )->error(); }
@@ -84,6 +87,9 @@ 
 		$this->params = $params;
 	}
 
+	/**
+	 * @param integer $timeout
+	 */
 	function query( $query, $timeout=null )
 	{	
 		$prefixes = "";
@@ -324,6 +330,10 @@ 
 	var $fields;
 	var $db;
 	var $i = 0;
+
+	/**
+	 * @param sparql_connection $db
+	 */
 	function __construct( $db, $rows, $fields )
 	{
 		$this->rows = $rows;

require/libs/geoPHP/geoPHP.inc

Doc Comments +7 added lines

@@ -118,6 +118,9 @@ 
     );

   }

 

+  /**
+   * @param boolean $force
+   */
   static function geosInstalled($force = NULL) {

     static $geos_installed = NULL;

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

@@ -222,6 +225,10 @@ 
 

   // Detect a format given a value. This function is meant to be SPEEDY.

   // It could make a mistake in XML detection if you are mixing or using namespaces in weird ways (ie, KML inside an RSS feed)

+
+  /**
+   * @return string
+   */
   static function detectFormat(&$input) {

     $mem = fopen('php://memory', 'r+');

     fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

Indentation +225 added lines, -225 removed lines

@@ -35,110 +35,110 @@ 
 {

 

   static function version() {

-    return '1.1';

+	return '1.1';

   }

 

   // geoPHP::load($data, $type, $other_args);

   // if $data is an array, all passed in values will be combined into a single geometry

   static function load() {

-    $args = func_get_args();

+	$args = func_get_args();

 

-    $data = array_shift($args);

-    $type = array_shift($args);

+	$data = array_shift($args);

+	$type = array_shift($args);

 

-    $type_map = geoPHP::getAdapterMap();

+	$type_map = geoPHP::getAdapterMap();

 

-    // Auto-detect type if needed

-    if (!$type) {

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

-      if (is_object($data)) {

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

-      }

+	// Auto-detect type if needed

+	if (!$type) {

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

+	  if (is_object($data)) {

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

+	  }

       

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

-      if (!$detected) {

-        return FALSE;

-      }

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

+	  if (!$detected) {

+		return FALSE;

+	  }

       

-      $format = explode(':', $detected);

-      $type = array_shift($format);

-      $args = $format;

-    }

-

-    $processor_type = $type_map[$type];

-

-    if (!$processor_type) {

-      throw new exception('geoPHP could not find an adapter of type '.htmlentities($type));

-      exit;

-    }

-

-    $processor = new $processor_type();

-

-    // Data is not an array, just pass it normally

-    if (!is_array($data)) {

-      $result = call_user_func_array(array($processor, "read"), array_merge(array($data), $args));

-    }

-    // Data is an array, combine all passed in items into a single geomtetry

-    else {

-      $geoms = array();

-      foreach ($data as $item) {

-        $geoms[] = call_user_func_array(array($processor, "read"), array_merge(array($item), $args));

-      }

-      $result = geoPHP::geometryReduce($geoms);

-    }

-

-    return $result;

+	  $format = explode(':', $detected);

+	  $type = array_shift($format);

+	  $args = $format;

+	}

+

+	$processor_type = $type_map[$type];

+

+	if (!$processor_type) {

+	  throw new exception('geoPHP could not find an adapter of type '.htmlentities($type));

+	  exit;

+	}

+

+	$processor = new $processor_type();

+

+	// Data is not an array, just pass it normally

+	if (!is_array($data)) {

+	  $result = call_user_func_array(array($processor, "read"), array_merge(array($data), $args));

+	}

+	// Data is an array, combine all passed in items into a single geomtetry

+	else {

+	  $geoms = array();

+	  foreach ($data as $item) {

+		$geoms[] = call_user_func_array(array($processor, "read"), array_merge(array($item), $args));

+	  }

+	  $result = geoPHP::geometryReduce($geoms);

+	}

+

+	return $result;

   }

 

   static function getAdapterMap() {

-    return array (

-      'wkt' =>  'WKT',

-      'ewkt' => 'EWKT',

-      'wkb' =>  'WKB',

-      'ewkb' => 'EWKB',

-      'json' => 'GeoJSON',

-      'geojson' => 'GeoJSON',

-      'kml' =>  'KML',

-      'gpx' =>  'GPX',

-      'georss' => 'GeoRSS',

-      'google_geocode' => 'GoogleGeocode',

-      'geohash' => 'GeoHash',

-    );

+	return array (

+	  'wkt' =>  'WKT',

+	  'ewkt' => 'EWKT',

+	  'wkb' =>  'WKB',

+	  'ewkb' => 'EWKB',

+	  'json' => 'GeoJSON',

+	  'geojson' => 'GeoJSON',

+	  'kml' =>  'KML',

+	  'gpx' =>  'GPX',

+	  'georss' => 'GeoRSS',

+	  'google_geocode' => 'GoogleGeocode',

+	  'geohash' => 'GeoHash',

+	);

   }

 

   static function geometryList() {

-    return array(

-      'point' => 'Point',

-      'linestring' => 'LineString',

-      'polygon' => 'Polygon',

-      'multipoint' => 'MultiPoint',

-      'multilinestring' => 'MultiLineString',

-      'multipolygon' => 'MultiPolygon',

-      'geometrycollection' => 'GeometryCollection',

-    );

+	return array(

+	  'point' => 'Point',

+	  'linestring' => 'LineString',

+	  'polygon' => 'Polygon',

+	  'multipoint' => 'MultiPoint',

+	  'multilinestring' => 'MultiLineString',

+	  'multipolygon' => 'MultiPolygon',

+	  'geometrycollection' => 'GeometryCollection',

+	);

   }

 

   static function geosInstalled($force = NULL) {

-    static $geos_installed = NULL;

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

-    if ($geos_installed !== NULL) {

-      return $geos_installed;

-    }

-    $geos_installed = class_exists('GEOSGeometry');

-    return $geos_installed;

+	static $geos_installed = NULL;

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

+	if ($geos_installed !== NULL) {

+	  return $geos_installed;

+	}

+	$geos_installed = class_exists('GEOSGeometry');

+	return $geos_installed;

   }

 

   static function geosToGeometry($geos) {

-    if (!geoPHP::geosInstalled()) {

-      return NULL;

-    }

-    $wkb_writer = new GEOSWKBWriter();

-    $wkb = $wkb_writer->writeHEX($geos);

-    $geometry = geoPHP::load($wkb, 'wkb', TRUE);

-    if ($geometry) {

-      $geometry->setGeos($geos);

-      return $geometry;

-    }

+	if (!geoPHP::geosInstalled()) {

+	  return NULL;

+	}

+	$wkb_writer = new GEOSWKBWriter();

+	$wkb = $wkb_writer->writeHEX($geos);

+	$geometry = geoPHP::load($wkb, 'wkb', TRUE);

+	if ($geometry) {

+	  $geometry->setGeos($geos);

+	  return $geometry;

+	}

   }

 

   // Reduce a geometry, or an array of geometries, into their 'lowest' available common geometry.

@@ -146,155 +146,155 @@ 
   // A multi-point containing a single point will return a point.

   // An array of geometries can be passed and they will be compiled into a single geometry

   static function geometryReduce($geometry) {

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

-    if (is_array($geometry)) {

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

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

-    }

-

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

-    if (gettype($geometry) == 'object') {

-      $passbacks = array('Point','LineString','Polygon');

-      if (in_array($geometry->geometryType(),$passbacks)) {

-        return $geometry;

-      }

-    }

-

-    // If it is a mutlti-geometry, check to see if it just has one member

-    // If it does, then pass the member, if not, then just pass back the geometry

-    if (gettype($geometry) == 'object') {

-      $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

-      if (in_array(get_class($geometry),$passbacks)) {

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

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

-          return $components[0];

-        }

-        else {

-          return $geometry;

-        }

-      }

-    }

-

-    // So now we either have an array of geometries, a GeometryCollection, or an array of GeometryCollections

-    if (!is_array($geometry)) {

-      $geometry = array($geometry);

-    }

-

-    $geometries = array();

-    $geom_types = array();

-

-    $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

-

-    foreach ($geometry as $item) {

-      if ($item) {

-        if (in_array(get_class($item), $collections)) {

-          foreach ($item->getComponents() as $component) {

-            $geometries[] = $component;

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

-          }

-        }

-        else {

-          $geometries[] = $item;

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

-        }

-      }

-    }

-

-    $geom_types = array_unique($geom_types);

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

+	if (is_array($geometry)) {

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

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

+	}

+

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

+	if (gettype($geometry) == 'object') {

+	  $passbacks = array('Point','LineString','Polygon');

+	  if (in_array($geometry->geometryType(),$passbacks)) {

+		return $geometry;

+	  }

+	}

+

+	// If it is a mutlti-geometry, check to see if it just has one member

+	// If it does, then pass the member, if not, then just pass back the geometry

+	if (gettype($geometry) == 'object') {

+	  $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

+	  if (in_array(get_class($geometry),$passbacks)) {

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

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

+		  return $components[0];

+		}

+		else {

+		  return $geometry;

+		}

+	  }

+	}

+

+	// So now we either have an array of geometries, a GeometryCollection, or an array of GeometryCollections

+	if (!is_array($geometry)) {

+	  $geometry = array($geometry);

+	}

+

+	$geometries = array();

+	$geom_types = array();

+

+	$collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

+

+	foreach ($geometry as $item) {

+	  if ($item) {

+		if (in_array(get_class($item), $collections)) {

+		  foreach ($item->getComponents() as $component) {

+			$geometries[] = $component;

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

+		  }

+		}

+		else {

+		  $geometries[] = $item;

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

+		}

+	  }

+	}

+

+	$geom_types = array_unique($geom_types);

     

-    if (empty($geom_types)) {

-      return FALSE;

-    }

-

-    if (count($geom_types) == 1) {

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

-        return $geometries[0];

-      }

-      else {

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

-        return new $class($geometries);

-      }

-    }

-    else {

-      return new GeometryCollection($geometries);

-    }

+	if (empty($geom_types)) {

+	  return FALSE;

+	}

+

+	if (count($geom_types) == 1) {

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

+		return $geometries[0];

+	  }

+	  else {

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

+		return new $class($geometries);

+	  }

+	}

+	else {

+	  return new GeometryCollection($geometries);

+	}

   }

 

   // Detect a format given a value. This function is meant to be SPEEDY.

   // It could make a mistake in XML detection if you are mixing or using namespaces in weird ways (ie, KML inside an RSS feed)

   static function detectFormat(&$input) {

-    $mem = fopen('php://memory', 'r+');

-    fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

-    fseek($mem, 0);

-

-    $bytes = unpack("c*", fread($mem, 11));

-

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

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

-

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

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

-      return geoPHP::detectFormat(ltrim($input));

-    }

-

-    // Detect WKB or EWKB -- first byte is 1 (little endian indicator)

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

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

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

-      else return 'wkb';

-    }

-

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

-    if ($bytes[1] == 48 && $bytes[2] == 49) {

-      // The shortest possible WKB string (LINESTRING EMPTY) is 18 hex-chars (9 encoded bytes) long

-      // This differentiates it from a geohash, which is always shorter than 18 characters.

-      if (strlen($input) >= 18) {

-        //@@TODO: Differentiate between EWKB and WKB -- check hex-char 10 or 11 (SRID bool indicator at encoded byte 5)

-        return 'ewkb:1';

-      }

-    }

-

-    // Detect GeoJSON - first char starts with {

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

-      return 'json';

-    }

-

-    // Detect EWKT - first char is S

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

-      return 'ewkt';

-    }

-

-    // Detect WKT - first char starts with P (80), L (76), M (77), or G (71)

-    $wkt_chars = array(80, 76, 77, 71);

-    if (in_array($bytes[1], $wkt_chars)) {

-      return 'wkt';

-    }

-

-    // Detect XML -- first char is <

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

-      // grab the first 256 characters

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

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

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

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

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

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

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

-    }

-

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

-    fseek($mem, 0);

-    $string = trim(fread($mem, 8));

-

-    // Detect geohash - geohash ONLY contains lowercase chars and numerics

-    preg_match('/[a-z0-9]+/', $string, $matches);

-    if ($matches[0] == $string) {

-      return 'geohash';

-    }

-

-    // What do you get when you cross an elephant with a rhino?

-    // http://youtu.be/RCBn5J83Poc

-    return FALSE;

+	$mem = fopen('php://memory', 'r+');

+	fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

+	fseek($mem, 0);

+

+	$bytes = unpack("c*", fread($mem, 11));

+

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

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

+

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

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

+	  return geoPHP::detectFormat(ltrim($input));

+	}

+

+	// Detect WKB or EWKB -- first byte is 1 (little endian indicator)

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

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

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

+	  else return 'wkb';

+	}

+

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

+	if ($bytes[1] == 48 && $bytes[2] == 49) {

+	  // The shortest possible WKB string (LINESTRING EMPTY) is 18 hex-chars (9 encoded bytes) long

+	  // This differentiates it from a geohash, which is always shorter than 18 characters.

+	  if (strlen($input) >= 18) {

+		//@@TODO: Differentiate between EWKB and WKB -- check hex-char 10 or 11 (SRID bool indicator at encoded byte 5)

+		return 'ewkb:1';

+	  }

+	}

+

+	// Detect GeoJSON - first char starts with {

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

+	  return 'json';

+	}

+

+	// Detect EWKT - first char is S

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

+	  return 'ewkt';

+	}

+

+	// Detect WKT - first char starts with P (80), L (76), M (77), or G (71)

+	$wkt_chars = array(80, 76, 77, 71);

+	if (in_array($bytes[1], $wkt_chars)) {

+	  return 'wkt';

+	}

+

+	// Detect XML -- first char is <

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

+	  // grab the first 256 characters

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

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

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

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

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

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

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

+	}

+

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

+	fseek($mem, 0);

+	$string = trim(fread($mem, 8));

+

+	// Detect geohash - geohash ONLY contains lowercase chars and numerics

+	preg_match('/[a-z0-9]+/', $string, $matches);

+	if ($matches[0] == $string) {

+	  return 'geohash';

+	}

+

+	// What do you get when you cross an elephant with a rhino?

+	// http://youtu.be/RCBn5J83Poc

+	return FALSE;

   }

 

 }

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

Doc Comments +3 added lines, -1 removed lines

@@ -113,7 +113,6 @@ 
    * Serializes an object into a geojson string
    *
    *
-   * @param Geometry $obj The object to serialize
    *
    * @return string The GeoJSON string
    */
@@ -126,6 +125,9 @@ 
     }
   }
 
+  /**
+   * @param Geometry $geometry
+   */
   public function getArray($geometry) {
     if ($geometry->getGeomType() == 'GeometryCollection') {
       $component_array = array();

Indentation +89 added lines, -89 removed lines

@@ -16,97 +16,97 @@ 
    * @return object Geometry
    */
   public function read($input) {
-    if (is_string($input)) {
-      $input = json_decode($input);
-    }
-    if (!is_object($input)) {
-      throw new Exception('Invalid JSON');
-    }
-    if (!is_string($input->type)) {
-      throw new Exception('Invalid JSON');
-    }
-
-    // Check to see if it's a FeatureCollection
-    if ($input->type == 'FeatureCollection') {
-      $geoms = array();
-      foreach ($input->features as $feature) {
-        $geoms[] = $this->read($feature);
-      }
-      return geoPHP::geometryReduce($geoms);
-    }
-
-    // Check to see if it's a Feature
-    if ($input->type == 'Feature') {
-      return $this->read($input->geometry);
-    }
-
-    // It's a geometry - process it
-    return $this->objToGeom($input);
+	if (is_string($input)) {
+	  $input = json_decode($input);
+	}
+	if (!is_object($input)) {
+	  throw new Exception('Invalid JSON');
+	}
+	if (!is_string($input->type)) {
+	  throw new Exception('Invalid JSON');
+	}
+
+	// Check to see if it's a FeatureCollection
+	if ($input->type == 'FeatureCollection') {
+	  $geoms = array();
+	  foreach ($input->features as $feature) {
+		$geoms[] = $this->read($feature);
+	  }
+	  return geoPHP::geometryReduce($geoms);
+	}
+
+	// Check to see if it's a Feature
+	if ($input->type == 'Feature') {
+	  return $this->read($input->geometry);
+	}
+
+	// It's a geometry - process it
+	return $this->objToGeom($input);
   }
 
   private function objToGeom($obj) {
-    $type = $obj->type;
+	$type = $obj->type;
 
-    if ($type == 'GeometryCollection') {
-      return $this->objToGeometryCollection($obj);
-    }
-    $method = 'arrayTo' . $type;
-    return $this->$method($obj->coordinates);
+	if ($type == 'GeometryCollection') {
+	  return $this->objToGeometryCollection($obj);
+	}
+	$method = 'arrayTo' . $type;
+	return $this->$method($obj->coordinates);
   }
 
   private function arrayToPoint($array) {
-    return new Point($array[0], $array[1]);
+	return new Point($array[0], $array[1]);
   }
 
   private function arrayToLineString($array) {
-    $points = array();
-    foreach ($array as $comp_array) {
-      $points[] = $this->arrayToPoint($comp_array);
-    }
-    return new LineString($points);
+	$points = array();
+	foreach ($array as $comp_array) {
+	  $points[] = $this->arrayToPoint($comp_array);
+	}
+	return new LineString($points);
   }
 
   private function arrayToPolygon($array) {
-    $lines = array();
-    foreach ($array as $comp_array) {
-      $lines[] = $this->arrayToLineString($comp_array);
-    }
-    return new Polygon($lines);
+	$lines = array();
+	foreach ($array as $comp_array) {
+	  $lines[] = $this->arrayToLineString($comp_array);
+	}
+	return new Polygon($lines);
   }
 
   private function arrayToMultiPoint($array) {
-    $points = array();
-    foreach ($array as $comp_array) {
-      $points[] = $this->arrayToPoint($comp_array);
-    }
-    return new MultiPoint($points);
+	$points = array();
+	foreach ($array as $comp_array) {
+	  $points[] = $this->arrayToPoint($comp_array);
+	}
+	return new MultiPoint($points);
   }
 
   private function arrayToMultiLineString($array) {
-    $lines = array();
-    foreach ($array as $comp_array) {
-      $lines[] = $this->arrayToLineString($comp_array);
-    }
-    return new MultiLineString($lines);
+	$lines = array();
+	foreach ($array as $comp_array) {
+	  $lines[] = $this->arrayToLineString($comp_array);
+	}
+	return new MultiLineString($lines);
   }
 
   private function arrayToMultiPolygon($array) {
-    $polys = array();
-    foreach ($array as $comp_array) {
-      $polys[] = $this->arrayToPolygon($comp_array);
-    }
-    return new MultiPolygon($polys);
+	$polys = array();
+	foreach ($array as $comp_array) {
+	  $polys[] = $this->arrayToPolygon($comp_array);
+	}
+	return new MultiPolygon($polys);
   }
 
   private function objToGeometryCollection($obj) {
-    $geoms = array();
-    if (empty($obj->geometries)) {
-      throw new Exception('Invalid GeoJSON: GeometryCollection with no component geometries');
-    }
-    foreach ($obj->geometries as $comp_object) {
-      $geoms[] = $this->objToGeom($comp_object);
-    }
-    return new GeometryCollection($geoms);
+	$geoms = array();
+	if (empty($obj->geometries)) {
+	  throw new Exception('Invalid GeoJSON: GeometryCollection with no component geometries');
+	}
+	foreach ($obj->geometries as $comp_object) {
+	  $geoms[] = $this->objToGeom($comp_object);
+	}
+	return new GeometryCollection($geoms);
   }
 
   /**
@@ -118,32 +118,32 @@ 
    * @return string The GeoJSON string
    */
   public function write(Geometry $geometry, $return_array = FALSE) {
-    if ($return_array) {
-      return $this->getArray($geometry);
-    }
-    else {
-      return json_encode($this->getArray($geometry));
-    }
+	if ($return_array) {
+	  return $this->getArray($geometry);
+	}
+	else {
+	  return json_encode($this->getArray($geometry));
+	}
   }
 
   public function getArray($geometry) {
-    if ($geometry->getGeomType() == 'GeometryCollection') {
-      $component_array = array();
-      foreach ($geometry->components as $component) {
-        $component_array[] = array(
-          'type' => $component->geometryType(),
-          'coordinates' => $component->asArray(),
-        );
-      }
-      return array(
-        'type'=> 'GeometryCollection',
-        'geometries'=> $component_array,
-      );
-    }
-    else return array(
-      'type'=> $geometry->getGeomType(),
-      'coordinates'=> $geometry->asArray(),
-    );
+	if ($geometry->getGeomType() == 'GeometryCollection') {
+	  $component_array = array();
+	  foreach ($geometry->components as $component) {
+		$component_array[] = array(
+		  'type' => $component->geometryType(),
+		  'coordinates' => $component->asArray(),
+		);
+	  }
+	  return array(
+		'type'=> 'GeometryCollection',
+		'geometries'=> $component_array,
+	  );
+	}
+	else return array(
+	  'type'=> $geometry->getGeomType(),
+	  'coordinates'=> $geometry->asArray(),
+	);
   }
 }
 

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

Doc Comments +3 added lines, -2 removed lines

@@ -18,8 +18,6 @@ 
   /**

    * Read GeoRSS string into geometry objects

    *

-   * @param string $georss - an XML feed containing geoRSS

-   *

    * @return Geometry|GeometryCollection

    */

   public function read($gpx) {

@@ -80,6 +78,9 @@ 
     return geoPHP::geometryReduce($geometries); 

   }

   

+  /**
+   * @param string $string
+   */
   protected function getPointsFromCoords($string) {

     $coords = array();

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

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/GPX.class.php

Doc Comments +3 added lines

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

   }

   

+  /**
+   * @param string $text
+   */
   public function geomFromText($text) {

     // Change to lower-case and strip all CDATA

     $text = strtolower($text);

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;

   }

 

 }

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

Doc Comments +6 added lines

@@ -49,6 +49,9 @@ 
     return $this->geometryToKML($geometry);

   }

 

+  /**
+   * @param string $text
+   */
   public function geomFromText($text) {

 

     // Change to lower-case and strip all CDATA

@@ -184,6 +187,9 @@ 
     return $coordinates;

   }

 

+  /**
+   * @param Geometry $geom
+   */
   private function geometryToKML($geom) {

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

     switch ($type) {

Indentation +168 added lines, -168 removed lines

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

    */

   public function read($kml) {

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

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

   }

 

   /**

@@ -42,218 +42,218 @@ 
    * @return string The KML string representation of the input geometries

    */

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

-    if ($namespace) {

-      $this->namespace = $namespace;

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

-    }

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

+	if ($namespace) {

+	  $this->namespace = $namespace;

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

+	}

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

   }

 

   public function geomFromText($text) {

 

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

-    $text = mb_strtolower($text, mb_detect_encoding($text));

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

-

-    // Load into DOMDOcument

-    $xmlobj = new DOMDocument();

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

-    if ($xmlobj === false) {

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

-    }

-

-    $this->xmlobj = $xmlobj;

-    try {

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

-    } catch(InvalidText $e) {

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

-    } catch(Exception $e) {

-        throw $e;

-    }

-

-    return $geom;

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

+	$text = mb_strtolower($text, mb_detect_encoding($text));

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

+

+	// Load into DOMDOcument

+	$xmlobj = new DOMDocument();

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

+	if ($xmlobj === false) {

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

+	}

+

+	$this->xmlobj = $xmlobj;

+	try {

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

+	} catch(InvalidText $e) {

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

+	} catch(Exception $e) {

+		throw $e;

+	}

+

+	return $geom;

   }

 

   protected function geomFromXML() {

-    $geometries = array();

-    $geom_types = geoPHP::geometryList();

-    $placemark_elements = $this->xmlobj->getElementsByTagName('placemark');

-    if ($placemark_elements->length) {

-      foreach ($placemark_elements as $placemark) {

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

-          // Node names are all the same, except for MultiGeometry, which maps to GeometryCollection

-          $node_name = $child->nodeName == 'multigeometry' ? 'geometrycollection' : $child->nodeName;

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

-            $function = 'parse'.$geom_types[$node_name];

-            $geometries[] = $this->$function($child);

-          }

-        }

-      }

-    }

-    else {

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

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

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

-        $function = 'parse'.$geom_types[$node_name];

-        $geometries[] = $this->$function($this->xmlobj->documentElement);

-      }

-    }

-    return geoPHP::geometryReduce($geometries);

+	$geometries = array();

+	$geom_types = geoPHP::geometryList();

+	$placemark_elements = $this->xmlobj->getElementsByTagName('placemark');

+	if ($placemark_elements->length) {

+	  foreach ($placemark_elements as $placemark) {

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

+		  // Node names are all the same, except for MultiGeometry, which maps to GeometryCollection

+		  $node_name = $child->nodeName == 'multigeometry' ? 'geometrycollection' : $child->nodeName;

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

+			$function = 'parse'.$geom_types[$node_name];

+			$geometries[] = $this->$function($child);

+		  }

+		}

+	  }

+	}

+	else {

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

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

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

+		$function = 'parse'.$geom_types[$node_name];

+		$geometries[] = $this->$function($this->xmlobj->documentElement);

+	  }

+	}

+	return geoPHP::geometryReduce($geometries);

   }

 

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

-    $children = array();

-    if ($xml->childNodes) {

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

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

-          $children[] = $child;

-        }

-      }

-    }

-    return $children;

+	$children = array();

+	if ($xml->childNodes) {

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

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

+		  $children[] = $child;

+		}

+	  }

+	}

+	return $children;

   }

 

   protected function parsePoint($xml) {

-    $coordinates = $this->_extractCoordinates($xml);

-    return new Point($coordinates[0][0],$coordinates[0][1]);

+	$coordinates = $this->_extractCoordinates($xml);

+	return new Point($coordinates[0][0],$coordinates[0][1]);

   }

 

   protected function parseLineString($xml) {

-    $coordinates = $this->_extractCoordinates($xml);

-    $point_array = array();

-    foreach ($coordinates as $set) {

-      $point_array[] = new Point($set[0],$set[1]);

-    }

-    return new LineString($point_array);

+	$coordinates = $this->_extractCoordinates($xml);

+	$point_array = array();

+	foreach ($coordinates as $set) {

+	  $point_array[] = new Point($set[0],$set[1]);

+	}

+	return new LineString($point_array);

   }

 

   protected function parsePolygon($xml) {

-    $components = array();

-

-    $outer_boundary_element_a = $this->childElements($xml, 'outerboundaryis');

-    $outer_boundary_element = $outer_boundary_element_a[0];

-    $outer_ring_element_a = $this->childElements($outer_boundary_element, 'linearring');

-    $outer_ring_element = $outer_ring_element_a[0];

-    $components[] = $this->parseLineString($outer_ring_element);

-

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

-      throw new Exception("Invalid KML");

-    }

-

-    $inner_boundary_element_a = $this->childElements($xml, 'innerboundaryis');

-    if (count($inner_boundary_element_a)) {

-      foreach ($inner_boundary_element_a as $inner_boundary_element) {

-        foreach ($this->childElements($inner_boundary_element, 'linearring') as $inner_ring_element) {

-          $components[] = $this->parseLineString($inner_ring_element);

-        }

-      }

-    }

-

-    return new Polygon($components);

+	$components = array();

+

+	$outer_boundary_element_a = $this->childElements($xml, 'outerboundaryis');

+	$outer_boundary_element = $outer_boundary_element_a[0];

+	$outer_ring_element_a = $this->childElements($outer_boundary_element, 'linearring');

+	$outer_ring_element = $outer_ring_element_a[0];

+	$components[] = $this->parseLineString($outer_ring_element);

+

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

+	  throw new Exception("Invalid KML");

+	}

+

+	$inner_boundary_element_a = $this->childElements($xml, 'innerboundaryis');

+	if (count($inner_boundary_element_a)) {

+	  foreach ($inner_boundary_element_a as $inner_boundary_element) {

+		foreach ($this->childElements($inner_boundary_element, 'linearring') as $inner_ring_element) {

+		  $components[] = $this->parseLineString($inner_ring_element);

+		}

+	  }

+	}

+

+	return new Polygon($components);

   }

 

   protected function parseGeometryCollection($xml) {

-    $components = array();

-    $geom_types = geoPHP::geometryList();

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

-      $nodeName = ($child->nodeName == 'linearring') ? 'linestring' : $child->nodeName;

-      if (array_key_exists($nodeName, $geom_types)) {

-        $function = 'parse'.$geom_types[$nodeName];

-        $components[] = $this->$function($child);

-      }

-    }

-    return new GeometryCollection($components);

+	$components = array();

+	$geom_types = geoPHP::geometryList();

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

+	  $nodeName = ($child->nodeName == 'linearring') ? 'linestring' : $child->nodeName;

+	  if (array_key_exists($nodeName, $geom_types)) {

+		$function = 'parse'.$geom_types[$nodeName];

+		$components[] = $this->$function($child);

+	  }

+	}

+	return new GeometryCollection($components);

   }

 

   protected function _extractCoordinates($xml) {

-    $coord_elements = $this->childElements($xml, 'coordinates');

-    $coordinates = array();

-    if (count($coord_elements)) {

-      $coord_sets = explode(' ', preg_replace('/[\r\n]+/', ' ', $coord_elements[0]->nodeValue));

-      foreach ($coord_sets as $set_string) {

-        $set_string = trim($set_string);

-        if ($set_string) {

-          $set_array = explode(',',$set_string);

-          if (count($set_array) >= 2) {

-            $coordinates[] = $set_array;

-          }

-        }

-      }

-    }

-

-    return $coordinates;

+	$coord_elements = $this->childElements($xml, 'coordinates');

+	$coordinates = array();

+	if (count($coord_elements)) {

+	  $coord_sets = explode(' ', preg_replace('/[\r\n]+/', ' ', $coord_elements[0]->nodeValue));

+	  foreach ($coord_sets as $set_string) {

+		$set_string = trim($set_string);

+		if ($set_string) {

+		  $set_array = explode(',',$set_string);

+		  if (count($set_array) >= 2) {

+			$coordinates[] = $set_array;

+		  }

+		}

+	  }

+	}

+

+	return $coordinates;

   }

 

   private function geometryToKML($geom) {

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

-    switch ($type) {

-      case 'point':

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

-        break;

-      case 'linestring':

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

-        break;

-      case 'polygon':

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

-        break;

-      case 'multipoint':

-      case 'multilinestring':

-      case 'multipolygon':

-      case 'geometrycollection':

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

-        break;

-    }

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

+	switch ($type) {

+	  case 'point':

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

+		break;

+	  case 'linestring':

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

+		break;

+	  case 'polygon':

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

+		break;

+	  case 'multipoint':

+	  case 'multilinestring':

+	  case 'multipolygon':

+	  case 'geometrycollection':

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

+		break;

+	}

   }

 

   private function pointToKML($geom) {

-    return '<'.$this->nss.'Point><'.$this->nss.'coordinates>'.$geom->getX().",".$geom->getY().'</'.$this->nss.'coordinates></'.$this->nss.'Point>';

+	return '<'.$this->nss.'Point><'.$this->nss.'coordinates>'.$geom->getX().",".$geom->getY().'</'.$this->nss.'coordinates></'.$this->nss.'Point>';

   }

 

   private function linestringToKML($geom, $type = FALSE) {

-    if (!$type) {

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

-    }

+	if (!$type) {

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

+	}

 

-    $str = '<'.$this->nss . $type .'>';

+	$str = '<'.$this->nss . $type .'>';

 

-    if (!$geom->isEmpty()) {

-      $str .= '<'.$this->nss.'coordinates>';

-      $i=0;

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

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

-        $str .= $comp->getX() .','. $comp->getY();

-        $i++;

-      }

+	if (!$geom->isEmpty()) {

+	  $str .= '<'.$this->nss.'coordinates>';

+	  $i=0;

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

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

+		$str .= $comp->getX() .','. $comp->getY();

+		$i++;

+	  }

 

-      $str .= '</'.$this->nss.'coordinates>';

-    }

+	  $str .= '</'.$this->nss.'coordinates>';

+	}

 

-    $str .= '</'. $this->nss . $type .'>';

+	$str .= '</'. $this->nss . $type .'>';

 

-    return $str;

+	return $str;

   }

 

   public function polygonToKML($geom) {

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

-    if (!empty($components)) {

-      $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';

-      foreach (array_slice($components, 1) as $comp) {

-        $str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';

-      }

-    }

-

-    return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';

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

+	if (!empty($components)) {

+	  $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';

+	  foreach (array_slice($components, 1) as $comp) {

+		$str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';

+	  }

+	}

+

+	return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';

   }

 

   public function collectionToKML($geom) {

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

-    $str = '<'.$this->nss.'MultiGeometry>';

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

-      $sub_adapter = new KML();

-      $str .= $sub_adapter->write($comp);

-    }

-

-    return $str .'</'.$this->nss.'MultiGeometry>';

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

+	$str = '<'.$this->nss.'MultiGeometry>';

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

+	  $sub_adapter = new KML();

+	  $str .= $sub_adapter->write($comp);

+	}

+

+	return $str .'</'.$this->nss.'MultiGeometry>';

   }

 

 }

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

Doc Comments +12 added lines

@@ -123,6 +123,9 @@ 
     return new Polygon($components);

   }

 

+  /**
+   * @param string $type
+   */
   function getMulti(&$mem, $type) {

     // Get the number of items expected in this multi out of the first 4 bytes

     $multi_length = unpack('L',fread($mem,4));

@@ -196,6 +199,9 @@ 
     }

   }

 

+  /**
+   * @param Geometry $point
+   */
   function writePoint($point) {

     // Set the coords

     $wkb = pack('dd',$point->x(), $point->y());

@@ -215,6 +221,9 @@ 
     return $wkb;

   }

 

+  /**
+   * @param Geometry $poly
+   */
   function writePolygon($poly) {

     // Set the number of lines in this poly

     $wkb = pack('L',$poly->numGeometries());

@@ -227,6 +236,9 @@ 
     return $wkb;

   }

 

+  /**
+   * @param Geometry $geometry
+   */
   function writeMulti($geometry) {

     // Set the number of components

     $wkb = pack('L',$geometry->numGeometries());

Indentation +161 added lines, -161 removed lines

@@ -29,120 +29,120 @@ 
    * @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);

+	}

 

-    if (empty($wkb)) {

-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

-    }

+	if (empty($wkb)) {

+	  throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

+	}

 

-    $mem = fopen('php://memory', 'r+');

-    fwrite($mem, $wkb);

-    fseek($mem, 0);

+	$mem = fopen('php://memory', 'r+');

+	fwrite($mem, $wkb);

+	fseek($mem, 0);

 

-    $geometry = $this->getGeometry($mem);

-    fclose($mem);

-    return $geometry;

+	$geometry = $this->getGeometry($mem);

+	fclose($mem);

+	return $geometry;

   }

 

   function getGeometry(&$mem) {

-    $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));

-    if ($base_info['order'] !== 1) {

-      throw new Exception('Only NDR (little endian) SKB format is supported at the moment');

-    }

-

-    if ($base_info['z']) {

-      $this->dimension++;

-      $this->z = TRUE;

-    }

-    if ($base_info['m']) {

-      $this->dimension++;

-      $this->m = TRUE;

-    }

-

-    // If there is SRID information, ignore it - use EWKB Adapter to get SRID support

-    if ($base_info['s']) {

-      fread($mem, 4);

-    }

-

-    switch ($base_info['type']) {

-      case 1:

-        return $this->getPoint($mem);

-      case 2:

-        return $this->getLinstring($mem);

-      case 3:

-        return $this->getPolygon($mem);

-      case 4:

-        return $this->getMulti($mem,'point');

-      case 5:

-        return $this->getMulti($mem,'line');

-      case 6:

-        return $this->getMulti($mem,'polygon');

-      case 7:

-        return $this->getMulti($mem,'geometry');

-    }

+	$base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));

+	if ($base_info['order'] !== 1) {

+	  throw new Exception('Only NDR (little endian) SKB format is supported at the moment');

+	}

+

+	if ($base_info['z']) {

+	  $this->dimension++;

+	  $this->z = TRUE;

+	}

+	if ($base_info['m']) {

+	  $this->dimension++;

+	  $this->m = TRUE;

+	}

+

+	// If there is SRID information, ignore it - use EWKB Adapter to get SRID support

+	if ($base_info['s']) {

+	  fread($mem, 4);

+	}

+

+	switch ($base_info['type']) {

+	  case 1:

+		return $this->getPoint($mem);

+	  case 2:

+		return $this->getLinstring($mem);

+	  case 3:

+		return $this->getPolygon($mem);

+	  case 4:

+		return $this->getMulti($mem,'point');

+	  case 5:

+		return $this->getMulti($mem,'line');

+	  case 6:

+		return $this->getMulti($mem,'polygon');

+	  case 7:

+		return $this->getMulti($mem,'geometry');

+	}

   }

 

   function getPoint(&$mem) {

-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));

-    return new Point($point_coords[1],$point_coords[2]);

+	$point_coords = unpack("d*", fread($mem,$this->dimension*8));

+	return new Point($point_coords[1],$point_coords[2]);

   }

 

   function getLinstring(&$mem) {

-    // Get the number of points expected in this string out of the first 4 bytes

-    $line_length = unpack('L',fread($mem,4));

-

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

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

-

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

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

-

-    // We have our coords, build up the linestring

-    $components = array();

-    $i = 1;

-    $num_coords = count($line_coords);

-    while ($i <= $num_coords) {

-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

-      $i += 2;

-    }

-    return new LineString($components);

+	// Get the number of points expected in this string out of the first 4 bytes

+	$line_length = unpack('L',fread($mem,4));

+

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

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

+

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

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

+

+	// We have our coords, build up the linestring

+	$components = array();

+	$i = 1;

+	$num_coords = count($line_coords);

+	while ($i <= $num_coords) {

+	  $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

+	  $i += 2;

+	}

+	return new LineString($components);

   }

 

   function getPolygon(&$mem) {

-    // Get the number of linestring expected in this poly out of the first 4 bytes

-    $poly_length = unpack('L',fread($mem,4));

-

-    $components = array();

-    $i = 1;

-    while ($i <= $poly_length[1]) {

-      $components[] = $this->getLinstring($mem);

-      $i++;

-    }

-    return new Polygon($components);

+	// Get the number of linestring expected in this poly out of the first 4 bytes

+	$poly_length = unpack('L',fread($mem,4));

+

+	$components = array();

+	$i = 1;

+	while ($i <= $poly_length[1]) {

+	  $components[] = $this->getLinstring($mem);

+	  $i++;

+	}

+	return new Polygon($components);

   }

 

   function getMulti(&$mem, $type) {

-    // Get the number of items expected in this multi out of the first 4 bytes

-    $multi_length = unpack('L',fread($mem,4));

-

-    $components = array();

-    $i = 1;

-    while ($i <= $multi_length[1]) {

-      $components[] = $this->getGeometry($mem);

-      $i++;

-    }

-    switch ($type) {

-      case 'point':

-        return new MultiPoint($components);

-      case 'line':

-        return new MultiLineString($components);

-      case 'polygon':

-        return new MultiPolygon($components);

-      case 'geometry':

-        return new GeometryCollection($components);

-    }

+	// Get the number of items expected in this multi out of the first 4 bytes

+	$multi_length = unpack('L',fread($mem,4));

+

+	$components = array();

+	$i = 1;

+	while ($i <= $multi_length[1]) {

+	  $components[] = $this->getGeometry($mem);

+	  $i++;

+	}

+	switch ($type) {

+	  case 'point':

+		return new MultiPoint($components);

+	  case 'line':

+		return new MultiLineString($components);

+	  case 'polygon':

+		return new MultiPolygon($components);

+	  case 'geometry':

+		return new GeometryCollection($components);

+	}

   }

 

   /**

@@ -153,90 +153,90 @@ 
    * @return string The WKB 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);

-

-    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;

-    }

+	// 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;

+	}

+

+	if ($write_as_hex) {

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

+	  return $unpacked[1];

+	}

+	else {

+	  return $wkb;

+	}

   }

 

   function writePoint($point) {

-    // Set the coords

-    $wkb = pack('dd',$point->x(), $point->y());

+	// Set the coords

+	$wkb = pack('dd',$point->x(), $point->y());

 

-    return $wkb;

+	return $wkb;

   }

 

   function writeLineString($line) {

-    // Set the number of points in this line

-    $wkb = pack('L',$line->numPoints());

+	// Set the number of points in this line

+	$wkb = pack('L',$line->numPoints());

 

-    // Set the coords

-    foreach ($line->getComponents() as $point) {

-      $wkb .= pack('dd',$point->x(), $point->y());

-    }

+	// Set the coords

+	foreach ($line->getComponents() as $point) {

+	  $wkb .= pack('dd',$point->x(), $point->y());

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

   function writePolygon($poly) {

-    // Set the number of lines in this poly

-    $wkb = pack('L',$poly->numGeometries());

+	// Set the number of lines in this poly

+	$wkb = pack('L',$poly->numGeometries());

 

-    // Write the lines

-    foreach ($poly->getComponents() as $line) {

-      $wkb .= $this->writeLineString($line);

-    }

+	// Write the lines

+	foreach ($poly->getComponents() as $line) {

+	  $wkb .= $this->writeLineString($line);

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

   function writeMulti($geometry) {

-    // Set the number of components

-    $wkb = pack('L',$geometry->numGeometries());

+	// Set the number of components

+	$wkb = pack('L',$geometry->numGeometries());

 

-    // Write the components

-    foreach ($geometry->getComponents() as $component) {

-      $wkb .= $this->write($component);

-    }

+	// Write the components

+	foreach ($geometry->getComponents() as $component) {

+	  $wkb .= $this->write($component);

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

 }

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

Doc Comments +6 added lines, -1 removed lines

@@ -8,7 +8,6 @@ 
   /**
    * Read WKT string into geometry objects
    *
-   * @param string $WKT A WKT string
    *
    * @return Geometry
    */
@@ -184,11 +183,17 @@ 
     else return $str;
   }
   
+  /**
+   * @param string $char
+   */
   protected function beginsWith($str, $char) {
     if (substr($str,0,strlen($char)) == $char) return TRUE;
     else return FALSE;
   }
 
+  /**
+   * @param string $char
+   */
   protected function endsWith($str, $char) {
     if (substr($str,(0 - strlen($char))) == $char) return TRUE;
     else return FALSE;

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/geometry/Polygon.class.php

Doc Comments +3 added lines

@@ -193,6 +193,9 @@
     }
   }
   
+  /**
+   * @param Point $point
+   */
   public function pointOnVertex($point) {
     foreach($this->getPoints() as $vertex) {
       if ($point->equals($vertex)) {

Indentation +117 added lines, -117 removed lines

@@ -9,70 +9,70 @@ 
   protected $geom_type = 'Polygon';
 
   public function area($exterior_only = FALSE, $signed = FALSE) {
-    if ($this->isEmpty()) return 0;
+	if ($this->isEmpty()) return 0;
     
-    if ($this->geos() && $exterior_only == FALSE) {
-      return $this->geos()->area();
-    }
+	if ($this->geos() && $exterior_only == FALSE) {
+	  return $this->geos()->area();
+	}
     
-    $exterior_ring = $this->components[0];
-    $pts = $exterior_ring->getComponents();
+	$exterior_ring = $this->components[0];
+	$pts = $exterior_ring->getComponents();
     
-    $c = count($pts);
-    if((int)$c == '0') return NULL;
-    $a = '0';
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-    }
+	$c = count($pts);
+	if((int)$c == '0') return NULL;
+	$a = '0';
+	foreach($pts as $k => $p){
+	  $j = ($k + 1) % $c;
+	  $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
+	}
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+	if ($signed) $area = ($a / 2);
+	else $area = abs(($a / 2));
     
-    if ($exterior_only == TRUE) {
-      return $area;
-    }
-    foreach ($this->components as $delta => $component) {
-      if ($delta != 0) {
-        $inner_poly = new Polygon(array($component));
-        $area -= $inner_poly->area();
-      }
-    }
-    return $area;
+	if ($exterior_only == TRUE) {
+	  return $area;
+	}
+	foreach ($this->components as $delta => $component) {
+	  if ($delta != 0) {
+		$inner_poly = new Polygon(array($component));
+		$area -= $inner_poly->area();
+	  }
+	}
+	return $area;
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+	if ($this->isEmpty()) return NULL;
     
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->centroid());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->centroid());
+	}
     
-    $exterior_ring = $this->components[0];
-    $pts = $exterior_ring->getComponents();
+	$exterior_ring = $this->components[0];
+	$pts = $exterior_ring->getComponents();
     
-    $c = count($pts);
-    if((int)$c == '0') return NULL;
-    $cn = array('x' => '0', 'y' => '0');
-    $a = $this->area(TRUE, TRUE);
+	$c = count($pts);
+	if((int)$c == '0') return NULL;
+	$cn = array('x' => '0', 'y' => '0');
+	$a = $this->area(TRUE, TRUE);
     
-    // If this is a polygon with no area. Just return the first point.
-    if ($a == 0) {
-      return $this->exteriorRing()->pointN(1);
-    }
+	// If this is a polygon with no area. Just return the first point.
+	if ($a == 0) {
+	  return $this->exteriorRing()->pointN(1);
+	}
     
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
-      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
-    }
+	foreach($pts as $k => $p){
+	  $j = ($k + 1) % $c;
+	  $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
+	  $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
+	  $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
+	}
     
-    $cn['x'] = $cn['x'] / ( 6 * $a);
-    $cn['y'] = $cn['y'] / ( 6 * $a);
+	$cn['x'] = $cn['x'] / ( 6 * $a);
+	$cn['y'] = $cn['y'] / ( 6 * $a);
     
-    $centroid = new Point($cn['x'], $cn['y']);
-    return $centroid;
+	$centroid = new Point($cn['x'], $cn['y']);
+	return $centroid;
   }
 
 	/**
@@ -98,41 +98,41 @@ 
   }
 
   public function exteriorRing() {
-    if ($this->isEmpty()) return new LineString();
-    return $this->components[0];
+	if ($this->isEmpty()) return new LineString();
+	return $this->components[0];
   }
   
   public function numInteriorRings() {
-    if ($this->isEmpty()) return 0;
-    return $this->numGeometries()-1;
+	if ($this->isEmpty()) return 0;
+	return $this->numGeometries()-1;
   }
   
   public function interiorRingN($n) {
-    return $this->geometryN($n+1);
+	return $this->geometryN($n+1);
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
-    return 2;
+	if ($this->isEmpty()) return 0;
+	return 2;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
     
-    $segments = $this->explode();
+	$segments = $this->explode();
     
-    foreach ($segments as $i => $segment) {
-      foreach ($segments as $j => $check_segment) {
-        if ($i != $j) {
-          if ($segment->lineSegmentIntersect($check_segment)) {
-            return FALSE;
-          }
-        }
-      }
-    }
-    return TRUE;
+	foreach ($segments as $i => $segment) {
+	  foreach ($segments as $j => $check_segment) {
+		if ($i != $j) {
+		  if ($segment->lineSegmentIntersect($check_segment)) {
+			return FALSE;
+		  }
+		}
+	  }
+	}
+	return TRUE;
   }
 
   /**
@@ -146,59 +146,59 @@ 
    * @return boolean
    */
   public function pointInPolygon($point, $pointOnBoundary = true, $pointOnVertex = true) {
-    $vertices = $this->getPoints();
+	$vertices = $this->getPoints();
 
-    // Check if the point sits exactly on a vertex
-    if ($this->pointOnVertex($point, $vertices)) {
-      return $pointOnVertex ? TRUE : FALSE;
-    }
+	// Check if the point sits exactly on a vertex
+	if ($this->pointOnVertex($point, $vertices)) {
+	  return $pointOnVertex ? TRUE : FALSE;
+	}
   
-    // Check if the point is inside the polygon or on the boundary
-    $intersections = 0; 
-    $vertices_count = count($vertices);
+	// Check if the point is inside the polygon or on the boundary
+	$intersections = 0; 
+	$vertices_count = count($vertices);
 
-    for ($i=1; $i < $vertices_count; $i++) {
-      $vertex1 = $vertices[$i-1]; 
-      $vertex2 = $vertices[$i];
-      if ($vertex1->y() == $vertex2->y() 
-      && $vertex1->y() == $point->y() 
-      && $point->x() > min($vertex1->x(), $vertex2->x()) 
-      && $point->x() < max($vertex1->x(), $vertex2->x())) {
-        // Check if point is on an horizontal polygon boundary
-        return $pointOnBoundary ? TRUE : FALSE;
-      }
-      if ($point->y() > min($vertex1->y(), $vertex2->y())
-      && $point->y() <= max($vertex1->y(), $vertex2->y())
-      && $point->x() <= max($vertex1->x(), $vertex2->x())
-      && $vertex1->y() != $vertex2->y()) {
-        $xinters = 
-          ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
-          / ($vertex2->y() - $vertex1->y()) 
-          + $vertex1->x();
-        if ($xinters == $point->x()) {
-          // Check if point is on the polygon boundary (other than horizontal)
-          return $pointOnBoundary ? TRUE : FALSE;
-        }
-        if ($vertex1->x() == $vertex2->x() || $point->x() <= $xinters) {
-          $intersections++;
-        }
-      } 
-    } 
-    // If the number of edges we passed through is even, then it's in the polygon.
-    if ($intersections % 2 != 0) {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
+	for ($i=1; $i < $vertices_count; $i++) {
+	  $vertex1 = $vertices[$i-1]; 
+	  $vertex2 = $vertices[$i];
+	  if ($vertex1->y() == $vertex2->y() 
+	  && $vertex1->y() == $point->y() 
+	  && $point->x() > min($vertex1->x(), $vertex2->x()) 
+	  && $point->x() < max($vertex1->x(), $vertex2->x())) {
+		// Check if point is on an horizontal polygon boundary
+		return $pointOnBoundary ? TRUE : FALSE;
+	  }
+	  if ($point->y() > min($vertex1->y(), $vertex2->y())
+	  && $point->y() <= max($vertex1->y(), $vertex2->y())
+	  && $point->x() <= max($vertex1->x(), $vertex2->x())
+	  && $vertex1->y() != $vertex2->y()) {
+		$xinters = 
+		  ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
+		  / ($vertex2->y() - $vertex1->y()) 
+		  + $vertex1->x();
+		if ($xinters == $point->x()) {
+		  // Check if point is on the polygon boundary (other than horizontal)
+		  return $pointOnBoundary ? TRUE : FALSE;
+		}
+		if ($vertex1->x() == $vertex2->x() || $point->x() <= $xinters) {
+		  $intersections++;
+		}
+	  } 
+	} 
+	// If the number of edges we passed through is even, then it's in the polygon.
+	if ($intersections % 2 != 0) {
+	  return TRUE;
+	}
+	else {
+	  return FALSE;
+	}
   }
   
   public function pointOnVertex($point) {
-    foreach($this->getPoints() as $vertex) {
-      if ($point->equals($vertex)) {
-        return true;
-      }
-    }
+	foreach($this->getPoints() as $vertex) {
+	  if ($point->equals($vertex)) {
+		return true;
+	  }
+	}
   }