Merge branch 'master' of github.com:phayes/geoPHP

vlasvlasvlas · Jul 6, 2012 · 8943bed · 8943bed
2 parents 668db9d + 98d3f1b
commit 8943bed
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/lib/adapters/GPX.class.php b/lib/adapters/GPX.class.php
@@ -16,9 +16,9 @@ class GPX extends GeoAdapter
   private $nss = ''; // Name-space string. eg 'georss:'
 
   /**
-   * Read KML string into geometry objects
+   * Read GPX string into geometry objects
    *
-   * @param string $kml A KML string
+   * @param string $gpx A GPX string
    *
    * @return Geometry|GeometryCollection
    */
@@ -47,7 +47,7 @@ public function geomFromText($text) {
     $text = strtolower($text);
     $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
 
-    // Load into DOMDOcument
+    // Load into DOMDocument
     $xmlobj = new DOMDocument();
     @$xmlobj->loadXML($text);
     if ($xmlobj === false) {

diff --git a/lib/adapters/GeoJSON.class.php b/lib/adapters/GeoJSON.class.php
@@ -37,7 +37,7 @@ public function read($input) {
 
     // Check to see if it's a Feature
     if ($input->type == 'Feature') {
-      return $this->read($feature->geometry);
+      return $this->read($input->geometry);
     }
 
     // It's a geometry - process it

diff --git a/lib/geometry/Collection.class.php b/lib/geometry/Collection.class.php
@@ -165,7 +165,7 @@ public function length() {
       $next_point = $this->geometryN($delta);
       if ($next_point) {
         // Pythagorean Theorem
-        $distance = sqrt(($next_point->getX() - $point->getX())^2+($next_point->getY()- $point->getY())^2);
+        $distance = sqrt(pow(($next_point->getX() - $point->getX()), 2) + pow(($next_point->getY()- $point->getY()), 2));
         $length += $distance;
       }
     }

diff --git a/lib/geometry/Polygon.class.php b/lib/geometry/Polygon.class.php
@@ -75,6 +75,28 @@ public function centroid() {
     return $centroid;
   }
 
+	/**
+	 * Find the outermost point from the centroid
+	 *
+	 * @returns Point The outermost point
+	 */
+  public function outermostPoint() {
+		$centroid = $this->getCentroid();
+
+		$max = array('length' => 0, 'point' => null);
+
+		foreach($this->getPoints() as $point) {
+			$lineString = new LineString(array($centroid, $point));
+
+			if($lineString->length() > $max['length']) {
+				$max['length'] = $lineString->length();
+				$max['point'] = $point;
+			}
+		}
+
+		return $max['point'];
+  }
+
   public function exteriorRing() {
     if ($this->isEmpty()) return new LineString();
     return $this->components[0];

diff --git a/tests/input/paths_big.json b/tests/input/paths_big.json
diff --git a/tests/input/simple_point.json b/tests/input/simple_point.json
@@ -0,0 +1 @@
+{"type": "Feature", "geometry": {"type": "Point", "coordinates": [-80.73029, 35.3936]}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"type": "Feature", "geometry": {"type": "Point", "coordinates": [-80.73029, 35.3936]}}