@whiteslove/parsing-lexicon 0.5.6 → 0.5.8

package/package.json

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

package/src/location-data.js

@@ -75,7 +75,7 @@ export const LOCATION_DICTIONARIES = Object.freeze({
       ]),
       landmarks: entries([
         ['Registan Square', 'площадь Регистан', 'Registon maydoni', 'Регистон майдони'], ['Gur-e-Amir', 'Гур Эмир', 'Go‘ri Amir', "Go'ri Amir"],
-        ['Siab Bazaar', 'Сиабский базар', 'Siyob bozori'], ['Samarkand Railway Station', 'Самаркандский вокзал', 'Samarqand vokzali'],
+        ['Siyob Bazaar', 'Siab Bazaar', 'Сиабский базар', 'Siyob bozori'], ['Samarkand Railway Station', 'Самаркандский вокзал', 'Samarqand vokzali'],
       ]),
     }),
   }),

package/src/locations.js

@@ -15,6 +15,7 @@ import { UA_REGIONAL_LOCATION_EXTENSIONS } from './ua-location-extensions-region
 import { UA_SECONDARY_LOCATION_EXTENSIONS } from './ua-secondary-cities.js';
 import { UA_METRO_LOCATION_EXTENSIONS } from './ua-location-extensions-metro.js';
 import { UA_KHARKIV_LOCATION_TRANSLATIONS } from './ua-kharkiv-location-translations.js';
