- (Feature) Added ability to add circles to a map from the fieldtype.

- (Feature) Added new GoogleMaps.Circle class for the plugin.js to plot circles on the front-end
objectivehtml · Sep 12, 2014 · 7c08372 · 7c08372
1 parent ef42cec
commit 7c08372
Show file tree

Hide file tree

Showing 19 changed files with 3,300 additions and 315 deletions.
diff --git a/GoogleMapsPlugin.php b/GoogleMapsPlugin.php
@@ -10,7 +10,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '0.5.3';
+        return '0.6.0';
     }
 
     public function getDeveloper()

diff --git a/config.php b/config.php
@@ -18,6 +18,7 @@
 		array('label' => 'Routes', 'value' => 'routes'),
 		array('label' => 'Polygons', 'value' => 'polygons'),
 		array('label' => 'Polylines', 'value' => 'polylines'),
+		array('label' => 'Circles', 'value' => 'circles'),
 	)
 
 );
diff --git a/fieldtypes/GoogleMaps_GoogleMapFieldType.php b/fieldtypes/GoogleMaps_GoogleMapFieldType.php
@@ -104,6 +104,19 @@ public function onAfterElementSave()
                     $route->isNew = false;
                 }
             }
+
+            foreach($data->circles as $index => $circle)
+            {
+                if($circle->deleted)
+                {
+                    $data->removeCircle($index);
+                }
+                else
+                {
+                    $circle->elementId = $this->element->id;
+                    $circle->isNew = false;
+                }
+            }
         }
 
         if(isset($this->element->$handle))

diff --git a/models/GoogleMaps_CircleModel.php b/models/GoogleMaps_CircleModel.php
@@ -0,0 +1,39 @@
+<?php
+namespace Craft;
+
+class GoogleMaps_CircleModel extends BaseModel
+{
+    public function toJson()
+    {
+        return json_encode($this->getAttributes());
+    }
+
+    public function getStaticMapParameters()
+    {
+        // return 'markers=' . urldecode(!empty($this->address) ? $this->address : $this->lat.','.$this->lng);
+    }
+
+    protected function defineAttributes()
+    {
+        return array(
+            // Location Parameters
+            'title'   => array(AttributeType::String, 'default' => ''),
+            'content'   => array(AttributeType::String, 'default' => ''),
+            'lat'   => array(AttributeType::Number, 'default' => 0),
+            'lng'   => array(AttributeType::Number, 'default' => 0),
+            'metric' => array(AttributeType::String, 'default' => ''),
+            'radius' => array(AttributeType::String, 'default' => ''),
+            'address' => array(AttributeType::String, 'default' => ''),
+            'addressComponents' => array(AttributeType::Mixed, 'default' => array()),
+            'hideDetails' => array(AttributeType::Mixed, 'default' => true),
+            'strokeColor' => array(AttributeType::Mixed, 'default' => null),
+            'strokeWeight' => array(AttributeType::Mixed, 'default' => null),
+            'strokeOpacity' => array(AttributeType::Mixed, 'default' => null),
+            'fillColor' => array(AttributeType::Mixed, 'default' => null),
+            'fillOpacity' => array(AttributeType::Mixed, 'default' => null),
+            'isNew' => array(AttributeType::Bool, 'default' => true),
+            'elementId'   => array(AttributeType::Mixed, 'default' => false),
+            'deleted' => array(AttributeType::Bool, 'default' => false),
+        );
+    }
+}
diff --git a/models/GoogleMaps_MapDataModel.php b/models/GoogleMaps_MapDataModel.php
@@ -72,6 +72,21 @@ public function __construct($data, $queryParams = false)
         }
 
         $this->polylines = $polylines;
+
+
+        $circles = array();
+
+        foreach($this->circles as $circle)
+        {
+            if(get_class($circle) != 'Craft\GoogleMaps_CircleModel')
+            {
+                $circle = GoogleMaps_CircleModel::populateModel((array) $circle);
+            }
+
+            $circles[] = $circle;
+        }
+
+        $this->circles = $circles;
     }
 
     public function markers()
@@ -205,6 +220,35 @@ public function getRoute($index)
         return null;
     }
 
