Merge pull request #132 from ddproxy/develop

To GeoJSON and tests

Author: ddproxy

composer.json

@@ -19,7 +19,7 @@
     "require-dev": {
         "phpunit/phpunit": "<5.0",
         "phpunit/phpcov": "*",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "~1.0"
     },
     "autoload": {
         "psr-0": {

lib/CrEOF/Spatial/PHP/Types/AbstractGeometry.php

@@ -55,6 +55,16 @@ public function __toString()
         return $this->$method($this->toArray());
     }
 
+    /**
+     * @return string
+     */
+    public function toJson()
+    {
+        $json['type'] = $this->getType();
+        $json['coordinates'] = $this->toArray();
+        return json_encode($json);
+    }
+
     /**
      * @return null|int
      */

tests/CrEOF/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/STSummarayTest.php renamed to tests/CrEOF/Spatial/Tests/ORM/Query/AST/Functions/PostgreSql/STSummaryTest.php

@@ -157,7 +157,7 @@ public function testBadLineString()
 
     public function testLineStringFromArraysToString()
     {
-        $expected   = '0 0,0 5,5 0,0 0';
+        $expected = '0 0,0 5,5 0,0 0';
         $lineString = new LineString(
             array(
                 array(0, 0),
@@ -169,4 +169,19 @@ public function testLineStringFromArraysToString()
 
         $this->assertEquals($expected, (string) $lineString);
     }
+
+    public function testJson()
+    {
+        $expected = "{\"type\":\"LineString\",\"coordinates\":[[0,0],[0,5],[5,0],[0,0]]}";
+
+        $lineString = new LineString(
+            array(
+                array(0, 0),
+                array(0, 5),
+                array(5, 0),
+                array(0, 0)
+            )
+        );
+        $this->assertEquals($expected, $lineString->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/LineStringTest.php

@@ -205,4 +205,28 @@ public function testMultiLineStringFromArraysToString()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testJson()
+    {
+        $expected = '{"type":"MultiLineString","coordinates":[[[0,0],[10,0],[10,10],[0,10],[0,0]],[[0,0],[10,0],[10,10],[0,10],[0,0]]]}';
+        $lineStrings = array(
+            array(
+                array(0, 0),
+                array(10, 0),
+                array(10, 10),
+                array(0, 10),
+                array(0, 0)
+            ),
+            array(
+                array(0, 0),
+                array(10, 0),
+                array(10, 10),
+                array(0, 10),
+                array(0, 0)
+            )
+        );
+        $multiLineString = new MultiLineString($lineStrings);
+
+        $this->assertEquals($expected, $multiLineString->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/MultiLineStringTest.php

@@ -141,4 +141,19 @@ public function testMultiPointFromArraysToString()
 
         $this->assertEquals($expected, (string) $multiPoint);
     }
+
+    public function testJson()
+    {
+        $expected   = '{"type":"MultiPoint","coordinates":[[0,0],[0,5],[5,0],[0,0]]}';
+        $multiPoint = new MultiPoint(
+            array(
+                array(0, 0),
+                array(0, 5),
+                array(5, 0),
+                array(0, 0)
+            )
+        );
+
+        $this->assertEquals($expected, $multiPoint->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/MultiPointTest.php

@@ -233,4 +233,32 @@ public function testSolidMultiPolygonFromArraysToString()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testJson()
+    {
+        $expected = '{"type":"MultiPolygon","coordinates":[[[[0,0],[10,0],[10,10],[0,10],[0,0]]],[[[5,5],[7,5],[7,7],[5,7],[5,5]]]]}';
+        $polygons = array(
+            array(
+                array(
+                    array(0, 0),
+                    array(10, 0),
+                    array(10, 10),
+                    array(0, 10),
+                    array(0, 0)
+                )
+            ),
+            array(
+                array(
+                    array(5, 5),
+                    array(7, 5),
+                    array(7, 7),
+                    array(5, 7),
+                    array(5, 5)
+                )
+            )
+        );
+        $multiPolygon = new MultiPolygon($polygons);
+
+        $this->assertEquals($expected, $multiPolygon->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/MultiPolygonTest.php

@@ -219,4 +219,12 @@ public function testPointWrongArgumentTypes()
     {
         new Point(array(), array(), '1234');
     }
+
+    public function testJson()
+    {
+        $expected = '{"type":"Point","coordinates":[5,5]}';
+        $point = new Point(array(5, 5));
+
+        $this->assertEquals($expected, $point->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/PointTest.php

@@ -193,4 +193,28 @@ public function testSolidPolygonFromArraysToString()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testJson()
+    {
+        $expected = '{"type":"Polygon","coordinates":[[[0,0],[10,0],[10,10],[0,10],[0,0]],[[0,0],[10,0],[10,10],[0,10],[0,0]]]}';
+        $rings = array(
+            array(
+                array(0, 0),
+                array(10, 0),
+                array(10, 10),
+                array(0, 10),
+                array(0, 0)
+            ),
+            array(
+                array(0, 0),
+                array(10, 0),
+                array(10, 10),
+                array(0, 10),
+                array(0, 0)
+            )
+        );
+        $polygon = new Polygon($rings);
+
+        $this->assertEquals($expected, $polygon->toJson());
+    }
 }

tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/PolygonTest.php

@@ -19,7 +19,7 @@
     "require-dev": {
         "phpunit/phpunit": "<5.0",
         "phpunit/phpcov": "*",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "~1.0"
     },
     "autoload": {
         "psr-0": {