Changeset 35597 in osm for applications

Timestamp:

2020-10-18T09:07:34+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19950: Improve Replace Geometry error message

• Use again "Please select one way that exists in the database and one new way with correct geometry." when both ways are old

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -235 +235 @@
         Way subjectWay = selection.get(1 - idxNew);
 
-        if (!overrideNewCheck && (subjectWay.isNew() || !referenceWay.isNew())) {
-            throw new ReplaceGeometryException(
-                    tr("Both ways are new and have new nodes, cannot decide which one has the correct geometry."));
+        String msg = null;
+        if (!subjectWay.isNew() && !referenceWay.isNew()) {
+            msg = tr("Please select one way that exists in the database and one new way with correct geometry.");
+        } else if (!overrideNewCheck && (subjectWay.isNew() || !referenceWay.isNew())) {
+            msg = tr("Both ways are new and have new nodes, cannot decide which one has the correct geometry.");
+        }
+        if (msg != null) {
+            throw new ReplaceGeometryException(msg);
         }
         return buildReplaceWayCommand(subjectWay, referenceWay);