Changeset 3965 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2011-03-09T00:03:07+01:00 (13 years ago)

Author:

mjulius

Message:

fix #6074 - Update failure
It is not an error if a primitive on the server is invisible while the local copy is not if the latter one is modified.
Catch DataIntegrityProblemException when merging.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -309 +309 @@
             // take. We take target.
             //
-        } else if (target.isVisible() != source.isVisible() && target.getVersion() == source.getVersion())
-            // Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+        } else if (!target.isModified() && !source.isModified() && target.isVisible() != source.isVisible() && target.getVersion() == source.getVersion())
+            // Same version, but different "visible" attribute and neither of them are modified.
+            // It indicates a serious problem in datasets.
             // For example, datasets can be fetched from different OSM servers or badly hand-modified.
             // We shouldn't merge that datasets.