Changeset 9230 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-12-31T16:37:24+01:00 (8 years ago)

Author:

Don-vip

Message:

fix javadoc errors/warnings

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/Conflict.java (modified) (1 diff)
• projection/datum/NTV2GridShift.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -17 +17 @@
  *   {@link OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li>
  * </ul>
- *
- *
+ * @since 1750
  */
-public class  Conflict<T extends OsmPrimitive> {
+public class Conflict<T extends OsmPrimitive> {
     private final T my;
     private final T their;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java

@@ -23 +23 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Ellipsoid;
 
 /**
@@ -39 +40 @@
     private static final long serialVersionUID = 1L;
 
-    private static final double METRE_PER_SECOND = 2.0 * Math.PI * 6378137.0 / 3600.0 / 360.0;
+    private static final double METRE_PER_SECOND = 2.0 * Math.PI * Ellipsoid.WGS84.a / 3600.0 / 360.0;
     private static final double RADIANS_PER_SECOND = 2.0 * Math.PI / 3600.0 / 360.0;
     private double lon;