Changeset 35395 in osm for applications
- Timestamp:
- 2020-03-22T16:33:53+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java
r35381 r35395 53 53 54 54 private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) { 55 56 57 58 59 60 61 62 63 55 if (target.isIncomplete() != newTarget.isIncomplete() || target.isDeleted() != newTarget.isDeleted() 56 || target.isVisible() != newTarget.isVisible() 57 || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) { 58 cmds.add(new ChangeCommand(target, newTarget)); 59 if (nominal) { 60 nominalRevertedPrimitives.add(target); 61 } 62 Logging.debug("Reverting " + target + " to " + newTarget); 63 } 64 64 } 65 65 … … 67 67 Map<String, String> result = new HashMap<>(); 68 68 for (Map.Entry<String, String> e : p.getKeys().entrySet()) { 69 70 69 if (!AbstractPrimitive.getDiscardableKeys().contains(e.getKey())) 70 result.put(e.getKey(), e.getValue()); 71 71 } 72 72 return result;
Note:
See TracChangeset
for help on using the changeset viewer.