Changeset 52 in josm for src/org/openstreetmap/josm/data

Timestamp:

2006-02-14T00:52:11+01:00 (18 years ago)

Author:

imi

Message:

• fixed data merge (sometime set modified unnecessary)
• fixed rounding (now compare with epsilon instead of round everything)
• Fix: upload does not clear all changes if only some thing got uploaded

Location:

src/org/openstreetmap/josm/data

Files:

• GeoPoint.java (modified) (1 diff)
• osm/visitor/MergeVisitor.java (modified) (4 diffs)
• projection/Epsg4263.java (modified) (1 diff)
• projection/Mercator.java (modified) (1 diff)

src/org/openstreetmap/josm/data/GeoPoint.java

@@ -80 +80 @@
 
         /**
+         * @return <code>true</code>, if the other GeoPoint has almost the same lat/lon
+         * values, only differ by no more than 1/Projection.MAX_SERVER_PRECISION.
+         */
+        public boolean equalsLatLonEpsilon(GeoPoint other) {
+                final double p = 1/Projection.MAX_SERVER_PRECISION;
+                return Math.abs(lat-other.lat) <= p && Math.abs(lon-other.lon) <= p && 
+                                !Double.isNaN(lat) && !Double.isNaN(lon);
+        }
+
+        /**
          * @return <code>true</code>, if the coordinate is outside the world, compared
          * by using lat/lon.

src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -42 +42 @@
                         if (myNode.modified && !otherNode.modified)
                                 return;
-                        if (!myNode.coor.equalsLatLon(otherNode.coor)) {
+                        if (!myNode.coor.equalsLatLonEpsilon(otherNode.coor)) {
                                 myNode.coor = otherNode.coor;
                                 myNode.modified = otherNode.modified;
@@ -51 +51 @@
         /**
          * Merge the line segment if id matches or if both nodes are the same (and the
-         * id is zero of either segment). Nodes are equal when they @see match
+         * id is zero of either segment). Nodes are the "same" when they @see match
          */
         public void visit(LineSegment otherLs) {
@@ -120 +120 @@
         private boolean match(Node n1, Node n2) {
                 if (n1.id == 0 || n2.id == 0)
-                        return n1.coor.equalsLatLon(n2.coor);
+                        return n1.coor.equalsLatLonEpsilon(n2.coor);
                 return n1.id == n2.id;
         }
@@ -153 +153 @@
          */
         private void mergeCommon(OsmPrimitive myOsm, OsmPrimitive otherOsm) {
-                if (otherOsm.modified)
-                        myOsm.modified = true;
                 if (otherOsm.isDeleted())
                         myOsm.setDeleted(true);
                 if (!myOsm.modified || otherOsm.modified) {
-                        if (otherOsm.id != 0 && myOsm.id == 0)
+                        if (myOsm.id == 0 && otherOsm.id != 0)
                                 myOsm.id = otherOsm.id; // means not ncessary the object is now modified
+                        else if (myOsm.id != 0 && otherOsm.id != 0 && otherOsm.modified)
+                                myOsm.modified = true;
                 }
                 if (myOsm.modifiedProperties && !otherOsm.modifiedProperties)
                         return;
-                if (myOsm.keys != null && !myOsm.keys.equals(otherOsm.keys)) {
-                        if (myOsm.keys == null)
-                                myOsm.keys = otherOsm.keys;
-                        else if (otherOsm.keys != null)
-                                myOsm.keys.putAll(otherOsm.keys);
-                        myOsm.modifiedProperties = true;
-                }
+                if (otherOsm.keys == null)
+                        return;
+                if (myOsm.keys != null && myOsm.keys.entrySet().containsAll(otherOsm.keys.entrySet()))
+                        return;
+                if (myOsm.keys == null)
+                        myOsm.keys = otherOsm.keys;
+                else
+                        myOsm.keys.putAll(otherOsm.keys);
+                myOsm.modifiedProperties = true;
         }
 }

src/org/openstreetmap/josm/data/projection/Epsg4263.java

@@ -16 +16 @@
 
         public void xy2latlon(GeoPoint p) {
-                p.lat = Math.round(p.y*MAX_SERVER_PRECISION)/MAX_SERVER_PRECISION;
-                p.lon = Math.round(p.x*MAX_SERVER_PRECISION)/MAX_SERVER_PRECISION;
+                p.lat = p.y;
+                p.lon = p.x;
         }
 

src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -22 +22 @@
                 p.lon = p.x*180/Math.PI;
                 p.lat = Math.atan(Math.sinh(p.y))*180/Math.PI;
-                // round values to maximum server precision
-                p.lon = Math.round(p.lon*MAX_SERVER_PRECISION)/MAX_SERVER_PRECISION;
-                p.lat = Math.round(p.lat*MAX_SERVER_PRECISION)/MAX_SERVER_PRECISION;
         }