Merge pull request #46 from vonsogt/master

Fix feature getCurrentPosition
laravel-admin-extensions · Dec 7, 2021 · 01eeb93 · 01eeb93
2 parents 878fd40 + c85089a
commit 01eeb93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/resources/views/latlong.blade.php b/resources/views/latlong.blade.php
@@ -8,10 +8,10 @@
 
         <div class="row">
             <div class="col-md-3">
-                <input id="{{$id['lat']}}" name="{{$name['lat']}}" class="form-control" value="{{ old($column['lat'], $value['lat']) }}" {!! $attributes !!} />
+                <input id="{{$id['lat']}}" name="{{$name['lat']}}" class="form-control" value="{{ old($column['lat'], $value['lat'] ?? null) }}" {!! $attributes !!} />
             </div>
             <div class="col-md-3">
-                <input id="{{$id['lng']}}" name="{{$name['lng']}}" class="form-control" value="{{ old($column['lng'], $value['lng']) }}" {!! $attributes !!} />
+                <input id="{{$id['lng']}}" name="{{$name['lng']}}" class="form-control" value="{{ old($column['lng'], $value['lng'] ?? null) }}" {!! $attributes !!} />
             </div>
 
             @if($provider != 'yandex')

diff --git a/src/Map/Google.php b/src/Map/Google.php
@@ -7,7 +7,7 @@ class Google extends AbstractMap
     /**
      * @var string
      */
-    protected $api = '//maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&key=%s&libraries=places';
+    protected $api = '//maps.googleapis.com/maps/api/js?v=3.exp&key=%s&libraries=places';
 
     /**
      * {@inheritdoc}
@@ -42,6 +42,7 @@ function init(name) {
                       lng: position.coords.longitude
                     };
                     map.setCenter(pos);
+                    marker.setPosition(pos);
                     
                     lat.val(position.coords.latitude);
                     lng.val(position.coords.longitude);
@@ -96,4 +97,4 @@ function init(name) {
         })();
 EOT;
     }
-}
+}