From eb5d00bcc3e2a5a5fceb34b8c5978536ef136004 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 25 Sep 2017 23:36:28 -0400 Subject: [PATCH] Convert lodah-es and d3 to named imports for validations --- modules/validations/deprecated_tag.js | 5 +++-- modules/validations/disconnected_highway.js | 1 - modules/validations/many_deletions.js | 1 + modules/validations/missing_tag.js | 5 +++-- modules/validations/old_multipolygon.js | 1 - modules/validations/tag_suggests_area.js | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/validations/deprecated_tag.js b/modules/validations/deprecated_tag.js index 7c416a7a0..3690e714e 100644 --- a/modules/validations/deprecated_tag.js +++ b/modules/validations/deprecated_tag.js @@ -1,4 +1,5 @@ -import _ from 'lodash'; +import _isEmpty from 'lodash-es/isEmpty'; + import { t } from '../util/locale'; import { utilTagText } from '../util/index'; @@ -11,7 +12,7 @@ export function validationDeprecatedTag() { var change = changes.created[i], deprecatedTags = change.deprecatedTags(); - if (!_.isEmpty(deprecatedTags)) { + if (!_isEmpty(deprecatedTags)) { var tags = utilTagText({ tags: deprecatedTags }); warnings.push({ id: 'deprecated_tags', diff --git a/modules/validations/disconnected_highway.js b/modules/validations/disconnected_highway.js index 97da88593..ef2d8cf8c 100644 --- a/modules/validations/disconnected_highway.js +++ b/modules/validations/disconnected_highway.js @@ -3,7 +3,6 @@ import { t } from '../util/locale'; export function validationDisconnectedHighway() { - function isDisconnectedHighway(entity, graph) { if (!entity.tags.highway) return false; if (entity.geometry(graph) !== 'line') return false; diff --git a/modules/validations/many_deletions.js b/modules/validations/many_deletions.js index 665d81e57..6c64b4f09 100644 --- a/modules/validations/many_deletions.js +++ b/modules/validations/many_deletions.js @@ -1,5 +1,6 @@ import { t } from '../util/locale'; + export function validationManyDeletions() { var threshold = 100; diff --git a/modules/validations/missing_tag.js b/modules/validations/missing_tag.js index b2ac72611..6785ab247 100644 --- a/modules/validations/missing_tag.js +++ b/modules/validations/missing_tag.js @@ -1,11 +1,12 @@ -import _ from 'lodash'; +import _without from 'lodash-es/without'; import { t } from '../util/locale'; + export function validationMissingTag() { // Slightly stricter check than Entity#isUsed (#3091) function hasTags(entity, graph) { - return _.without(Object.keys(entity.tags), 'area', 'name').length > 0 || + return _without(Object.keys(entity.tags), 'area', 'name').length > 0 || graph.parentRelations(entity).length > 0; } diff --git a/modules/validations/old_multipolygon.js b/modules/validations/old_multipolygon.js index 7da735a88..6e6c640b8 100644 --- a/modules/validations/old_multipolygon.js +++ b/modules/validations/old_multipolygon.js @@ -4,7 +4,6 @@ import { osmIsSimpleMultipolygonOuterMember } from '../osm'; export function validationOldMultipolygon() { - return function validation(changes, graph) { var warnings = []; for (var i = 0; i < changes.created.length; i++) { diff --git a/modules/validations/tag_suggests_area.js b/modules/validations/tag_suggests_area.js index 1a85815d5..20b4a402c 100644 --- a/modules/validations/tag_suggests_area.js +++ b/modules/validations/tag_suggests_area.js @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import _isEmpty from 'lodash-es/isEmpty'; import { t } from '../util/locale'; @@ -7,7 +7,7 @@ import { t } from '../util/locale'; export function validationTagSuggestsArea() { function tagSuggestsArea(tags) { - if (_.isEmpty(tags)) return false; + if (_isEmpty(tags)) return false; var presence = ['landuse', 'amenities', 'tourism', 'shop']; for (var i = 0; i < presence.length; i++) {