Add default zoom, coordinate settings

mikebronner · Aug 23, 2019 · 4745e45 · 4745e45
1 parent c1944cc
commit 4745e45
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.9] - 2019-08-02
+### Added
+- default Zoom, Lat, Long settings.
+
 ## [0.1.8] - 2019-08-02
 ### Fixed
 - display or validation errors.

diff --git a/README.md b/README.md
@@ -36,7 +36,21 @@ the `->latitude('lat')` and `->longitude('long')` methods:
 ```php
 MapMarker::make("Location")
     ->latitude('lat')
-    ->longitude('long'),
+    ->longitude('long')
+    ->defaultZoom(8)
+    ->defaultLatitude(41.823611)
+    ->defaultLongitude(-71.422222),
+```
+
+### Default Settings
+You can specify default settings for zoom level, and initial map center
+coordinates. If not specified, the zoom level will default to 12; the
+coordinates will default to (0, 0).
+```php
+MapMarker::make("Location")
+    ->defaultZoom(8)
+    ->defaultLatitude(41.823611)
+    ->defaultLongitude(-71.422222),
 ```
 
 ### Search Provider

diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/resources/js/components/DetailField.vue b/resources/js/components/DetailField.vue
@@ -44,6 +44,10 @@ export default {
     },
 
     computed: {
+        defaultZoom: function () {
+            return this.field.defaultZoom || 12;
+        },
+
         locationIsSet: function () {
             if (this.value.latitude === undefined) {
                 this.setInitialValue();
@@ -67,18 +71,6 @@ export default {
                 this.value.longitude,
             ];
         },
-
-        zoom: function () {
-            if (this.value.latitude === undefined) {
-                this.setInitialValue();
-            }
-
-            if (! this.value.latitude) {
-                return 4;
-            }
-
-            return 16;
-        }
     },
 
     methods: {
@@ -123,7 +115,7 @@ export default {
                 ref="map"
                 :center="mapCenter"
                 :options="mapOptions"
-                :zoom="zoom"
+                :zoom="defaultZoom"
                 @move="mapMoved"
             >
                 <l-tile-layer

diff --git a/resources/js/components/FormField.vue b/resources/js/components/FormField.vue
@@ -68,6 +68,18 @@ export default {
     },
 
     computed: {
+        defaultLatitude: function () {
+            return this.field.defaultLatitude || 0;
+        },
+
+        defaultLongitude: function () {
+            return this.field.defaultLongitude || 0;
+        },
+
+        defaultZoom: function () {
+            return this.field.defaultZoom || 12;
+        },
+
         firstLocationError: function () {
             if (this.hasLocationError) {
                 return (this.errors.first(this.latitudeFieldName)
@@ -104,22 +116,10 @@ export default {
             }
 
             return [
-                this.value.latitude,
-                this.value.longitude,
+                this.value.latitude || this.defaultLatitude,
+                this.value.longitude || this.defaultLongitude,
             ];
         },
-
-        zoom: function () {
-            if (this.value.latitude === undefined) {
-                this.setInitialValue();
-            }
-
-            if (! this.value.latitude) {
-                return 4;
-            }
-
-            return 18;
-        }
     },
 
     methods: {
@@ -165,7 +165,7 @@ export default {
                     ref="map"
                     :center="mapCenter"
                     :options="mapOptions"
-                    :zoom="zoom"
+                    :zoom="defaultZoom"
                     @move="mapMoved"
                 >
                     <l-tile-layer

diff --git a/src/MapMarker.php b/src/MapMarker.php
@@ -94,6 +94,39 @@ public function longitude($field)
         return $this->withMeta([__FUNCTION__ => $field]);
     }
 
+    public function defaultLatitude($field)
+    {
+        if (! is_array($this->attribute)) {
+            $this->attribute = [];
+        }
+
+        $this->attribute["default_latitude"] = $field;
+
+        return $this->withMeta([__FUNCTION__ => $field]);
+    }
+
+    public function defaultLongitude($field)
+    {
+        if (! is_array($this->attribute)) {
+            $this->attribute = [];
+        }
+
+        $this->attribute["default_longitude"] = $field;
+
+        return $this->withMeta([__FUNCTION__ => $field]);
+    }
+
+    public function defaultZoom($field)
+    {
+        if (! is_array($this->attribute)) {
+            $this->attribute = [];
+        }
+
+        $this->attribute["default_zoom"] = $field;
+
+        return $this->withMeta([__FUNCTION__ => $field]);
+    }
+
     // public function markerIcon(string $url)
     // {
     //     return $this->withMeta([__FUNCTION__ => $url]);