Changeset 5062 in josm for trunk


Ignore:
Timestamp:
2012-03-09T21:29:57+01:00 (8 years ago)
Author:
Don-vip
Message:

Fix DataSet.mergeFrom() not working with nested relations

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r5025 r5062  
    11671167    public void mergeFrom(DataSet from) {
    11681168        if (from != null) {
    1169             for (Node n : from.getNodes()) {
    1170                 from.removePrimitive(n);
    1171                 addPrimitive(n);
    1172             }
    1173             for (Way w : from.getWays()) {
    1174                 from.removePrimitive(w);
    1175                 addPrimitive(w);
    1176             }
    1177             for (Relation r : from.getRelations()) {
    1178                 from.removePrimitive(r);
    1179                 addPrimitive(r);
    1180             }
     1169            new DataSetMerger(this, from).merge();
    11811170            dataSources.addAll(from.dataSources);
    11821171            from.dataSources.clear();
Note: See TracChangeset for help on using the changeset viewer.