From dc8fd135860af7607dbc2eed13151305d266f62f Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Fri, 23 Oct 2020 13:47:09 -0400 Subject: [PATCH] Enable array-callback-return eslint rule --- .eslintrc | 1 + modules/operations/extract.js | 6 +++--- modules/operations/reverse.js | 8 ++++---- modules/presets/index.js | 5 ++--- modules/services/osmose.js | 4 ++-- modules/svg/mapillary_images.js | 1 + modules/ui/feature_info.js | 1 + modules/ui/fields/wikidata.js | 4 ++-- modules/ui/fields/wikipedia.js | 1 + modules/validations/disconnected_way.js | 2 ++ 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.eslintrc b/.eslintrc index 1f5fa2374..a7d98196d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -16,6 +16,7 @@ }, "rules": { "accessor-pairs": "error", + "array-callback-return": "warn", "arrow-spacing": "warn", "block-scoped-var": "error", "class-methods-use-this": "error", diff --git a/modules/operations/extract.js b/modules/operations/extract.js index b8a3309c6..c6d75279d 100644 --- a/modules/operations/extract.js +++ b/modules/operations/extract.js @@ -17,14 +17,14 @@ export function operationExtract(context, selectedIDs) { var _actions = selectedIDs.map(function(entityID) { var graph = context.graph(); var entity = graph.hasEntity(entityID); - if (!entity || !entity.hasInterestingTags()) return; + if (!entity || !entity.hasInterestingTags()) return null; - if (entity.type === 'node' && graph.parentWays(entity).length === 0) return; + if (entity.type === 'node' && graph.parentWays(entity).length === 0) return null; if (entity.type !== 'node') { var preset = presetManager.match(entity, graph); // only allow extraction from ways/relations if the preset supports points - if (preset.geometry.indexOf('point') === -1) return; + if (preset.geometry.indexOf('point') === -1) return null; } _extent = _extent ? _extent.extend(entity.extent(graph)) : entity.extent(graph); diff --git a/modules/operations/reverse.js b/modules/operations/reverse.js index 55ad14c2d..c4a01d36d 100644 --- a/modules/operations/reverse.js +++ b/modules/operations/reverse.js @@ -18,18 +18,18 @@ export function operationReverse(context, selectedIDs) { function actions(situation) { return selectedIDs.map(function(entityID) { var entity = context.hasEntity(entityID); - if (!entity) return; + if (!entity) return null; if (situation === 'toolbar') { if (entity.type === 'way' && - (!entity.isOneWay() && !entity.isSided())) return; + (!entity.isOneWay() && !entity.isSided())) return null; } var geometry = entity.geometry(context.graph()); - if (entity.type !== 'node' && geometry !== 'line') return; + if (entity.type !== 'node' && geometry !== 'line') return null; var action = actionReverse(entityID); - if (action.disabled(context.graph())) return; + if (action.disabled(context.graph())) return null; return action; }).filter(Boolean); diff --git a/modules/presets/index.js b/modules/presets/index.js index 5d752f380..50a795955 100644 --- a/modules/presets/index.js +++ b/modules/presets/index.js @@ -398,9 +398,8 @@ export function presetIndex() { return _addablePresetIDs.map((id) => { const preset = _this.item(id); - if (preset) { - return RibbonItem(preset, 'addable'); - } + if (preset) return RibbonItem(preset, 'addable'); + return null; }).filter(Boolean); }; diff --git a/modules/services/osmose.js b/modules/services/osmose.js index b2eb4412b..7d9852850 100644 --- a/modules/services/osmose.js +++ b/modules/services/osmose.js @@ -207,7 +207,7 @@ export default { // Using multiple individual item + class requests to reduce fetched data size const allRequests = items.map(itemType => { // No need to request data we already have - if (itemType in _cache.strings[locale]) return; + if (itemType in _cache.strings[locale]) return null; const cacheData = data => { // Bunch of nested single value arrays of objects @@ -249,7 +249,7 @@ export default { const url = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale}`; return d3_json(url).then(cacheData); - }); + }).filter(Boolean); return Promise.all(allRequests).then(() => _cache.strings[locale]); }, diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index 515bdda12..19792db63 100644 --- a/modules/svg/mapillary_images.js +++ b/modules/svg/mapillary_images.js @@ -170,6 +170,7 @@ export function svgMapillaryImages(projection, context, dispatch) { } } } + return false; }); } if (fromDate) { diff --git a/modules/ui/feature_info.js b/modules/ui/feature_info.js index 0a55e2ad7..5a745c326 100644 --- a/modules/ui/feature_info.js +++ b/modules/ui/feature_info.js @@ -11,6 +11,7 @@ export function uiFeatureInfo(context) { count += stats[k]; return t('inspector.title_count', { title: t.html('feature.' + k + '.description'), count: stats[k] }); } + return null; }).filter(Boolean); selection.html(''); diff --git a/modules/ui/fields/wikidata.js b/modules/ui/fields/wikidata.js index 912d3bca6..efdd0380b 100644 --- a/modules/ui/fields/wikidata.js +++ b/modules/ui/fields/wikidata.js @@ -242,11 +242,11 @@ export function uiFieldWikidata(field, context) { var actions = initEntityIDs.map(function(entityID) { var entity = context.hasEntity(entityID); - if (!entity) return; + if (!entity) return null; var currTags = Object.assign({}, entity.tags); // shallow copy if (newWikipediaValue === null) { - if (!currTags[_wikipediaKey]) return; + if (!currTags[_wikipediaKey]) return null; delete currTags[_wikipediaKey]; } else { diff --git a/modules/ui/fields/wikipedia.js b/modules/ui/fields/wikipedia.js index 0d38d902e..c3d8a1a60 100644 --- a/modules/ui/fields/wikipedia.js +++ b/modules/ui/fields/wikipedia.js @@ -238,6 +238,7 @@ export function uiFieldWikipedia(field, context) { currTags.wikidata = value; return actionChangeTags(entityID, currTags); } + return null; }).filter(Boolean); if (!actions.length) return; diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js index 5ea9628f3..55f97f63f 100644 --- a/modules/validations/disconnected_way.js +++ b/modules/validations/disconnected_way.js @@ -170,6 +170,8 @@ export function validationDisconnectedWay() { if (parentRelation.isMultipolygon() && isTaggedAsHighway(parentRelation) && (!ignoreInnerWays || parentRelation.memberById(way.id).role !== 'inner')) return true; + + return false; }); }