Changeset 224 in josm for src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
- Timestamp:
- 2007-05-05T23:33:16+02:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
r203 r224 29 29 30 30 private final DataSet ds; 31 private final DataSet mergeds; 31 32 32 33 /** … … 43 44 private final Map<Segment, Segment> mergedSegments = new HashMap<Segment, Segment>(); 44 45 45 public MergeVisitor(DataSet ds ) {46 public MergeVisitor(DataSet ds, DataSet mergeds) { 46 47 this.ds = ds; 48 this.mergeds = mergeds; 47 49 } 48 50 … … 57 59 Node my = null; 58 60 for (Node n : ds.nodes) { 59 if (match(n, other) ) {61 if (match(n, other) && ((mergeds == null) || (!mergeds.nodes.contains(n)))) { 60 62 my = n; 61 63 break; … … 87 89 Segment my = null; 88 90 for (Segment ls : ds.segments) { 89 if (match(other, ls) ) {91 if (match(other, ls) && ((mergeds == null) || (!mergeds.segments.contains(ls)))) { 90 92 my = ls; 91 93 break; 92 94 } 93 95 } 96 94 97 if (my == null) 95 98 ds.segments.add(other); … … 145 148 Way my = null; 146 149 for (Way w : ds.ways) { 147 if (match(other, w) ) {150 if (match(other, w) && ((mergeds == null) || (!mergeds.ways.contains(w)))) { 148 151 my = w; 149 152 break; … … 291 294 else 292 295 my.keys.putAll(other.keys); 296 293 297 my.modified = true; 294 298 }
Note:
See TracChangeset
for help on using the changeset viewer.