Merge pull request grimzy#128 from grimzy/issue-58-fix-retrieving-empty-geometry-collection

grimzy · web-flow · commit 7f62564f996e · 2020-03-08T22:30:58.000-04:00
Fix issue where the WKB of empty GeometryCollections was not getting parsed
diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
@@ -104,7 +104,7 @@ public function setRawAttributes(array $attributes, $sync = false)
         $spatial_fields = $this->getSpatialFields();
 
         foreach ($attributes as $attribute => &$value) {
-            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 15) {
+            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 13) {
                 $value = Geometry::fromWKB($value);
             }
         }
diff --git a/tests/Integration/Models/GeometryModel.php b/tests/Integration/Models/GeometryModel.php
@@ -9,5 +9,5 @@ class GeometryModel extends Model
 
     protected $table = 'geometry';
 
-    protected $spatialFields = ['location', 'line'];
+    protected $spatialFields = ['location', 'line', 'multi_geometries'];
 }
diff --git a/tests/Integration/SpatialTest.php b/tests/Integration/SpatialTest.php
@@ -251,6 +251,10 @@ public function testInsertEmptyGeometryCollection()
         $geo->multi_geometries = new GeometryCollection([]);
         $geo->save();
         $this->assertDatabaseHas('geometry', ['id' => $geo->id]);
+
+        $geo2 = GeometryModel::find($geo->id);
+        $this->assertInstanceOf(GeometryCollection::class, $geo2->multi_geometries);
+        $this->assertEquals(0, count($geo2->multi_geometries));
     }
 
     public function testUpdate()

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function setRawAttributes(array $attributes, $sync = false)`
`104`	`104`	`$spatial_fields = $this->getSpatialFields();`
`105`	`105`
`106`	`106`	`foreach ($attributes as $attribute => &$value) {`
`107`		`- if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 15) {`
	`107`	`+ if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 13) {`
`108`	`108`	`$value = Geometry::fromWKB($value);`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ class GeometryModel extends Model`
`9`	`9`
`10`	`10`	`protected $table = 'geometry';`
`11`	`11`
`12`		`- protected $spatialFields = ['location', 'line'];`
	`12`	`+ protected $spatialFields = ['location', 'line', 'multi_geometries'];`
`13`	`13`	`}`