Changeset 15515 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2019-11-05T22:31:25+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
r14813 r15515 27 27 28 28 /** 29 * Tests if there are segments that crosses in the same layer 29 * Tests if there are segments that crosses in the same layer/level 30 30 * 31 31 * @author frsantos … … 107 107 if (w1 == w2) 108 108 return false; 109 if ( !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2))) {109 if (areLayerOrLevelDifferent(w1, w2)) { 110 110 return true; 111 111 } … … 252 252 @Override 253 253 boolean ignoreWaySegmentCombination(Way w1, Way w2) { 254 return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2)); 255 } 256 254 return areLayerOrLevelDifferent(w1, w2); 255 } 257 256 } 258 257 … … 393 392 } 394 393 394 private static boolean areLayerOrLevelDifferent(Way w1, Way w2) { 395 return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2)) 396 || !Objects.equals(w1.get("level"), w2.get("level")); 397 } 398 395 399 /** 396 400 * Returns all the cells this segment crosses. Each cell contains the list
Note:
See TracChangeset
for help on using the changeset viewer.