If everything else is the same, select older element as merge target

src/main/java/de/blau/android/osm/MergeAction.java

@@ -15,6 +15,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import android.icu.math.MathContext;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -66,8 +67,10 @@ public MergeAction(final @NonNull StorageDelegator delegator, @NonNull OsmElemen
     public MergeAction(final @NonNull StorageDelegator delegator, @NonNull OsmElement mergeInto, @NonNull OsmElement mergeFrom, boolean swappable) {
         this.delegator = delegator;
         // first determine if one of the elements already has a valid id, if it is not and other node has valid id swap
-        // else check version numbers, the point of this is to preserve as much history as possible
-        if (swappable && (((mergeInto.getOsmId() < 0) && (mergeFrom.getOsmId() > 0)) || mergeInto.getOsmVersion() < mergeFrom.getOsmVersion())) {
+        // else check version numbers, then choose the older element. The point of this is to preserve as much history
+        // as possible
+        if (swappable && ((mergeInto.getOsmId() < 0 && mergeFrom.getOsmId() > 0) || mergeInto.getOsmVersion() < mergeFrom.getOsmVersion()
+                || Math.abs(mergeInto.getOsmId()) > Math.abs(mergeFrom.getOsmId()))) {
             // swap
             Log.d(DEBUG_TAG, "swap into #" + mergeInto.getOsmId() + " with from #" + mergeFrom.getOsmId());
             OsmElement tmpElement = mergeInto;

src/test/java/de/blau/android/osm/StorageDelegatorRoboelectricTest.java

@@ -58,7 +58,7 @@ public void polgonsToMultiPolygonMergeTest1() {
         final Way inner2 = (Way) inners.get(1).getElement();
         assertTrue(inner2.isClosed());
         assertEquals(5, inner2.getNodes().size());
-        assertEquals(-9, outer.getOsmId());
+        assertEquals(-8, outer.getOsmId());
     }
 
     /**