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

Hide lines that are members of boundary relations when boundaries are hidden (close #5601)

Browse Source
This commit is contained in:
Quincy Morgan
2019-02-11 13:22:20 -05:00
parent 151e2685d4
commit e1da28bcd6
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/renderer/features.js
View File

@@ -290,11 +290,9 @@ export function rendererFeatures(context) {
for (i = 0; i < entities.length; i++) {
geometry = entities[i].geometry(resolver);
if (!(geometry === 'vertex' || geometry === 'relation')) {
matches = Object.keys(features.getMatches(entities[i], resolver, geometry));
for (j = 0; j < matches.length; j++) {
_features[matches[j]].count++;
}
matches = Object.keys(features.getMatches(entities[i], resolver, geometry));
for (j = 0; j < matches.length; j++) {
_features[matches[j]].count++;
}
}
@@ -334,9 +332,15 @@ export function rendererFeatures(context) {
_cache = {};
};
// only certain relations are worth checking
function relationShouldBeChecked(relation) {
// multipolygon features have `area` geometry and aren't checked here
return relation.tags.type === 'boundary';
}
features.getMatches = function(entity, resolver, geometry) {
if (geometry === 'vertex' || geometry === 'relation') return {};
if (geometry === 'vertex' ||
(geometry === 'relation' && !relationShouldBeChecked(entity))) return {};
var ent = osmEntity.key(entity);
if (!_cache[ent]) {
@@ -351,19 +355,23 @@ export function rendererFeatures(context) {
if (_keys[i] === 'others') {
if (hasMatch) continue;
// Multipolygon members:
// If an entity...
// 1. is a way that hasn't matched other 'interesting' feature rules,
// 2. and it belongs to a single parent multipolygon relation
// ...then match whatever feature rules the parent multipolygon has matched.
// see #2548, #2887
//
// IMPORTANT:
// For this to work, getMatches must be called on relations before ways.
//
if (entity.type === 'way') {
var parents = features.getParents(entity, resolver, geometry);
if (parents.length === 1 && parents[0].isMultipolygon()) {
if (parents.length === 0) continue;
// 2a. belongs only to a single multipolygon relation
if ((parents.length === 1 && parents[0].isMultipolygon()) ||
// 2b. or belongs only to boundary relations
parents.every(function(parent) { return parent.tags.type === 'boundary'; })) {
// ...then match whatever feature rules the parent relation has matched.
// see #2548, #2887
//
// IMPORTANT:
// For this to work, getMatches must be called on relations before ways.
//
var pkey = osmEntity.key(parents[0]);
if (_cache[pkey] && _cache[pkey].matches) {
matches = _clone(_cache[pkey].matches);