Skip to content

Commit

Permalink
Merge pull request #562 from pelias/remove-merge
Browse files Browse the repository at this point in the history
Remove 'merge' package
  • Loading branch information
orangejulius authored Sep 24, 2021
2 parents 0ec1829 + bee0826 commit 8e591d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"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",
Expand Down
3 changes: 1 addition & 2 deletions stream/tag_mapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down

0 comments on commit 8e591d3

Please sign in to comment.