pelias-openstreetmap 5.11.2 → 5.14.0

package/.dockerignore

@@ -1,2 +1,6 @@
 .git
 node_modules
+
+# large test fixtures
+test/*.pbf
+test/fixtures/combined_vancouver_queens.json

package/.github/workflows/push.yml

@@ -7,10 +7,10 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-10.15
         node-version:
-          - 10.x
           - 12.x
+          - 14.x
+          - 16.x
     steps:
       - uses: actions/checkout@v2
       - name: 'Install node.js ${{ matrix.node-version }}'
@@ -20,42 +20,36 @@ jobs:
       - name: Run unit tests
         run: |
           npm install
-          npm run travis
-  functional-tests:
-    runs-on: '${{ matrix.os }}'
-    strategy:
-      matrix:
-        os:
-          - ubuntu-20.04
-          - macos-10.15
-        node-version:
-          - 10.x
-          - 12.x
-    steps:
-      - uses: actions/checkout@v2
-      - name: 'Install node.js ${{ matrix.node-version }}'
-        uses: actions/setup-node@v2-beta
-        with:
-          node-version: '${{ matrix.node-version }}'
-      - name: Run functional tests
-        run: |
-          npm install
-          npm run end-to-end
+          npm run ci
   npm-publish:
     needs: unit-tests
     if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Install node.js 12.x
+      - name: Install Node.js
         uses: actions/setup-node@v2-beta
         with:
-          node-version: 12.x
+          node-version: 16.x
       - name: Run semantic-release
         env:
           GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: >
-          curl
-          "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh"
-          | bash -
+          if [[ -n "$GH_TOKEN" && -n "$NPM_TOKEN" ]]; then
+            curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
+          fi
+  build-docker-images:
+    # run this job if the unit tests passed and the npm-publish job was a success or was skipped
+    # note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true`
+    if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
+    needs: [unit-tests, npm-publish]
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build Docker images
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pelias-openstreetmap",
-  "version": "5.11.2",
+  "version": "5.14.0",
   "engines": {
     "node": ">=10.0.0"
   },
@@ -16,7 +16,7 @@
     "lint": "jshint .",
     "start": "./bin/start",
     "test": "npm run units",
-    "travis": "node ./test/travis-config.js && npm test && npm run end-to-end",
+    "ci": "node ./test/ci-config.js && npm test && npm run end-to-end",
     "units": "./bin/test",
     "validate": "npm ls"
   },
@@ -41,13 +41,12 @@
     "iso-639-3": "^1.0.0",
     "joi": "^14.0.0",
     "lodash": "^4.17.4",
-    "merge": "^1.2.0",
     "pbf2json": "^6.9.0",
     "pelias-blacklist-stream": "^1.0.0",
     "pelias-config": "^4.12.0",
     "pelias-dbclient": "^2.13.0",
     "pelias-logger": "^1.2.1",
-    "pelias-model": "^9.1.1",
+    "pelias-model": "^9.2.0",
     "pelias-wof-admin-lookup": "^7.4.1",
     "through2": "^3.0.0",
     "through2-sink": "^1.0.0"

package/stream/tag_mapper.js

@@ -6,12 +6,11 @@
 
 const _ = require('lodash');
 const through = require('through2');
-const merge = require('merge');
 const peliasLogger = require('pelias-logger').get('openstreetmap');
 
 var LOCALIZED_NAME_KEYS = require('../config/localized_name_keys');
 var NAME_SCHEMA = require('../schema/name_osm');
-var ADDRESS_SCHEMA = merge( true, false,
+var ADDRESS_SCHEMA = _.merge( {},
   require('../schema/address_tiger'),
   require('../schema/address_osm'),
   require('../schema/address_naptan'),
@@ -62,7 +61,8 @@ module.exports = function(){
         else if( _.has(ADDRESS_SCHEMA, key) ){
           var val3 = trim( value );
           if( val3 ){
-            doc.setAddress( ADDRESS_SCHEMA[key], val3 );
+            let label = ADDRESS_SCHEMA[key];
+            doc.setAddress(label, normalizeAddressField(label, val3));
           }
         }
       });
@@ -149,3 +149,20 @@ function getNameSuffix( tag ){
 
   return suffix;
 }
+
+// apply some very basic normalization
+// note: in the future we should consider doing something more advanced like:
+// https://github.com/pelias/openaddresses/pull/477
+function normalizeAddressField(key, value) {
+  if (key === 'street') {
+
+    // contract English diagonals
+    value = value
+      .replace(/\b(northwest)\b/i, 'NW')
+      .replace(/\b(northeast)\b/i, 'NE')
+      .replace(/\b(southwest)\b/i, 'SW')
+      .replace(/\b(southeast)\b/i, 'SE');
+  }
+
+  return value;
+}

package/.circleci/config.yml

@@ -1,12 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: /app
-    docker:
-      - image: docker:18.06.1-ce-git
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build and push image to Docker Hub
-          command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -