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

'Rail' feature filter should not match if it is also a highway.

Browse Source
This commit is contained in:
Bryan Housel
2014-10-15 00:40:22 -04:00
parent 59918431f2
commit e761414a15
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/renderer/features.js
+12 -5
View File
@@ -62,6 +62,8 @@ iD.Features = function(context) {
dispatch.redraw();
}
defineFeature('points', function(entity) {
return entity.geometry(context.graph()) === 'point';
}, 100);
@@ -115,7 +117,11 @@ iD.Features = function(context) {
});
defineFeature('rail', function(entity) {
return (
return !(
feature.major_roads.filter(entity) ||
feature.minor_roads.filter(entity) ||
feature.paths.filter(entity)
) && (
!!entity.tags.railway ||
entity.tags.landuse === 'railway'
);
@@ -128,10 +134,11 @@ iD.Features = function(context) {
// contains a past/future tag, but not in active use as a road/path/cycleway/etc..
defineFeature('past_future', function(entity) {
var strings = _.flatten(_.pairs(entity.tags));
return _.any(strings, function(s) { return past_futures[s]; }) &&
!feature.major_roads.filter(entity) &&
!feature.minor_roads.filter(entity) &&
!feature.paths.filter(entity);
return !(
feature.major_roads.filter(entity) ||
feature.minor_roads.filter(entity) ||
feature.paths.filter(entity)
) && _.any(strings, function(s) { return past_futures[s]; });
});
// lines or areas that don't match another feature filter.