Merge pull request #10 from MetalMatze/feature/geojson

All geometry objects implement JsonSerializable

Author: phaza

composer.json

@@ -11,7 +11,8 @@
         "php": ">=5.5",
         "illuminate/database": "~5.0",
         "bosnadev/database": "~0.1",
-        "geo-io/wkb-parser": "~1.0"
+        "geo-io/wkb-parser": "~1.0",
+        "jmikola/geojson": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.5",

src/Geometries/Geometry.php

@@ -3,7 +3,7 @@
 use GeoIO\WKB\Parser\Parser;
 use Phaza\LaravelPostgis\Exceptions\UnknownWKTTypeException;
 
-abstract class Geometry implements GeometryInterface
+abstract class Geometry implements GeometryInterface, \JsonSerializable
 {
     protected static $wkb_types = [
         1 => Point::class,

src/Geometries/GeometryCollection.php

@@ -1,6 +1,7 @@
 <?php namespace Phaza\LaravelPostgis\Geometries;
 
 use Countable;
+use GeoJson\GeoJson;
 use InvalidArgumentException;
 
 class GeometryCollection extends Geometry implements Countable
@@ -71,4 +72,19 @@ public function count()
     {
         return count($this->geometries);
     }
+
+    /**
+     * Convert to GeoJson GeometryCollection that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\GeometryCollection
+     */
+    public function jsonSerialize()
+    {
+        $geometries = [];
+        foreach ($this->geometries as $geometry) {
+            $geometries[] = $geometry->jsonSerialize();
+        }
+
+        return new \GeoJson\Geometry\GeometryCollection($geometries);
+    }
 }

src/Geometries/LineString.php

@@ -28,4 +28,19 @@ public function __toString()
     {
         return $this->toPairList();
     }
+
+    /**
+     * Convert to GeoJson LineString that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\LineString
+     */
+    public function jsonSerialize()
+    {
+        $points = [];
+        foreach ($this->points as $point) {
+            $points[] = $point->jsonSerialize();
+        }
+
+        return new \GeoJson\Geometry\LineString($points);
+    }
 }

src/Geometries/MultiLineString.php

@@ -62,4 +62,20 @@ public function count()
     {
         return count($this->linestrings);
     }
+
+    /**
+     * Convert to GeoJson Point that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\MultiLineString
+     */
+    public function jsonSerialize()
+    {
+        $linestrings = [];
+
+        foreach ($this->linestrings as $linestring) {
+            $linestrings[] = $linestring->jsonSerialize();
+        }
+
+        return new \GeoJson\Geometry\MultiLineString($linestrings);
+    }
 }

src/Geometries/MultiPoint.php

@@ -1,6 +1,6 @@
 <?php namespace Phaza\LaravelPostgis\Geometries;
 
-class MultiPoint extends PointCollection implements GeometryInterface
+class MultiPoint extends PointCollection implements GeometryInterface, \JsonSerializable
 {
     public function toWKT()
     {
@@ -36,4 +36,19 @@ public function __toString()
             return sprintf('(%s)', $point->toPair());
         }, $this->points));
     }
+
+    /**
+     * Convert to GeoJson MultiPoint that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\MultiPoint
+     */
+    public function jsonSerialize()
+    {
+        $points = [];
+        foreach ($this->points as $point) {
+            $points[] = $point->jsonSerialize();
+        }
+
+        return new \GeoJson\Geometry\MultiPoint($points);
+    }
 }

src/Geometries/MultiPolygon.php

@@ -99,4 +99,19 @@ protected static function assembleParts(array $parts)
 
         return $polygons;
     }
+
+    /**
+     * Convert to GeoJson MultiPolygon that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\MultiPolygon
+     */
+    public function jsonSerialize()
+    {
+        $polygons = [];
+        foreach ($this->polygons as $polygon) {
+            $polygons[] = $polygon->jsonSerialize();
+        }
+
+        return new \GeoJson\Geometry\MultiPolygon($polygons);
+    }
 }

src/Geometries/Point.php

@@ -1,5 +1,7 @@
 <?php namespace Phaza\LaravelPostgis\Geometries;
 
+use GeoJson\GeoJson;
+
 class Point extends Geometry
 {
     protected $lat;
@@ -57,4 +59,15 @@ public function __toString()
     {
         return $this->getLng() . ' ' . $this->getLat();
     }
+
+    /**
+     * Convert to GeoJson Point that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\Point
+     */
+    public function jsonSerialize()
+    {
+        // !!! This will convert LngLat from PostGIS to ISO 6709 LatLng !!!
+        return new \GeoJson\Geometry\Point([$this->getLat(), $this->getLng()]);
+    }
 }

src/Geometries/PointCollection.php

@@ -6,8 +6,9 @@
 use Illuminate\Contracts\Support\Arrayable;
 use InvalidArgumentException;
 use IteratorAggregate;
+use JsonSerializable;
 
-class PointCollection implements IteratorAggregate, Arrayable, ArrayAccess, Countable
+abstract class PointCollection implements IteratorAggregate, Arrayable, ArrayAccess, Countable, JsonSerializable
 {
     /**
      * @var Point[]

src/Geometries/Polygon.php

@@ -9,4 +9,19 @@ public function toWKT()
     {
         return sprintf('POLYGON(%s)', (string)$this);
     }
+
+    /**
+     * Convert to GeoJson Polygon that is jsonable to GeoJSON
+     *
+     * @return \GeoJson\Geometry\Polygon
+     */
+    public function jsonSerialize()
+    {
+        $linearrings = [];
+        foreach ($this->linestrings as $linestring) {
+            $linearrings[] = new \GeoJson\Geometry\LinearRing($linestring->jsonSerialize()->getCoordinates());
+        }
+
+        return new \GeoJson\Geometry\Polygon($linearrings);
+    }
 }