Changeset 2699 in josm

Timestamp:

Dec 29, 2009 6:25:40 AM (3 years ago)

Author:

mjulius

Message:

moved MAX_SERVER_PRECISION from Projection to LatLon
LatLon.getRoundedToOsmPrecision() now also uses MAX_SERVER_PRECISION to be consistent with LatLon.equalEpsilon()

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/LatLon.java (modified) (5 diffs)
• projection/Projection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.projection.Projection;
 
 /**
@@ -26 +25 @@
 public class LatLon extends Coordinate {
 
+    /**
+     * Minimum difference in location to not be represented as the same position.
+     * The API returns 7 decimals.
+     */
+    public static final double MAX_SERVER_PRECISION = 1e-7;
+
     private static DecimalFormat cDmsMinuteFormatter = new DecimalFormat("00");
     private static DecimalFormat cDmsSecondFormatter = new DecimalFormat("00.0");
@@ -101 +106 @@
      * @return <code>true</code> if the other point has almost the same lat/lon
      * values, only differing by no more than
-     * 1 / {@link org.openstreetmap.josm.data.projection.Projection#MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
+     * 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
      */
     public boolean equalsEpsilon(LatLon other) {
-        final double p = Projection.MAX_SERVER_PRECISION;
+        double p = MAX_SERVER_PRECISION / 2;
         return Math.abs(lat()-other.lat()) <= p && Math.abs(lon()-other.lon()) <= p;
     }
@@ -197 +202 @@
     /**
      * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
-     * 10^-7
+     * MAX_SERVER_PRECISION
      * 
      * @return a clone of this lat LatLon
@@ -203 +208 @@
     public LatLon getRoundedToOsmPrecision() {
         return new LatLon(
-                Math.round(lat() * 10e6) / 10e6d,
-                Math.round(lon() * 10e6) / 10e6d
+                Math.round(lat() / MAX_SERVER_PRECISION) * MAX_SERVER_PRECISION,
+                Math.round(lon() / MAX_SERVER_PRECISION) * MAX_SERVER_PRECISION
         );
     }

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -13 +13 @@
  */
 public interface Projection {
-    /**
-     * Minimum difference in location to not be represented as the same position.
-     * The API returns 7 decimals.
-     */
-    public static final double MAX_SERVER_PRECISION = 5e-8;
-
     /**
      * List of all available projections.