resolve the conflicts

2025-12-14 10:50:52 +03:30
parent f67369b6da d89fbdb4dd
commit 47360baeef
4 changed files with 5 additions and 6 deletions
--- a/app/Console/Commands/RoadObservationProblems.php
+++ b/app/Console/Commands/RoadObservationProblems.php
@@ -78,8 +78,7 @@ class RoadObservationProblems extends Command
                        $mobile = $value->MobileForSendEventSms;
                    }

-                    $city = findCityFromGeoJson($value->YGeo, $value->XGeo);
-                    $cityModel = $city ? City::query()->find($city['city_id']) : City::query()->find(NikarayanComplaints::mapCities((int) $value->fk_Town));
+                    $cityModel = City::findCityWithLatLng($value->XGeo, $value->YGeo);
                    $rop = RoadObserved::query()->updateOrCreate(
                        ['fk_RegisteredEventMessage' => $value->fk_RegisteredEventMessage],
                        [