Merge pull request #825 from spencermountain/dev

13.10.2
spencermountain · Mar 12, 2021 · 1f3fab9 · 1f3fab9
2 parents 82bfa6d + 1a0c425
commit 1f3fab9
Show file tree

Hide file tree

Showing 66 changed files with 8,877 additions and 888 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -49,6 +49,6 @@ jobs:
         run: |
           npm run test:smoke
           npm run testb
-          npm run perf
+          # npm run perf
           npm run test:types
           # npm run test:stress
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
         run: |
           npm run test:smoke
           npm run testb
-          npm run perf
+          # npm run perf
           npm run test:types
           # npm run test:stress
 

diff --git a/README.md b/README.md
@@ -338,7 +338,7 @@ nlp.extend((Doc, world) => {
 | [Tokenization](https://observablehq.com/@spencermountain/compromise-tokenization) | [Text](https://observablehq.com/@spencermountain/compromise-text) | [Pronounce](https://observablehq.com/@spencermountain/compromise-pronounce)
 | [Named-Entities](https://observablehq.com/@spencermountain/compromise-topics) | [Utils](https://observablehq.com/@spencermountain/compromise-utils) | [Strict](https://observablehq.com/@spencermountain/compromise-strict)
 | [Whitespace](https://observablehq.com/@spencermountain/compromise-whitespace) | [Verbs](https://observablehq.com/@spencermountain/verbs) | [Penn-tags](https://observablehq.com/@spencermountain/compromise-penn-tags)
-| [World data](https://observablehq.com/@spencermountain/compromise-world) | [Normalization](https://observablehq.com/@spencermountain/compromise/Normalization) |
+| [World data](https://observablehq.com/@spencermountain/compromise-world) | [Normalization](https://observablehq.com/@spencermountain/compromise/Normalization) | [Typeahead](https://observablehq.com/@spencermountain/compromise/compromise-typeahead)
 | [Fuzzy-matching](https://observablehq.com/@spencermountain/compromise-fuzzy-matching) |[Typescript](https://observablehq.com/@spencermountain/compromise-typescript) |
 
 

diff --git a/builds/compromise-tokenize.js b/builds/compromise-tokenize.js
diff --git a/builds/compromise.js b/builds/compromise.js
diff --git a/builds/compromise.min.js b/builds/compromise.min.js
diff --git a/builds/compromise.mjs b/builds/compromise.mjs
diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,11 @@ While all _Major_ releases should be reviewed, our only two _large_ releases are
 
 -->
 
+#### 13.10.2  [March 2021]
+- **[fix]** - support matching implicit terms in (or|blocks)
+- **[change]** - add #Timezone tag (from date-plugin)
+- **[change]** - add many more cities and regions
+
 #### 13.10.1 [March 2021]
 - **[change]** - #Date terms can still be a #Conjunction
 - **[new]** - #Imperative tag and `.verbs().isImperative()` method

diff --git a/data/places/cities.js b/data/places/cities.js
@@ -237,5 +237,260 @@ module.exports = [
   'yokohama',
   'zagreb',
   'zurich',
-  // 'sana\'a',
+
+  'delhi',
+  'sao paulo',
+  'wuhan',
+  'lagos',
+  'nyc',
+  'dongguan',
+  'kinshasa',
+  'chongqing',
+  'chengdu',
+  'baghdad',
+  'nanjing',
+  'nanchong',
+  'xian',
+  'lahore',
+  'shenyang',
+  'hangzhou',
+  'rio',
+  'harbin',
+  'taian',
+  'suzhou',
+  'shantou',
+  'bengaluru',
+  'saint petersburg',
+  'kolkata',
+  'jinan',
+  'zhengzhou',
+  'riyadh',
+  'changchun',
+  'dalian',
+  'chattogram',
+  'kunming',
+  'qingdao',
+  'kano',
+  'foshan',
+  'puyang',
+  'ibadan',
+  'wuxi',
+  'xiamen',
+  'tianshui',
+  'ningbo',
+  'shiyan',
+  'taiyuan',
+  'tangshan',
+  'hefei',
+  'zibo',
+  'zhongshan',
+  'changsha',
+  'urumqi',
+  'dubai',
+  'surat',
+  'jeddah',
+  'shijiazhuang',
+  'kanpur',
+  'kyiv',
+  'luanda',
+  'quezon',
+  'addis ababa',
+  'nairobi',
+  'jaipur',
+  'dar es salaam',
+  'lanzhou',
+  'yunfu',
+  'basrah',
+  'mogadishu',
+  'faisalabad',
+  'izmir',
+  'lucknow',
+  'fortaleza',
+  'surabaya',
+  'belo horizonte',
+  'nanchang',
+  'mashhad',
+  'nagpur',
+  'maracaibo',
+  'santo domingo',
+  'al mawsil al jadidah',
+  'johannesburg',
+  'kowloon',
+  'al basrah al qadimah',
+  'dadonghai',
+  'medellin',
+  'tashkent',
+  'algiers',
+  'khartoum',
+  'accra',
+  'guayaquil',
+  'ordos',
+  'sanaa',
+  'jilin',
+  'camayenne',
+  'indore',
+  'iztapalapa',
+  'conakry',
+  'bayan nur',
+  'maracay',
+  'medan',
+  'rawalpindi',
+  'mosul',
+  'bandung',
+  'soweto',
+  'kallakurichi',
+  'rabat',
+  'aleppo',
+  'kunshan',
+  'patna',
+  'bhopal',
+  'manaus',
+  'xinyang',
+  'kaduna',
+  'isfahan',
+  'ludhiana',
+  'san diego',
+
+  'port au prince',
+  'adelaide',
+  'brazzaville',
+  'baotou',
+  'tijuana',
+  'dallas',
+  'medina',
+  'tripoli',
+  'volgograd',
+  'samara',
+  'omsk',
+  'mecca',
+  'makassar',
+  'asuncion',
+  'recife',
+  'san antonio',
+  'changzhou',
+  'mendoza',
+  'marrakesh',
+  'san francisco',
+  'turin',
+  'la paz',
+  'jerusalem',
+  'fort worth',
+  'indianapolis',
+  'sarajevo',
+  'muscat',
+  'salem',
+  'sheffield',
+  'seattle',
+  'denver',
+  'el paso',
+  'detroit',
+  'islamabad',
+  'kirkuk',
+  'mississauga',
+  'boston',
+  'nantong',
+  'guadalupe',
+  'bristol',
+  'milwaukee',
+  'kyoto',
+  'cancun',
+  'portland',
+  'cordoba',
+  'tabriz',
+  'novosibirsk',
+  'benghazi',
+  'memphis',
+  'oran',
+  'glasgow',
+  'gold coast',
+  'zhangzhou',
+  'libreville',
+  'dortmund',
+  'vladivostok',
+  'irkutsk',
+  'duesseldorf',
+  'albuquerque',
+  'port said',
+  'nashville',
+  'macau',
+  'fresno',
+  'hannover',
+  'leicester',
+  'leipzig',
+  'sacramento',
+  'santa fe',
+  'dresden',
+  'tomsk',
+  'long beach',
+  'staten island',
+  'kawaguchi',
+  'cardiff',
+  'san juan',
+  'edinburgh',
+  'atlanta',
+  'miami',
+  'santa marta',
+  'oakland',
+  'nagasaki',
+  'gaza',
+  'newcastle',
+  'zanzibar',
+  'tulsa',
+  'kandahar',
+  'wichita',
+  'new orleans',
+  'arlington',
+  'cleveland',
+  'fukuyama',
+  'bakersfield',
+  'honolulu',
+  'canberra',
+  'halifax',
+  'nagano',
+  'anaheim',
+  'raleigh',
+  'santa ana',
+  'islington',
+  'anapolis',
+  'saint louis',
+  'butuan',
+  'pittsburgh',
+  'gujrat',
+  'anchorage',
+  'windsor',
+  'strasbourg',
+  'belfast',
+  'orlando',
+  'san pedro',
+  'windhoek',
+  'chengzhong',
+  'wuzhou',
+
+  // india state-capitals
+  'agartala',
+  'aizawl',
+  'amaravati',
+  'bangalore',
+  'bhopal',
+  'bhubaneshwar',
+  'chandigarh',
+  'chandigarh',
+  'chennai',
+  'dehradun',
+  'dispur',
+  'gandhinagar',
+  'gangtok',
+  'hyderabad',
+  'imphal',
+  'itanagar',
+  'jaipur',
+  'kohima',
+  'lucknow',
+  'mumbai',
+  'panaji',
+  'patna',
+  'raipur',
+  'ranchi',
+  'shillong',
+  'shimla',
 ]
diff --git a/data/places/countries.js b/data/places/countries.js
@@ -200,6 +200,7 @@ module.exports = [
   'somalia',
   'south africa',
   'south korea',
+  'korea',
   'south sudan',
   'spain',
   'sri lanka',

diff --git a/data/places/places.js b/data/places/places.js
@@ -67,4 +67,25 @@ module.exports = [
   'malibu',
   'gay village',
   'sunderland',
+
+  // places with their own timezones
+  'tahiti',
+  'chatham',
+  'pitcairn',
+  'azores',
+  'magadan',
+  'hovd',
+  'vostok',
+  'wake island',
+  'anadyr',
+  'samara',
+  'ulaanbaatar',
+  'krasnoyarsk',
+  'indochina',
+  'yakutsk',
+  'chamorro',
+  'chuuk',
+  'samara',
+  'kosrae',
+  'sakhalin',
 ]