fix: city regex requires mandatory dot+space — no more Гор→ор, Годная→одная

src/components/driver/DriverDeliveryPlanner.jsx

@@ -1,3 +1,4 @@
+import { CRIMEAN_CITIES } from "../../constants/cities.js";
 import React from "react";
 import {
   getOrderGroupDeliveryHalfDay,
@@ -29,27 +30,28 @@ const extractCity = (address) => {
   const trimmed = address.trim();
   if (!trimmed) return null;
 
-  const cityMatch = trimmed.match(/(?:г\.?\s*|г\s+)([А-ЯЁA-Z][а-яёa-zA-Z\s\-]+?)(?:\s*[,;.]|$)/i);
+  const cityMatch = trimmed.match(/(?:г\.\s+|гор\.\s+|пос\.\s+|с\.\s+|дер\.\s+|пгт\.\s+|город\s+|село\s+|г\s+)([А-ЯЁA-Z][а-яёa-zA-Z\s\-]+?)(?:\s*[,;.]|\s|$)/i);
   if (cityMatch) {
     return cityMatch[1].trim();
   }
 
-  const knownCities = [
-    "Севастополь", "Ялта", "Симферополь", "Феодосия", "Евпатория",
-    "Керчь", "Алушта", "Бахчисарай", "Судак", "Инкерман",
-    "Джанкой", "Красногвардейское", "Раздольное", "Черноморское",
-  ];
-  for (const city of knownCities) {
+
+  for (const city of CRIMEAN_CITIES) {
     if (trimmed.toLowerCase().includes(city.toLowerCase())) {
       return city;
     }
   }
 
-  const firstSegment = trimmed.split(/[,;]/)[0].trim();
-  if (firstSegment.length > 2 && firstSegment.length < 30 && !/^\d/.test(firstSegment)) {
-    return firstSegment;
+  // Бахчисарайский р-н → Бахчисарай
+  const district = trimmed.match(/([А-ЯЁа-яё]+)ский\s*(?:р-н|район)/i);
+  if (district) {
+    const base = district[1];
+    for (const city of CRIMEAN_CITIES) {
+      if (city.toLowerCase().startsWith(base.toLowerCase())) return city;
+    }
   }
 
+  // no match → null (caller falls back to Севастополь)
   return null;
 };
 

src/components/orders/OrdersTable.jsx

@@ -36,6 +36,7 @@ export const OrdersTable = ({
   filters,
   setFilters,
   statusOptions,
+  cities = [],
 }) => {
   return (
     <Panel className="p-0">
@@ -51,7 +52,7 @@ export const OrdersTable = ({
         </div>
 
         {filters && setFilters ? (
-          <OrderFilters filters={filters} setFilters={setFilters} statusOptions={statusOptions} />
+          <OrderFilters filters={filters} setFilters={setFilters} statusOptions={statusOptions} cities={cities} />
         ) : null}
       </div>
 

src/constants/cities.js

@@ -0,0 +1,12 @@
+export const CRIMEAN_CITIES = [
+  "Севастополь","Ялта","Алушта","Евпатория","Саки","Феодосия",
+  "Керчь","Симферополь","Бахчисарай","Судак","Белогорск",
+  "Красноперекопск","Джанкой","Щёлкино","Гаспра","Гурзуф",
+  "Кореиз","Ливадия","Массандра","Ореанда","Симеиз",
+  "Форос","Партенит","Мисхор","Отрадное","Санаторное",
+  "Васильевка","Куйбышево","Инкерман","Балаклава",
+  "Утёс","Резниково","Заветное","Хмельницкое","Мирновка",
+  "Новосёловка","Гвардейское","Красногвардейское",
+  "Раздольное","Черноморское","Ленино","Советский",
+  "Нижнегорский","Первомайское","Октябрьское",
+];

src/pages/DashboardPage.jsx

@@ -83,6 +83,14 @@ export const DashboardPage = () => {
     loadError,
   } = useOrderGroups();
 
+  const cities = React.useMemo(() => {
+    const set = new Set();
+    for (const g of allOrderGroups) {
+      if (g.city) set.add(g.city);
+    }
+    return [...set].sort();
+  }, [allOrderGroups]);
+
   const openGroupPage = React.useCallback((groupId) => {
     navigate("/dashboard/group/" + groupId);
   }, [navigate]);
@@ -132,7 +140,7 @@ export const DashboardPage = () => {
       if (activeSection === "orders") {
         return (
           <div className="space-y-6 xl:space-y-8">
-            <OrdersTable orderGroups={filteredOrderGroups} selectedOrderGroupId={selectedOrderGroupId} onOpenOrder={openGroupPage} filters={filters} setFilters={setFilters} statusOptions={statusOptions} />
+            <OrdersTable orderGroups={filteredOrderGroups} selectedOrderGroupId={selectedOrderGroupId} onOpenOrder={openGroupPage} filters={filters} setFilters={setFilters} statusOptions={statusOptions} cities={cities} />
           </div>
         );
       }
@@ -144,7 +152,7 @@ export const DashboardPage = () => {
     }
     return (
       <div className="space-y-6 xl:space-y-8">
-        <OrdersTable orderGroups={filteredOrderGroups} selectedOrderGroupId={selectedOrderGroupId} onOpenOrder={openGroupPage} filters={filters} setFilters={setFilters} statusOptions={statusOptions} />
+        <OrdersTable orderGroups={filteredOrderGroups} selectedOrderGroupId={selectedOrderGroupId} onOpenOrder={openGroupPage} filters={filters} setFilters={setFilters} statusOptions={statusOptions} cities={cities} />
       </div>
     );
   };

src/services/supabase/orderGroupRepository.js

@@ -1,4 +1,5 @@
 import { safeSupabaseCall } from "../safeSupabaseCall";
+import { CRIMEAN_CITIES } from "../../constants/cities.js";
 import { logAction } from "./actionLogService";
 import logger from "../../utils/logger";
 import { hasSupabaseConfig, supabase } from "../../supabaseClient";
@@ -90,22 +91,11 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
 
   const deliveryAddress = normalizeText(row.delivery_address) || extractAddressFromSourceOrders(row.source_orders);
   const customerAddress = normalizeText(row.customer_address) || "";
-  const CRIMEAN_CITIES = [
-    "Севастополь","Ялта","Алушта","Евпатория","Саки","Феодосия",
-    "Керчь","Симферополь","Бахчисарай","Судак","Белогорск",
-    "Красноперекопск","Джанкой","Щёлкино","Гаспра","Гурзуф",
-    "Кореиз","Ливадия","Массандра","Ореанда","Симеиз",
-    "Форос","Партенит","Мисхор","Отрадное","Санаторное",
-    "Васильевка","Куйбышево","Инкерман","Балаклава",
-    "Утёс","Резниково","Заветное","Хмельницкое","Мирновка",
-    "Новосёловка","Гвардейское","Красногвардейское",
-    "Раздольное","Черноморское","Ленино","Советский",
-    "Нижнегорский","Первомайское","Октябрьское",
-  ];
+  
   const extractCity = (addr) => {
     if (!addr) return "";
     // 1) explicit marker: г. Ялта, пгт. Куйбышево, etc.
-    const m = addr.match(/(?:г\.|гор\.?|пос\.|с\.|село|дер\.|пгт|город)\s*([А-ЯЁа-яёA-Za-z\-\s]+?)(?:[,\\s]|$)/i);
+    const m = addr.match(/(?:г\.\s|гор\.\s|пос\.\s|с\.\s|дер\.\s|пгт\.\s|город\s|село\s|г\s)\s*([А-ЯЁа-яёA-Za-z\-\s]+?)(?:[,\\s]|$)/i);
     if (m) return m[1].trim();
     // 2) known city name anywhere in address (case-insensitive)
     const lower = addr.toLowerCase();