Changeset 34922 in osm for applications/editors/josm/plugins
- Timestamp:
- 2019-03-20T16:13:04+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java
r34917 r34922 97 97 * 98 98 */ 99 private void mergeWay(Way source) throws IllegalStateException{99 private void mergeWay(Way source) { 100 100 if (source.isIncomplete()) return; 101 101 if (!source.isVisible()) return; … … 143 143 * members in source 144 144 */ 145 private void mergeRelation(Relation source) throws IllegalStateException{145 private void mergeRelation(Relation source) { 146 146 if (source.isIncomplete()) return; 147 147 if (!source.isVisible()) return; … … 178 178 mergeWay(way); 179 179 } 180 // first handle those relations which don't refer to other relations 180 181 for (Relation relation: sourceDataSet.getRelations()) { 181 mergeRelation(relation); 182 if (relation.getMemberPrimitives(Relation.class).isEmpty()) { 183 mergeRelation(relation); 184 } 185 } 186 // now the rest of the relations. 187 for (Relation relation: sourceDataSet.getRelations()) { 188 if (!relation.getMemberPrimitives(Relation.class).isEmpty()) { 189 mergeRelation(relation); 190 } 182 191 } 183 192 }
Note:
See TracChangeset
for help on using the changeset viewer.