Ysurac / FlightAirMap

install/class.create_db.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 
 class create_db {
+
+	/**
+	 * @param string $filename
+	 */
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();

Indentation +5 added lines, -5 removed lines

@@ -29,9 +29,9 @@ 
 			}
 			fclose($handle);
 		}
-                //Connection::$db->commit();
-                $Connection->db = null;
-                return '';
+				//Connection::$db->commit();
+				$Connection->db = null;
+				return '';
 	}
 
 	public static function import_all_db($directory) {
@@ -40,7 +40,7 @@ 
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
 		while(false !== ($filename = readdir($dh)))
 		{
-		    if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+			if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
 		}
 		return $error;
 	}
@@ -55,7 +55,7 @@ 
 		$host = filter_var($host,FILTER_SANITIZE_STRING);
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
-		    $grantright = $_SERVER['SERVER_ADDR'];
+			$grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
 			$dbh = new PDO($db_type.':host='.$host,$root,$root_pass);

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

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Indentation +9 added lines, -9 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 if (!function_exists("gettext")) {
-        function _($text) {
-                return $text;
-        }
+		function _($text) {
+				return $text;
+		}
 } else {
 	if (isset($_COOKIE['language']) && $_COOKIE['language'] != 'en_GB' && (isset($globalTranslate) && $globalTranslate)) {
 		$Language = new Language();
@@ -75,9 +75,9 @@ 
 			);
 
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{
@@ -103,9 +103,9 @@ 
 	}
 
 	/**
-	* Returns list of available languages
-	*
-	* @return array
+	 * Returns list of available languages
+	 *
+	 * @return array
 	 */
 	public function getLanguages()
 	{

require/class.Translation.php

Doc Comments +8 added lines

@@ -58,6 +58,10 @@ 
                 } else return $ident;
         }
 
+       /**
+        * @param string $correct_ident
+        * @param string $source
+        */
        public function addOperator($ident,$correct_ident,$source) {
                 $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
                 $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
@@ -69,6 +73,10 @@ 
                 }
         }
 
+       /**
+        * @param string $correct_ident
+        * @param string $source
+        */
        public function updateOperator($ident,$correct_ident,$source) {
                 $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
                 $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);

Indentation +79 added lines, -79 removed lines

@@ -7,91 +7,91 @@ 
 
 
 class Translation {
-    public $db;
-    public function __construct($dbc = null) {
-	    $Connection = new Connection($dbc);
-	    $this->db = $Connection->db();
-    }
+	public $db;
+	public function __construct($dbc = null) {
+		$Connection = new Connection($dbc);
+		$this->db = $Connection->db();
+	}
 
-    /**
-    * Change IATA to ICAO value for ident
-    * 
-    * @param String $ident ident
-    * @return String the icao
-    */
-    public function ident2icao($ident) {
+	/**
+	 * Change IATA to ICAO value for ident
+	 * 
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
+	public function ident2icao($ident) {
 	$Spotter = new Spotter();
 	if (!is_numeric(substr($ident, 0, 3)))
-        {
-	    if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
-        	$airline_icao = substr($ident, 0, 2);
-            } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
-        	//$airline_icao = substr($ident, 0, 3);
-        	return $ident;
-            } else return $ident;
-        } else return $ident;
-        if ($airline_icao == 'AF') {
-            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-            else $icao = 'AFR'.ltrim(substr($ident,2),'0');
-        } else {
-            $identicao = $Spotter->getAllAirlineInfo($airline_icao);
-            if (isset($identicao[0])) {
-                $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-            } else $icao = $ident;
-        }
-        return $icao;
-    }
+		{
+		if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
+			$airline_icao = substr($ident, 0, 2);
+			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
+			//$airline_icao = substr($ident, 0, 3);
+			return $ident;
+			} else return $ident;
+		} else return $ident;
+		if ($airline_icao == 'AF') {
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		} else {
+			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
+			if (isset($identicao[0])) {
+				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+			} else $icao = $ident;
+		}
+		return $icao;
+	}
 
 
-       public function getOperator($ident) {
-                $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
-                $query_values = array(':ident' => $ident);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                $sth->closeCursor();
-                if (count($row) > 0) {
-                        return $row['operator_correct'];
-                } else return $ident;
-        }
+	   public function getOperator($ident) {
+				$query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				$sth->closeCursor();
+				if (count($row) > 0) {
+						return $row['operator_correct'];
+				} else return $ident;
+		}
 
-       public function addOperator($ident,$correct_ident,$source) {
-                $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function addOperator($ident,$correct_ident,$source) {
+				$query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function updateOperator($ident,$correct_ident,$source) {
-                $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function updateOperator($ident,$correct_ident,$source) {
+				$query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function checkTranslation($ident,$web = false) {
-    	    global $globalTranslationSources, $globalTranslationFetch;
-    	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
-    	    $globalTranslationSources = array();
-    	    if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
-    	    //echo "Check Translation for ".$ident."...";
-    	    $correct = $this->getOperator($ident);
-    	    if ($correct != '' && $correct != $ident) {
-    		//echo "Found in DB !\n";
-    		 return $correct;
-    	    } /*
+		public function checkTranslation($ident,$web = false) {
+			global $globalTranslationSources, $globalTranslationFetch;
+			//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
+			$globalTranslationSources = array();
+			if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+			//echo "Check Translation for ".$ident."...";
+			$correct = $this->getOperator($ident);
+			if ($correct != '' && $correct != $ident) {
+			//echo "Found in DB !\n";
+			 return $correct;
+			} /*
     	    elseif ($web && $globalTranslationFetch) {
     		if (! is_numeric(substr($ident,-4))) {
     		    if (count($globalTranslationSources) > 0) {
@@ -108,8 +108,8 @@ 
     		}
     	    }
     	    */
-    	    return $this->ident2icao($ident);
-        }
+			return $this->ident2icao($ident);
+		}
 
 /*  
     function fromPlanefinder($icao) {

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

   }

 

 }