ariefajar
/
MIF_E31221322
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from arieeefajar/fix/master-land 

fix(master-land): change layer map to googleSat
This commit is contained in:
Arie Fajar Bachtiar 2025-03-14 19:48:23 +07:00 committed by GitHub
parent db6dfed985 73d6748d68
commit 7e88bf968e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/MasterData/LandController.php
View File

@ -15,17 +15,7 @@ class LandController extends Controller
{ {
public function index() public function index()
{ {
// $lands = Land::orderBy('created_at', 'desc')->get();
// if ($lands->isEmpty()) {
// return view('master-data.lahan.index', compact('lands'));
// }
// $province = Province::where('id', $lands->first()->province_code)->first();
// $regency = $province->regency()->where('id', $lands->first()->regency_code)->first();
// $district = $regency->district()->where('id', $lands->first()->district_code)->first();
// return view('master-data.lahan.index', compact('lands', 'province', 'regency', 'district'));
$lands = Land::with('province', 'regency')->orderBy('created_at', 'desc')->get(); $lands = Land::with('province', 'regency')->orderBy('created_at', 'desc')->get();
return view('master-data.lahan.index', compact('lands')); return view('master-data.lahan.index', compact('lands'));
} }
@ -174,10 +164,6 @@ public function update(Request $request, $id)
$polygon = json_decode($request->polygon, true); $polygon = json_decode($request->polygon, true);
// if (isset($polygon[0])) {
// $polygon = $polygon[0]; // Ambil array pertama jika ada
// }
if ($validator->fails()) { if ($validator->fails()) {
toast($validator->messages()->all()[0], 'error')->position('top')->autoclose(3000); toast($validator->messages()->all()[0], 'error')->position('top')->autoclose(3000);
return redirect()->back()->withInput(); return redirect()->back()->withInput();

6
public/assets/js/pages/customJs/master-data/lahan/create.js
View File

@ -1,4 +1,4 @@
var map, drawnItems, drawControl, googleStreets, iconMarker; var map, drawnItems, drawControl, googleSat, iconMarker;
var currentMarker = null; var currentMarker = null;
function initMap() { function initMap() {
@ -6,8 +6,8 @@ function initMap() {
attributionControl: false, attributionControl: false,
}).setView([-8.157416852745705, 113.72281580436439], 16); }).setView([-8.157416852745705, 113.72281580436439], 16);
googleStreets = L.tileLayer( googleSat = L.tileLayer(
"http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}", "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}",
{ {
maxZoom: 20, maxZoom: 20,
subdomains: ["mt0", "mt1", "mt2", "mt3"], subdomains: ["mt0", "mt1", "mt2", "mt3"],

6
public/assets/js/pages/customJs/master-data/lahan/update.js
View File

@ -1,4 +1,4 @@
var mapEdit, drawnItems, drawControl, googleStreets, iconMarker; var mapEdit, drawnItems, drawControl, googleSat, iconMarker;
var currentMarkerEdit = null; var currentMarkerEdit = null;
var formEdit = document.getElementById("edit-form"); var formEdit = document.getElementById("edit-form");
@ -40,8 +40,8 @@ function initMapEdit() {
attributionControl: false, attributionControl: false,
}).setView([-8.157416852745705, 113.72281580436439], 16); }).setView([-8.157416852745705, 113.72281580436439], 16);
googleStreets = L.tileLayer( googleSat = L.tileLayer(
"http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}", "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}",
{ {
maxZoom: 20, maxZoom: 20,
subdomains: ["mt0", "mt1", "mt2", "mt3"], subdomains: ["mt0", "mt1", "mt2", "mt3"],

4
resources/views/master-data/lahan/create.blade.php
View File

@ -144,8 +144,8 @@
</div> </div>
<div class="modal-footer" id="add-footer" style="display: none"> <div class="modal-footer" id="add-footer" style="display: none">
<div class="hstack gap-2 justify-content-end"> <div class="hstack gap-2 justify-content-end">
<button type="button" class="btn btn-light" <a href="{{ Auth::user()->role == 'admin' ? route('master_data.lahan.index') : route('lahan.index') }}"
data-bs-dismiss="modal">Tutup</button> class="btn btn-light">Kembali</a>
<button type="submit" class="btn btn-success" id="add-btn">Simpan</button> <button type="submit" class="btn btn-success" id="add-btn">Simpan</button>
</div> </div>
</div> </div>

2
resources/views/master-data/lahan/edit.blade.php
View File

@ -154,7 +154,7 @@
</div> </div>
<div class="modal-footer" id="edit-footer"> <div class="modal-footer" id="edit-footer">
<div class="hstack gap-2 justify-content-end"> <div class="hstack gap-2 justify-content-end">
<a href="{{ route('master_data.lahan.index') }}" <a href="{{ Auth::user()->role == 'admin' ? route('master_data.lahan.index') : route('lahan.index') }}"
class="btn btn-light">Kembali</a> class="btn btn-light">Kembali</a>
<button type="submit" class="btn btn-success" id="edit-btn">Update</button> <button type="submit" class="btn btn-success" id="edit-btn">Update</button>
</div> </div>