@whiteslove/parsing-lexicon 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whiteslove/parsing-lexicon",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Shared deterministic multilingual parsing lexicon for Whiteslove housing and hiring services",
   "repository": {
     "type": "git",

package/src/geo.js

@@ -123,7 +123,7 @@ export const TASHKENT_AREAS = Object.freeze({
     area('Karakamysh-2/4', ['каракамыш 2 4', 'қорақамиш 2 4', 'qoraqamish 2 4', 'karakamish 2 4']),
     area('Karakamysh-2/5', ['каракамыш 2 5', 'қорақамиш 2 5', 'qoraqamish 2 5', 'karakamish 2 5']),
     area('Olympia', ['олимпия', 'olimpiya', 'olympia'], 'microdistrict'), area('Vuzgorodok', ['вузгородок', 'вуз городок', 'vuzgorodok']),
-    area('Medgorodok', ['медгородок', 'мед городок', 'medgorodok']), area('Takhtapul', ['тахтапуль', 'тахтапул', 'taxtapul', 'takhtapul']),
+    area('Medgorodok', ['медгородок', 'мед городок', 'medgorodok']),
     area('Chimbay', ['чимбай', 'chimboy', 'chimbay']),
   ]),
   Mirobod: Object.freeze([
@@ -140,14 +140,17 @@ export const TASHKENT_AREAS = Object.freeze({
   ]),
   Sergeli: Object.freeze([
     area('Yangi Sergeli', ['янги сергели', 'yangi sergeli']), area('Stroygorod', ['стройгород', 'stroygorod']),
+    area('Uzgarish', ['узгарыш', 'ўзгариш', "o'zgarish", 'uzgarish']),
   ]),
   Chilanzar: Object.freeze([
     area('Nakkoshlik', ['наккошлык', 'наққошлик', 'naqqoshlik']), area('Al-Khorezmi-1', ['аль хорезми 1', 'ал хорезми 1', 'al xorazmiy 1', 'al khorezmi 1']),
+    area('Beshagach', ['бешагач', "beshyog'och", 'beshagach']),
   ]),
   Shaykhantahur: Object.freeze([
     area('Labzak', ['лабзак', 'labzak', 'ц 13', 'c 13']), area('Khadra', ['хадра', 'xadra', 'khadra', 'ц 14', 'c 14']),
     area('Jangoh', ['джангох', 'жангох', 'jangoh', 'ц 15', 'c 15']), area('Karatash', ['караташ', 'қоратош', 'qoratosh', 'karatash']),
-    area('Chorsu', ['чорсу', 'chorsu']), area('Beshagach', ['бешагач', "beshyog'och", 'beshagach']), area('Beltepa', ['белтепа', 'beltepa']),
+    area('Chorsu', ['чорсу', 'chorsu']), area('Beltepa', ['белтепа', 'beltepa']),
+    area('Takhtapul', ['тахтапуль', 'тахтапул', 'taxtapul', 'takhtapul']),
   ]),
   Yunusabad: Object.freeze([
     area('Kashgar', ['кашгар', 'қашқар', 'qashqar', 'kashgar', 'ц 4', 'c 4']), area('Kiyot', ['киёт', 'қиёт', 'qiyot', 'kiyot', 'ц 5', 'c 5']),
@@ -158,7 +161,7 @@ export const TASHKENT_AREAS = Object.freeze({
     area('Rakat', ['ракат', 'rakat']), area('Rakatboshi', ['ракатбоши', 'rakatboshi']),
   ]),
   Yangihayot: Object.freeze([
-    area('Uzgarish', ['узгарыш', 'ўзгариш', "o'zgarish", 'uzgarish']), area('Dustlik-1', ['дустлик 1', 'дўстлик 1', "do'stlik 1", 'dustlik 1'], 'microdistrict'),
+    area('Dustlik-1', ['дустлик 1', 'дўстлик 1', "do'stlik 1", 'dustlik 1'], 'microdistrict'),
     area('Dustlik-2', ['дустлик 2', 'дўстлик 2', "do'stlik 2", 'dustlik 2'], 'microdistrict'), area('Yangi Choshtepa', ['янги чоштепа', 'yangi choshtepa'], 'microdistrict'), area('Sputnik', ['спутник', 'йўлдош', "yo'ldosh", 'yoldosh'], 'microdistrict'),
   ]),
   Yashnobod: Object.freeze([

package/src/locations.js

@@ -88,11 +88,47 @@ function normalizeUzSemanticLocations(country) {
   });
 }
 
+const ODESA_FONTAN_STATION_RE = /^(?:[5-9]|1[0-6]) Fontan Station$/u;
+
+function normalizeUaSemanticLocations(country) {
+  const odesa = country?.Odesa;
+  if (!odesa) return country;
+
+  // “5–16 station of Velykyi Fontan” are traditional listing/locality zones
+  // anchored to the Fontanska Road transit stops, not twelve standalone city
+  // microdistricts. Keep their parsing value but expose them as local areas.
+  const fontanStationAreas = Object.freeze(
+    (odesa.microdistricts || [])
+      .filter(({ name }) => ODESA_FONTAN_STATION_RE.test(name))
+      .map((entry) => Object.freeze({
+        ...entry,
+        type: 'local_area',
+        entityType: 'local_area',
+      })),
+  );
+
+  return Object.freeze({
+    ...country,
+    Odesa: Object.freeze({
+      ...odesa,
+      microdistricts: Object.freeze(
+        (odesa.microdistricts || []).filter(({ name }) => !ODESA_FONTAN_STATION_RE.test(name)),
+      ),
+      localAreas: Object.freeze([
+        ...(odesa.localAreas || []),
+        ...fontanStationAreas,
+      ]),
+    }),
+  });
+}
+
 const UZ_LOCATION_DICTIONARIES = normalizeUzSemanticLocations(mergeLocationCountries(
   UZ_BASE_LOCATION_DICTIONARIES,
   UZ_LOCATION_EXTENSIONS,
 ));
 
+const UA_SEMANTIC_LOCATION_EXTENSIONS = normalizeUaSemanticLocations(UA_MAJOR_LOCATION_EXTENSIONS);
+
 const COUNTRY_LOCATION_DICTIONARIES = Object.freeze({
   ...BASE_LOCATION_DICTIONARIES,
   KZ: mergeLocationCountries(
@@ -102,7 +138,7 @@ const COUNTRY_LOCATION_DICTIONARIES = Object.freeze({
   UZ: UZ_LOCATION_DICTIONARIES,
   UA: mergeLocationCountries(
     UA_EXTRA_LOCATION_DICTIONARIES,
-    UA_MAJOR_LOCATION_EXTENSIONS,
+    UA_SEMANTIC_LOCATION_EXTENSIONS,
     UA_REGIONAL_LOCATION_EXTENSIONS,
     UA_SECONDARY_LOCATION_EXTENSIONS,
     UA_METRO_LOCATION_EXTENSIONS,

package/src/tashkent-pois.js

@@ -52,6 +52,7 @@ export const TASHKENT_MARKETS = Object.freeze([
   poi('Eski Juva Bazaar', 'market', ['Эски Жува', 'Eski Juva']),
   poi('Alay Bazaar', 'market', ['Алайский рынок', 'Алайский базар', 'Oloy bozori', 'Олой бозори']),
   poi('Qoyliq Bazaar', 'market', ['Куйлюк базар', 'Куйлик базар', "Qo'yliq bozori", 'Qo‘yliq bozori', 'Qoʻyliq bozori']),
+  poi('Kuyluk Bazaar', 'market', ['Куйлюкский рынок', 'Куйлыкский базар', 'Kuyluk bazar']),
   poi('Yunusobod Bazaar', 'market', ['Юнусабадский рынок', 'Yunusobod bozori']),
   poi('Farhod Bazaar', 'market', ['Фархадский рынок', 'Фархадский базар', 'Farhod bozori']),
   poi('Uch Qahramon Bazaar', 'market', ['Уч Кахрамон', 'Уч Кахрамон базар']),
@@ -85,6 +86,8 @@ export const TASHKENT_MALLS = Object.freeze([
   poi('HT Mall', 'mall', ['HT Молл', 'HT savdo markazi']),
   poi('Seoul Mun Mall', 'mall', ['Seoul Mun', 'Сеул Мун Молл', 'Seoul Mun savdo markazi'], { contextRequired: true, context: MALL_CONTEXT }),
   poi('Ecobozor', 'mall', ['Eco Bozor', 'Ekobozor', 'Эко Бозор', 'Экобозор']),
+  poi('Magnum Samarkand Darvoza', 'mall', ['Magnum super', 'Magnum Supermarket', 'Магнум Самарканд Дарвоза']),
+  poi('Baraka Market', 'mall', ['Baraka market', 'Baraka Supermarket', 'Baraka Savdo', 'Барака маркет', 'Барака Савдо']),
 ]);
 
 export const TASHKENT_ATTRACTIONS = Object.freeze([
@@ -150,6 +153,14 @@ export const TASHKENT_UNIVERSITIES = Object.freeze([
   poi('New Uzbekistan University', 'university', ['Новый университет Узбекистана']),
 ]);
 
+export const TASHKENT_SCHOOLS = Object.freeze([
+  poi('Tashkent International School', 'school', ['TIS', 'American School Tashkent', 'Международная школа Ташкента', 'Ташкентская международная школа']),
+  poi('Academic Lyceum under WIUT', 'school', ['ALWIUT', 'Westminster Academic Lyceum', 'Академический лицей при Вестминстерском университете', 'Лицей Вестминстер']),
+  poi('Academic Lyceum under TMA', 'school', ['TMA Academic Lyceum', 'Академический лицей при ТМА', 'Лицей Ташкентской медицинской академии']),
+  poi('Tashkent Ulugbek International School', 'school', ['Ulugbek International School', 'Улугбекская международная школа', 'Международная школа Улугбека']),
+  poi('Uzbek International School Invento', 'school', ['Invento International School', 'Invento School', 'Международная школа Invento', 'Школа Invento']),
+]);
+
 export const TASHKENT_MEDICAL_POIS = Object.freeze([
   TASHKENT_MEDICAL_ACADEMY,
   poi('Tashkent City Hospital No. 1', 'medical', ['1-я городская больница']),
@@ -160,6 +171,13 @@ export const TASHKENT_MEDICAL_POIS = Object.freeze([
   poi('Republican Oncology Center', 'medical', ['Республиканский онкоцентр', 'Онкология']),
   poi('Republican Cardiology Center', 'medical', ['Республиканский кардиоцентр', 'Кардиоцентр']),
   poi('Republican Emergency Medical Center', 'medical', ['Республиканский центр экстренной медицинской помощи']),
+  poi('Republican Research Centre of Emergency Medicine', 'medical', ['Tashkent Emergency Medicine Center', 'Республиканский научный центр экстренной медицинской помощи', 'Республиканский центр экстренной медицины', '16-я городская больница']),
+  poi('Republican Ophthalmology Hospital', 'medical', ['Republican Eye Hospital', 'Республиканская офтальмологическая больница', 'Республиканская глазная больница']),
+  poi('Republican Hematology Center', 'medical', ['Tashkent Hematology Center', 'Республиканский гематологический центр', 'Центр гематологии']),
+  poi('Republican Thoracic Surgery Center Vakhidov', 'medical', ['Vakhidov Thoracic Surgery Center', 'Республиканский центр грудной хирургии им. Вахидова', 'Центр грудной хирургии Вахидова']),
+  poi('Tashkent International Clinic', 'medical', ['TIMC', 'Tashkent International Medical Clinic', 'Ташкентская международная клиника']),
+  poi('Republican Pathological Anatomy Center', 'medical', ['Republican Pathology Center', 'Республиканский патологоанатомический центр', 'Центр патологической анатомии']),
+  poi('Republic Specialized Nephrology and Transplantation Centre', 'medical', ['Republican Nephrology Center', 'Республиканский нефрологический центр', 'Центр нефрологии и трансплантации']),
   poi('Republican Perinatal Center', 'medical', ['Республиканский перинатальный центр', 'Перинатальный центр']),
   poi('Institute of Obstetrics and Gynecology', 'medical', ['Институт акушерства и гинекологии']),
 ]);
@@ -177,6 +195,7 @@ export const TASHKENT_POI_GROUPS = Object.freeze({
   malls: TASHKENT_MALLS,
   attractions: TASHKENT_ATTRACTIONS,
   culture: TASHKENT_CULTURAL_POIS,
+  schools: TASHKENT_SCHOOLS,
   transport: TASHKENT_TRANSPORT_POIS,
   universities: TASHKENT_UNIVERSITIES,
   medical: TASHKENT_MEDICAL_POIS,