Browse Source

Add default coordinate and map zoom level for empty map data

pull/68/head
Nafies Luthfi 5 years ago
parent
commit
cf1dd627e9
  1. 15
      app/Http/Controllers/UsersController.php
  2. 4
      resources/views/users/edit.blade.php

15
app/Http/Controllers/UsersController.php

@ -115,7 +115,18 @@ class UsersController extends Controller
$validTabs = ['death', 'contact_address', 'login_account'];
return view('users.edit', compact('user', 'replacementUsers', 'validTabs'));
$mapZoomLevel = 4;
$mapCenterLatitude = $user->getMetadata('cemetery_location_latitude');
$mapCenterLongitude = $user->getMetadata('cemetery_location_longitude');
if ($mapCenterLatitude && $mapCenterLongitude) {
$mapZoomLevel = 18;
$mapCenterLatitude = $mapCenterLatitude ?: '-0.87887';
$mapCenterLongitude = $mapCenterLongitude ?: '117.4863';
}
return view('users.edit', compact(
'user', 'replacementUsers', 'validTabs', 'mapZoomLevel', 'mapCenterLatitude', 'mapCenterLongitude'
));
}
/**
@ -132,7 +143,7 @@ class UsersController extends Controller
$userAttributes = collect($userAttributes);
foreach (['cemetery_location_name', 'cemetery_location_address', 'cemetery_location_latitude', 'cemetery_location_longitude'] as $key) {
if ($userAttributes->has($key)) {
$userMeta = UserMetadata::where('key', $key)->firstOrNew();
$userMeta = UserMetadata::where('user_id', $user->id)->where('key', $key)->firstOrNew();
if (!$userMeta->exists) {
$userMeta->id = Uuid::uuid4()->toString();
$userMeta->user_id = $user->id;

4
resources/views/users/edit.blade.php

@ -77,8 +77,8 @@
})();
@if (request('tab') == 'death')
var mapCenter = [{{ $user->getMetadata('cemetery_location_latitude') }}, {{ $user->getMetadata('cemetery_location_longitude') }}];
var map = L.map('mapid').setView(mapCenter, 18);
var mapCenter = [{{ $mapCenterLatitude }}, {{ $mapCenterLongitude }}];
var map = L.map('mapid').setView(mapCenter, {{ $mapZoomLevel }});
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'

Loading…
Cancel
Save