Merge pull request #24 from rogue780/dev

Allow for unspecified geometry in postgisFields

Author: phaza

src/Eloquent/PostgisTrait.php

@@ -1,12 +1,15 @@
 <?php namespace Phaza\LaravelPostgis\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Support\Arr;
 use Phaza\LaravelPostgis\Exceptions\PostgisFieldsNotDefinedException;
 use Phaza\LaravelPostgis\Geometries\Geometry;
 use Phaza\LaravelPostgis\Geometries\GeometryInterface;
 
 trait PostgisTrait
 {
+
+    public $geometries = [];
     /**
      * Create a new Eloquent query builder for the model.
      *
@@ -22,16 +25,23 @@ protected function performInsert(EloquentBuilder $query, array $options = [])
     {
         foreach ($this->attributes as $key => &$value) {
             if ($value instanceof GeometryInterface) {
+                $this->geometries[$key] = $value; //Preserve the geometry objects prior to the insert
                 $value = $this->getConnection()->raw(sprintf("ST_GeogFromText('%s')", $value->toWKT()));
             }
         }
 
-        return parent::performInsert($query, $options);
+        $insert = parent::performInsert($query, $options);
+
+        foreach($this->geometries as $key => $value){
+            $this->attributes[$key] = $value; //Retrieve the geometry objects so they can be used in the model
+        }
+
+        return $insert; //Return the result of the parent insert
     }
 
     public function setRawAttributes(array $attributes, $sync = false)
     {
-        $pgfields = array_keys($this->getPostgisFields());
+        $pgfields = $this->getPostgisFields();
 
         foreach ($attributes as $attribute => &$value) {
             if (in_array($attribute, $pgfields) && is_string($value) && strlen($value) >= 15) {
@@ -45,7 +55,9 @@ public function setRawAttributes(array $attributes, $sync = false)
     public function getPostgisFields()
     {
         if (property_exists($this, 'postgisFields')) {
-            return $this->postgisFields;
+            return Arr::isAssoc($this->postgisFields) ? //Is the array associative?
+                array_keys($this->postgisFields) : //Returns just the keys to preserve compatibility with previous versions
+                $this->postgisFields; //Returns the non-associative array that doesn't define the geometry type.
         } else {
             throw new PostgisFieldsNotDefinedException(__CLASS__ . ' has to define $postgisFields');
         }