remove conflicts

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

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