+    public function getCircles()
+    {
+        $return = array();
+
+        foreach($this->circles as $circle)
+        {
+            if(get_class($circle) != 'Craft\GoogleMaps_CircleModel')
+            {
+                $circle = GoogleMaps_CircleModel::populateModel((array) $circle);
+            }
+
+            $return[] = $circle;
+        }
+
+        return $return;
+    }
+
+    public function getCircle($index)
+    {
+        $circles = $this->getCircles();
+
+        if(isset($circles[$index]))
+        {
+            return $circles[$index];
+        }
+
+        return null;
+    }
+
     public function sortByDistanceAsc($a, $b)
     {
         return $a->distance < $b->distance ? -1 : 1;
@@ -221,7 +265,8 @@ public function toJson()
             'markers' => array(),
             'polygons' => array(),
             'polylines' => array(),
-            'routes' => array()
+            'routes' => array(),
+            'circles' => array()
         );
 
         foreach($this->getMarkers() as $marker)
@@ -244,6 +289,11 @@ public function toJson()
             $return['routes'][] = $route->getAttributes();
         }
 
+        foreach($this->getCircles() as $circle)
+        {
+            $return['circles'][] = $circle->getAttributes();
+        }
+
         return json_encode($return);
     }
 
@@ -265,6 +315,24 @@ public function removeMarker($index)
         $this->markers = $markers;
     }
 
+    public function addCircle(GoogleMaps_CircleModel $circle)
+    {
+        $circles = $this->circles;
+
+        $circles[] = $circle;
+
+        $this->circles = $circles;
+    }
+
+    public function removeCircle($index)
+    {
+        $circles = $this->circles;
+
+        unset($circles[$index]);
+
+        $this->circles = $circles;
+    }
+
     public function addPolygon(GoogleMaps_PolygonModel $polygon)
     {
         $polylines = $this->polylines;
@@ -333,11 +401,11 @@ public function getStaticMapModel($options = array())
     protected function defineAttributes()
     {
         return array(
-            // Location Parameters
-            'markers'   => array(AttributeType::Mixed, 'default' => array()),
-            'polygons'   => array(AttributeType::Mixed, 'default' => array()),
-            'polylines'   => array(AttributeType::Mixed, 'default' => array()),
-            'routes'   => array(AttributeType::Mixed, 'default' => array())
+            'markers' => array(AttributeType::Mixed, 'default' => array()),
+            'polygons' => array(AttributeType::Mixed, 'default' => array()),
+            'polylines' => array(AttributeType::Mixed, 'default' => array()),
+            'routes' => array(AttributeType::Mixed, 'default' => array()),
+            'circles' => array(AttributeType::Mixed, 'default' => array())
         );
 
     }

diff --git a/resources/css/app.css b/resources/css/app.css
@@ -45,7 +45,10 @@
 
 h2 .oh-google-map-small-text { margin-left: 10px; }
 
-.oh-google-map-margin-bottom, p.oh-google-map-margin-bottom { margin: 0 0 15px !important; }
+.oh-google-map-margin-top, p.oh-google-map-margin-top { margin-top: 15px !important; }
+.oh-google-map-margin-bottom, p.oh-google-map-margin-bottom { margin-bottom: 15px !important; }
+.oh-google-map-margin-left, p.oh-google-map-margin-left { margin-left: 15px !important; }
+.oh-google-map-margin-right, p.oh-google-map-margin-right { margin-right: 15px !important; }
 
 .oh-google-map-no-margin { margin: 0 !important; }
 .oh-google-map-no-padding { padding: 0 !important; }

diff --git a/resources/css/app.min.css b/resources/css/app.min.css
diff --git a/resources/css/fieldtype.css b/resources/css/fieldtype.css
@@ -45,7 +45,10 @@
 
 h2 .oh-google-map-small-text { margin-left: 10px; }
 
-.oh-google-map-margin-bottom, p.oh-google-map-margin-bottom { margin: 0 0 15px !important; }
+.oh-google-map-margin-top, p.oh-google-map-margin-top { margin-top: 15px !important; }
+.oh-google-map-margin-bottom, p.oh-google-map-margin-bottom { margin-bottom: 15px !important; }
+.oh-google-map-margin-left, p.oh-google-map-margin-left { margin-left: 15px !important; }
+.oh-google-map-margin-right, p.oh-google-map-margin-right { margin-right: 15px !important; }
 
 .oh-google-map-no-margin { margin: 0 !important; }
 .oh-google-map-no-padding { padding: 0 !important; }