diff --git a/app/Http/Controllers/CoridorsController.php b/app/Http/Controllers/CoridorsController.php index 7de405a9..89724605 100644 --- a/app/Http/Controllers/CoridorsController.php +++ b/app/Http/Controllers/CoridorsController.php @@ -581,7 +581,7 @@ class CoridorsController extends Controller $data = RoadItemsProject::with('files')->find($request->id); break; case "2": - $data = RoadPatrolProject::find($request->id); + $data = RoadPatrol::find($request->id); break; case "3": $collection = \App\Models\ContractSubItems::whereId($request->id)->get(); @@ -725,13 +725,13 @@ class CoridorsController extends Controller } if ( in_array(2, $typeArrays) ) { - $roadPatrolProject = RoadPatrolProject::whereIn('start_way_id', $idArrays) + $roadPatrolProject = RoadPatrol::whereIn('start_way_id', $idArrays) ->orWhereIn('end_way_id', $idArrays) // ->when($date_to , function ($query) use ($date_to, $date_from) { ->whereBetween('created_at', [$date_from . ' 00:00:00', $date_to . ' 23:59:59']) // }) ->whereNotNull('start_lat') - ->select('start_lat', 'start_lng', 'id') + ->select('start_lat', 'start_lon', 'id') ->get(); } diff --git a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php index 3089bfca..faf9bc38 100644 --- a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php +++ b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php @@ -290,8 +290,8 @@ class RoadItemsProjectController extends Controller 'city_id' => Auth::user()->city_id, 'city_fa' => Auth::user()->city_fa, 'user_name' => Auth::user()->name, - 'start_way_id' => $nominatimService->get_way_id_from_nominatim(), - 'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim() : null, + 'start_way_id' => $nominatimService->get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]), + 'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]) : null, 'unit_fa' => $info_item->sub_item_unit, 'created_at_fa' => verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s'), 'info_id' => $info_item->id, diff --git a/app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php b/app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php index 14f6fcff..a656180a 100644 --- a/app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php +++ b/app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php @@ -134,7 +134,7 @@ class SafetyAndPrivacyController extends Controller 'activity_date_time' => $request->activity_date." ".$request->activity_time, 'edare_shahri_id' => auth()->user()->edarate_shahri_id, 'edare_shahri_name' => auth()->user()->edarate_shahri_name, - 'way_id' => $nominatimService->get_way_id_from_nominatim(), + 'way_id' => $nominatimService->get_way_id_from_nominatim($coordinates[0], $coordinates[1]), ]); if ($request->has('recognize_picture')) {