pelias-openstreetmap 5.13.1 → 5.16.0

package/config/features.js

@@ -6,7 +6,8 @@
 
 // default tags imported
 const tags = [
-  'addr:housenumber+addr:street'
+  'addr:housenumber+addr:street',
+  'addr:housenumber+addr:place'  // @ref https://github.com/pelias/pelias/issues/787#issuecomment-477137803
 ];
 
 // tags corresponding to venues

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pelias-openstreetmap",
-  "version": "5.13.1",
+  "version": "5.16.0",
   "engines": {
     "node": ">=10.0.0"
   },
@@ -46,8 +46,8 @@
     "pelias-config": "^4.12.0",
     "pelias-dbclient": "^2.13.0",
     "pelias-logger": "^1.2.1",
-    "pelias-model": "^9.1.1",
-    "pelias-wof-admin-lookup": "^7.4.1",
+    "pelias-model": "^9.2.0",
+    "pelias-wof-admin-lookup": "^7.7.0",
     "through2": "^3.0.0",
     "through2-sink": "^1.0.0"
   },

package/schema/address_karlsruhe.js

@@ -22,4 +22,4 @@ var KARLSRUHE_SCHEMA = {
   // 'addr:country':       'country'
 };
 
-module.exports = KARLSRUHE_SCHEMA;
+module.exports = KARLSRUHE_SCHEMA;

package/stream/addresses_without_street.js

@@ -0,0 +1,55 @@
+
+/**
+  This stream is responsible for filling 'addr:street' if is empty or missing,
+  with 'addr:place' value. Note that both 'addr:place' and 'addr:housenumber'
+  must be present inside tags!
+
+  @ref https://github.com/pelias/openstreetmap/pull/565
+**/
+
+const _ = require('lodash');
+const through = require('through2');
+const peliasLogger = require('pelias-logger').get('openstreetmap');
+
+
+module.exports = function(){
+
+  var stream = through.obj( function( doc, enc, next ) {
+
+    try {
+
+      // skip records with no tags
+      var tags = doc.getMeta('tags');
+      if( !tags ){
+        return next( null, doc );
+      }
+
+      // housenumber is required
+      if (!_.has(tags, 'addr:housenumber')){
+        return next( null, doc );
+      }
+
+      const street = _.get(tags, 'addr:street', '').trim();
+      const place = _.get(tags, 'addr:place', '').trim();
+
+      // when street is unset but place is set, use place for the street name
+      if (_.isEmpty(street) && !_.isEmpty(place)) {
+        _.set(tags, 'addr:street', place);
+      }
+    }
+
+    catch( e ){
+      peliasLogger.error( 'addresses_without_street error' );
+      peliasLogger.error( e.stack );
+      peliasLogger.error( JSON.stringify( doc, null, 2 ) );
+    }
+
+    return next( null, doc );
+
+  });
+
+  // catch stream errors
+  stream.on( 'error', peliasLogger.error.bind( peliasLogger, __filename ) );
+
+  return stream;
+};

package/stream/importPipeline.js

@@ -10,6 +10,7 @@ streams.pbfParser = require('./multiple_pbfs').create;
 streams.docConstructor = require('./document_constructor');
 streams.blacklistStream = require('pelias-blacklist-stream');
 streams.tagMapper = require('./tag_mapper');
+streams.addressesWithoutStreet = require('./addresses_without_street');
 streams.adminLookup = require('pelias-wof-admin-lookup').create;
 streams.addressExtractor = require('./address_extractor');
 streams.categoryMapper = require('./category_mapper');
@@ -22,6 +23,7 @@ streams.elasticsearch = require('pelias-dbclient');
 streams.import = function(){
   streams.pbfParser()
     .pipe( streams.docConstructor() )
+    .pipe( streams.addressesWithoutStreet() )
     .pipe( streams.tagMapper() )
     .pipe( streams.addressExtractor() )
     .pipe( streams.blacklistStream() )