CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give several functions more descriptive names

Browse Source
This commit is contained in:
Quincy Morgan
2020-06-08 09:50:13 -04:00
parent 1eb9cf39a7
commit cee4b0a4da
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/maprules.js
View File

@@ -164,10 +164,10 @@ export default {
var _lineKeys = this._lineKeys;
var _areaKeys = this._areaKeys;
var isAreaKeyBlackList = function(key) {
var keyValueDoesNotImplyArea = function(key) {
return utilArrayIntersection(tagMap[key], Object.keys(_areaKeys[key])).length > 0;
};
var isLineKeysWhiteList = function(key) {
var keyValueImpliesLine = function(key) {
return utilArrayIntersection(tagMap[key], Object.keys(_lineKeys[key])).length > 0;
};
@@ -181,10 +181,10 @@ export default {
}
for (var key in tagMap) {
if (key in _areaKeys && !isAreaKeyBlackList(key)) {
if (key in _areaKeys && !keyValueDoesNotImplyArea(key)) {
return 'area';
}
if (key in _lineKeys && isLineKeysWhiteList(key)) {
if (key in _lineKeys && keyValueImpliesLine(key)) {
return 'area';
}
}

4
modules/svg/labels.js
View File

@@ -63,7 +63,7 @@ export function svgLabels(projection, context) {
];
function blacklisted(preset) {
function shouldSkipIcon(preset) {
var noIcons = ['building', 'landuse', 'natural'];
return noIcons.some(function(s) {
return preset.id.indexOf(s) >= 0;
@@ -313,7 +313,7 @@ export function svgLabels(projection, context) {
// Determine which entities are label-able
var preset = geometry === 'area' && presetManager.match(entity, graph);
var icon = preset && !blacklisted(preset) && preset.icon;
var icon = preset && !shouldSkipIcon(preset) && preset.icon;
if (!icon && !utilDisplayName(entity))
continue;