+import { UA_CITY_LOCATION_EXPANSIONS } from './ua-city-location-expansions.js';
 
 export const UA_EXTRA_LOCATION_DICTIONARIES = Object.freeze({
   ...RAW_UA_EXTRA_LOCATION_DICTIONARIES,
@@ -37,6 +38,10 @@ const TASHKENT_UNSUPPORTED_SEED_MICRODISTRICTS = new Set([
   'Yunusabad-22',
 ]);
 
+const LEGACY_SAMARKAND_SILK_ROAD_RESIDENCE = (
+  BASE_LOCATION_DICTIONARIES.UZ?.Samarkand?.residentialComplexes || []
+).find(({ name }) => name === 'Silk Road Residence');
+
 // The UZ seed is compatibility storage. In 0.3 semantic corrections are
 // applied before merging it with the canonical Uzbekistan extension layer.
 const UZ_BASE_LOCATION_DICTIONARIES = Object.freeze({
@@ -47,9 +52,17 @@ const UZ_BASE_LOCATION_DICTIONARIES = Object.freeze({
       (BASE_LOCATION_DICTIONARIES.UZ?.Tashkent?.microdistricts || [])
         .filter(({ name }) => !TASHKENT_UNSUPPORTED_SEED_MICRODISTRICTS.has(name)),
     ),
+    residentialComplexes: Object.freeze([
+      ...(BASE_LOCATION_DICTIONARIES.UZ?.Tashkent?.residentialComplexes || [])
+        .filter(({ name }) => name !== 'Tashkent City' && name !== 'Silk Road Residence'),
+      ...(LEGACY_SAMARKAND_SILK_ROAD_RESIDENCE ? [LEGACY_SAMARKAND_SILK_ROAD_RESIDENCE] : []),
+    ]),
+  }),
+  Samarkand: Object.freeze({
+    ...(BASE_LOCATION_DICTIONARIES.UZ?.Samarkand || {}),
     residentialComplexes: Object.freeze(
-      (BASE_LOCATION_DICTIONARIES.UZ?.Tashkent?.residentialComplexes || [])
-        .filter(({ name }) => name !== 'Tashkent City'),
+      (BASE_LOCATION_DICTIONARIES.UZ?.Samarkand?.residentialComplexes || [])
+        .filter(({ name }) => name !== 'Silk Road Residence'),
     ),
   }),
 });
@@ -125,6 +138,9 @@ function normalizeUzSemanticLocations(country) {
 
   const samarkand = normalized?.Samarkand;
   if (samarkand) {
+    const microdistricts = samarkand.microdistricts || [];
+    const mahallas = samarkand.mahallas || [];
+    const settlements = samarkand.settlements || [];
     const landmarks = samarkand.landmarks || [];
     const localAreas = samarkand.localAreas || [];
     const streets = samarkand.streets || [];
@@ -168,14 +184,150 @@ function normalizeUzSemanticLocations(country) {
       ? semanticEntry(canonicalUniversity, 'University Boulevard', universityAliases, 'street')
       : null;
 
+    const sogdianaMicrodistrict = microdistricts.find(({ name }) => name === 'Sogdiana');
+    const sogdianaLocalArea = localAreas.find(({ name }) => name === 'Sugdiyona');
+    const sogdianaMahalla = mahallas.find(({ name }) => name === 'Sogdiana');
+    const normalizedSogdiana = semanticEntry(
+      sogdianaMahalla || sogdianaLocalArea || sogdianaMicrodistrict || {},
+      'Sogdiana',
+      [
+        ...(sogdianaMahalla?.aliases || []),
+        ...(sogdianaLocalArea?.aliases || []),
+        ...(sogdianaMicrodistrict?.aliases || []),
+        'Sugdiyona',
+        "Sug'diyona",
+        'Sug‘diyona',
+        "So'g'diyona",
+        'So‘g‘diyona',
+        'Согдиана',
+        'Согдиёна',
+        'Сўғдиёна',
+      ],
+      'mahalla',
+    );
+
+    const kimyogarlarMicrodistrict = microdistricts.find(({ name }) => name === 'Kimyogarlar');
+    const kimyogarlarLocalArea = localAreas.find(({ name }) => name === 'Kimyogarlar');
+    const kimyogarlarSettlement = settlements.find(({ name }) => name === 'Kimyogarlar');
+    const normalizedKimyogarlar = semanticEntry(
+      kimyogarlarSettlement || kimyogarlarLocalArea || kimyogarlarMicrodistrict || {},
+      'Kimyogarlar',
+      [
+        ...(kimyogarlarSettlement?.aliases || []),
+        ...(kimyogarlarLocalArea?.aliases || []),
+        ...(kimyogarlarMicrodistrict?.aliases || []),
+        'Кимёгарлар',
+        'Химики',
+        'Химгородок',
+        'посёлок Химиков',
+        'поселок Химиков',
+      ],
+      'settlement',
+    );
+
+    const chilquduqSource = mahallas.find(({ name }) => ['Chilquduq', 'Chilkuduq', 'Chilkuduk'].includes(name));
+    const navrozSource = mahallas.find(({ name }) => name === "Navro'z");
+    const shirinSource = mahallas.find(({ name }) => name === 'Shirin');
+    const choponOtaSource = mahallas.find(({ name }) => name === "Cho'pon ota");
+    const normalizedChilquduq = semanticEntry(
+      { ...(chilquduqSource || {}), parent: 'Xishrov' },
+      'Chilquduq',
+      [
+        ...(chilquduqSource?.aliases || []),
+        'Chilkuduq',
+        'Chilkuduk',
+        'Chilquduq MFY',
+        'Chilquduq mahallasi',
+        'Чилқудуқ',
+        'Чилкудук',
+      ],
+      'mahalla',
+    );
+    const normalizedNavroz = navrozSource
+      ? semanticEntry({ ...navrozSource, parent: 'Xishrov' }, "Navro'z", navrozSource.aliases || [], 'mahalla')
+      : null;
+    const normalizedShirin = shirinSource
+      ? semanticEntry({ ...shirinSource, parent: 'Farhod' }, 'Shirin', shirinSource.aliases || [], 'mahalla')
+      : null;
+    const normalizedChoponOta = choponOtaSource
+      ? semanticEntry({ ...choponOtaSource, parent: 'Farhod' }, "Cho'pon ota", choponOtaSource.aliases || [], 'mahalla')
+      : null;
+
+    const existingXishrov = settlements.find(({ name }) => ['Xishrov', 'Xishrav', 'Khishrav'].includes(name));
+    const normalizedXishrov = semanticEntry(
+      existingXishrov || {},
+      'Xishrov',
+      [
+        ...(existingXishrov?.aliases || []),
+        'Xishrav',
+        'Khishrav',
+        'Хишрав',
+        "So'lim shaharchasi",
+        'So‘lim shaharchasi',
+        'Solim shaharchasi',
+        'Сўлим шаҳарчаси',
+        'Сулим шахарчаси',
+      ],
+      'settlement',
+    );
+    const existingFarhod = settlements.find(({ name }) => ['Farhod', 'Farxod'].includes(name));
+    const normalizedFarhod = semanticEntry(
+      existingFarhod || {},
+      'Farhod',
+      [
+        ...(existingFarhod?.aliases || []),
+        'Farhod shaharchasi',
+        'Farxod shaharchasi',
+        'Фарход шаҳарчаси',
+        'Фарход шахарчаси',
+      ],
+      'settlement',
+    );
+
+    const verifiedSamarkandStreetRows = Object.freeze([
+      ['Siyob Street', ['Siyob ko‘chasi', "Siyob ko'chasi", 'Сиёб кўчаси', 'Сиабская улица']],
+      ["Cho'pon-Ota Street", ["Cho'pon-Ota ko'chasi", 'Cho‘pon-Ota ko‘chasi', 'Чўпон Ота кўчаси', 'улица Чупон-Ота']],
+      ['Academician Vohid Abdullayev Street', ['Akademik Vohid Abdullayev ko‘chasi', "Akademik Vohid Abdullayev ko'chasi", 'Vohid Abdullayev ko‘chasi', 'улица Академика Вохида Абдуллаева']],
+    ]);
+    const verifiedSamarkandStreetNames = new Set(verifiedSamarkandStreetRows.map(([name]) => name));
+    const verifiedSamarkandStreets = verifiedSamarkandStreetRows.map(([name, aliases]) => semanticEntry({}, name, aliases, 'street'));
+
     normalized = Object.freeze({
       ...normalized,
       Samarkand: Object.freeze({
         ...samarkand,
-        localAreas: Object.freeze(localAreas.filter(({ name }) => name !== 'University Boulevard')),
+        mahallas: Object.freeze([
+          ...mahallas.filter(({ name }) => ![
+            'Sogdiana',
+            'Chilquduq',
+            'Chilkuduq',
+            'Chilkuduk',
+            "Navro'z",
+            'Shirin',
+            "Cho'pon ota",
+          ].includes(name)),
+          normalizedSogdiana,
+          normalizedChilquduq,
+          ...(normalizedNavroz ? [normalizedNavroz] : []),
+          ...(normalizedShirin ? [normalizedShirin] : []),
+          ...(normalizedChoponOta ? [normalizedChoponOta] : []),
+        ]),
+        microdistricts: Object.freeze(
+          microdistricts.filter(({ name }) => !['Sogdiana', 'Kimyogarlar'].includes(name)),
+        ),
+        localAreas: Object.freeze(
+          localAreas.filter(({ name }) => !['University Boulevard', 'Sugdiyona', 'Kimyogarlar'].includes(name)),
+        ),
+        settlements: Object.freeze([
+          ...settlements.filter(({ name }) => !['Kimyogarlar', 'Xishrov', 'Xishrav', 'Khishrav', 'Farhod', 'Farxod'].includes(name)),
+          normalizedKimyogarlar,
+          normalizedXishrov,
+          normalizedFarhod,
+        ]),
         streets: Object.freeze([
-          ...streets.filter(({ name }) => name !== 'University Boulevard'),
+          ...streets.filter(({ name }) => name !== 'University Boulevard' && !verifiedSamarkandStreetNames.has(name)),
           ...(normalizedUniversity ? [normalizedUniversity] : []),
+          ...verifiedSamarkandStreets,
         ]),
         landmarks: Object.freeze([
           ...landmarks.filter(({ name }) => ![
@@ -359,6 +511,7 @@ const COUNTRY_LOCATION_DICTIONARIES = Object.freeze({
     UA_SECONDARY_LOCATION_EXTENSIONS,
     UA_METRO_LOCATION_EXTENSIONS,
     UA_KHARKIV_TRANSLATION_EXTENSIONS,
+    UA_CITY_LOCATION_EXPANSIONS,
   ),
 });
 

package/src/tashkent-residential-complexes.js

@@ -60,7 +60,7 @@ export const TASHKENT_RESIDENTIAL_COMPLEXES = Object.freeze([
   complex('Comfort House', ['Комфорт Хаус']),
   complex('Darhan', ['Darkhan Residence', 'Дархан Резиденс', 'Дархан', 'Darkhan']),
   complex('DARVOZA'),
-  complex('Dostlar', ['Do‘stlar', 'Do\'stlar', 'Doʻstlar', 'Дустлар', 'Дўстлар', 'Дустлар ЖК']),
+  complex('Do‘stlar', ['Dostlar', 'Do\'stlar', 'Doʻstlar', 'Дустлар', 'Дўстлар', 'Дустлар ЖК']),
   complex('Dream House', ['Дрим-Хаус', 'Дрим Хаус']),
   complex('Dreamland Aeroport'),
   complex('Dreamland Do\'stlik'),

package/src/ua-city-location-expansions.js

@@ -0,0 +1,76 @@
+import { locationEntries } from './location-merge.js';
+
+const microdistricts = (rows) => Object.freeze({ microdistricts: locationEntries(rows) });
+
+// Listing-facing aliases that enrich the major Ukraine dictionaries without
+// changing their established parser canonicals. Keep physical coordinates and
+// source ownership in geo-catalog.
+export const UA_CITY_LOCATION_EXPANSIONS = Object.freeze({
+  Kharkiv: microdistricts([
+    ['Zhukovskoho', 'Селище ім. Жуковського', 'селище Жуковського', 'Жуковського', 'посёлок Жуковского', 'поселок Жуковского', 'Жуковского', 'Zhukovskoho settlement'],
+    ['Kulynychi', 'Кулиничі', 'Кулиничи', 'селище Кулиничі', 'посёлок Кулиничи', 'поселок Кулиничи', 'Kulynichi'],
+    ['Saltivka', 'Saltovka', 'Салтовка'],
+    ['Pavlove Pole', 'Pavlovo Pole', 'Pavlovo Polye'],
+    ['Oleksiivka', 'Alekseevka', 'Alekseyevka'],
+    ['Kholodna Hora', 'Kholodnaya Gora', 'Holodnaya Gora'],
+    ['Novi Budynky', 'Novye Doma', 'Novyye Doma'],
+    ['Piatykhatky', 'Pyatikhatki', 'Pyatihatki'],
+    ['Zaliutyne', 'Zalyutino', 'Zalutino'],
+    ['Rohan', 'Rogan'],
+    ['Zhuravlivka', 'Zhuravlevka'],
+    ['Velyka Danylivka', 'Bolshaya Danilovka', 'Velika Danylivka'],
+    ['Sokolnyky', 'Sokolniki'],
+  ]),
+
+  Odesa: microdistricts([
+    ['Vuzivskyi', 'Вузівський', 'Вузовський', 'Вузовский', 'Vuzovskyi', 'Вузівський район', 'Вузовский район'],
+    ['Chubaivka', 'Чубаївка', 'Чубаевка', 'Chubayevka'],
+    ['Arkadia', 'Arcadia', 'район Аркадії', 'район Аркадии', 'Аркадія район', 'Аркадия район'],
+    ['Tairova', 'Tairovo', 'район Таїрова', 'район Таирова', 'ж/м Таїрова', 'ж/м Таирова', 'жилмассив Таирова'],
+    ['Cheryomushky', 'Cheremushki', 'Cheryomushki', 'Черемушки Одеса', 'Черёмушки Одесса', 'Черемушки Одесса', 'Черемушки район', 'Черёмушки район'],
+    ['Kotivskoho', 'Котовка', 'Поскот', 'ПосКот', 'ж/м Котовського', 'ж/м Котовского', 'жилмассив Котовского'],
+    ['Luzanivka', 'Luzanovka', 'Лузановский район', 'Лузанівський район', 'район Лузановки', 'район Лузанівки'],
+    ['Malyi Fontan', 'Maly Fontan', 'Малого Фонтана', 'Малого Фонтану', 'на Малом Фонтане', 'на Малому Фонтані'],
+    ['Moldavanka', 'Moldovanka', 'район Молдаванки', 'на Молдаванке', 'на Молдаванці'],
+    ['Peresyp', 'Peresip', 'район Пересыпи', 'район Пересипу', 'на Пересыпи', 'на Пересипі'],
+    ['Chornomorka', 'Chernomorka', 'Черноморка район', 'Чорноморка район', 'Люстдорф', 'Lustdorf'],
+    ['Dacha Kovalevskoho', 'Dacha Kovalevskogo', 'Дача Ковалевского район', 'район Дачи Ковалевского', 'район Дачі Ковалевського'],
+    ['Zastava-1', 'Zastava 1', 'Первая Застава', 'Перша Застава', 'Застава I'],
+    ['Zastava-2', 'Zastava 2', 'Вторая Застава', 'Друга Застава', 'Застава II'],
+  ]),
+
+  Kyiv: microdistricts([
+    ['Troyeshchyna', 'Troieshchyna', 'Троєщина масив', 'жилмассив Троещина', 'ж/м Троєщина', 'ж/м Троещина'],
+    ['Lipky', 'Lypky'],
+    ['Lukianivka', 'Lukyanivka'],
+    ['Zvirynets', 'Zverinets'],
+    ['Holosiiv', 'Holosiyiv', 'Goloseevo'],
+    ['Demiivka', 'Demiyivka', 'Demeevka'],
+    ['Shuliavka', 'Shulyavka'],
+    ['Solomianka', 'Solomyanka', 'Solomenka'],
+    ['Chokolivka', 'Chokolovka'],
+    ['Vidradnyi', 'Otradnyi', 'Otradny'],
+    ['Karavaievi Dachi', 'Karavayevi Dachi', 'Karavaevy Dachi'],
+    ['Kurenivka', 'Kurenevka'],
+    ['Rusanivka', 'Rusanovka'],
+    ['Berezniaky', 'Bereznyaky'],
+    ['Darnytsia', 'Darnitsa'],
+    ['Nova Darnytsia', 'Novaya Darnitsa'],
+    ['Stara Darnytsia', 'Staraya Darnitsa'],
+    ['Pozniaky', 'Poznyaki'],
+    ['Bortnychi', 'Bortnichi'],
+    ['Feofaniia', 'Feofaniya'],
+    ['Vydubychi', 'Vydubichi'],
+    ['Lisovyi Masyv', 'Lisovyi Massif', 'Lesnoy Massiv'],
+    ['Minskyi Masyv', 'Minskyi Massif', 'Minskiy Massiv'],
+    ['Kharkivskyi', 'Kharkivskyi Masyv', 'Kharkivskyi massif', 'Харківський житловий масив', 'Харьковский жилмассив'],
+    ['Borshchahivka', 'Borshchagivka', 'Borshchagovka'],
+    ['Pivdenna Borshchahivka', 'Yuzhnaya Borshchagovka'],
+    ['Mykilska Borshchahivka', 'Nikolskaya Borshchagovka'],
+    ['Sviatoshyn', 'Svyatoshyn'],
+    ['Akademmistechko', 'Akademhorodok', 'Akademgorodok'],
+    ['Pushcha-Vodytsia', 'Pushcha Vodytsia', 'Pushcha-Voditsa'],
+    ['Vynohradar', 'Vinogradar'],
+    ['Nyvky', 'Nivki'],
+  ]),
+});

package/src/uz-location-extensions.js

@@ -210,6 +210,7 @@ export const UZ_LOCATION_EXTENSIONS = Object.freeze({
       ['Tashkent City', 'Ташкент Сити', 'Toshkent City', 'Tashkent City IBC'],
     ],
     streets: [
+      { name: "Bog'bon Street", aliases: ['Bog‘bon ko‘chasi', "Bog'bon ko'chasi", 'Bogbon kochasi', 'улица Богбон', 'ул. Богбон'], parent: 'Yunusabad' },
       { name: 'Gulobod Street', aliases: ['Gulobod ko‘chasi', "Gulobod ko'chasi", 'улица Гулобод', 'ул. Гулобод'], parent: 'Shaykhantahur' },
       { name: 'Sebzor Street', aliases: ['Sebzor ko‘chasi', "Sebzor ko'chasi", 'улица Себзор', 'ул. Себзор'], parent: 'Almazar' },
       { name: 'Lolazor Street', aliases: ['Lolazor ko‘chasi', "Lolazor ko'chasi", 'улица Лолазор', 'ул. Лолазор'], parent: 'Uchtepa' },
@@ -241,7 +242,7 @@ export const UZ_LOCATION_EXTENSIONS = Object.freeze({
       ['Registan Square','Регистан','Registon','Площадь Регистан'],['Gur-e Amir','Гур-Эмир',"Go'ri Amir",'Гўри Амир'],['Shohi Zinda','Шахи-Зинда','Шоҳи Зинда'],['Bibi-Khanym','Биби-Ханым','Bibixonim','Бибихоним'],
       ['Siyob Bazaar','Сиабский базар','Siyob bozori','Сиёб бозори'],['Afrosiyob','Афросиаб','Афросиёб'],['Ulugbek Observatory','Обсерватория Улугбека',"Ulug'bek rasadxonasi"],['University Boulevard','Университетский бульвар','Universitet xiyoboni'],
       ['Eternal City','Вечный город','Boqiy shahar'],['Silk Road Samarkand'],['Samarkand City','Самарканд Сити'],['Samarkand International Airport','Международный аэропорт Самарканд','Samarqand xalqaro aeroporti','SKD'],
-      ['Samarkand Railway Station','Самарканд вокзал','Samarqand vokzali'],['Central Park','Центральный парк',"Markaziy bog'"],['Alisher Navoiy Park','Парк Алишера Навои',"Alisher Navoiy bog'i"],['Youth Park','Парк Молодёжи',"Yoshlar bog'i"],
+      ['Samarkand Railway Station','Самарканд вокзал','Samarqand vokzali'],['Alisher Navoiy Park','Central Park','Центральный парк',"Markaziy bog'",'Парк Алишера Навои',"Alisher Navoiy bog'i"],['Youth Park','Парк Молодёжи',"Yoshlar bog'i"],
       ['Yangi Ozbekiston Park',"Yangi O'zbekiston bog'i",'Парк Новый Узбекистан'],['Family Park'],
     ],
   }),