Merge pull request #718 from pelias/master

Merge master into staging

.jshintrc

@@ -2,6 +2,7 @@
   "node": true,
   "curly": true,
   "eqeqeq": true,
+  "esversion": 6,
   "freeze": true,
   "immed": true,
   "indent": 2,

package.json

@@ -38,7 +38,7 @@
     "addressit": "1.4.0",
     "async": "^2.0.0",
     "check-types": "^7.0.0",
-    "elasticsearch": "^11.0.0",
+    "elasticsearch": "^12.0.1",
     "elasticsearch-exceptions": "0.0.4",
     "express": "^4.8.8",
     "express-http-proxy": "^0.10.0",
@@ -52,12 +52,12 @@
     "markdown": "0.5.0",
     "morgan": "1.7.0",
     "pelias-categories": "1.1.0",
-    "pelias-config": "2.3.0",
+    "pelias-config": "2.3.1",
     "pelias-labels": "1.5.0",
     "pelias-logger": "0.1.0",
     "pelias-model": "4.3.0",
     "pelias-query": "8.8.0",
-    "pelias-text-analyzer": "1.4.0",
+    "pelias-text-analyzer": "1.5.0",
     "stats-lite": "2.0.3",
     "through2": "2.0.1"
   },

test/ciao/search/address_parsing.coffee

@@ -33,12 +33,9 @@ json.geocoding.query['text'].should.eql '30 w 26th st, ny'
 json.geocoding.query['size'].should.eql 10
 
 #? address parsing
-json.geocoding.query.parsed_text['name'].should.eql '30 w 26th st'
 json.geocoding.query.parsed_text['number'].should.eql '30'
 json.geocoding.query.parsed_text['street'].should.eql 'w 26th st'
-json.geocoding.query.parsed_text['state'].should.eql 'NY'
+json.geocoding.query.parsed_text['state'].should.eql 'ny'
-json.geocoding.query.parsed_text['regions'].should.eql []
-json.geocoding.query.parsed_text['admin_parts'].should.eql "ny"
 
 json.features[0].properties.confidence.should.eql 1
 json.features[0].properties.match_type.should.eql "exact"