Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

2017-08-27T00:17:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence on JMapViewer for package data.coor (only useful for imagery)

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• EastNorth.java (modified) (3 diffs)
• LatLon.java (modified) (3 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.coor;
-
-import org.openstreetmap.gui.jmapviewer.JMapViewer;
-import org.openstreetmap.gui.jmapviewer.Projected;
-import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
 
 /**
@@ -29 +25 @@
     public EastNorth(double east, double north) {
         super(east, north);
-    }
-
-    /**
-     * Constructs a new {@code EastNorth} from {@link IProjected}.
-     * @param p projected coordinates
-     */
-    public EastNorth(IProjected p) {
-        super(p.getEast(), p.getNorth());
     }
 
@@ -188 +176 @@
     }
 
-    /**
-     * Converts this to a {@link IProjected} instance to be used in the {@link JMapViewer}
-     * @return The projected
-     */
-    public IProjected toProjected() {
-        return new Projected(east(), north());
-    }
-
     @Override
     public String toString() {

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

@@ -23 +23 @@
 import java.util.regex.Pattern;
 
-import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -294 +293 @@
     }
 
-    /**
-     * Constructs a new object for the given coordinate
-     * @param coor the coordinate
-     */
-    public LatLon(ICoordinate coor) {
-        this(coor.getLat(), coor.getLon());
-    }
-
     @Override
     public double lat() {
@@ -566 +557 @@
         return Double.compare(that.x, x) == 0 &&
                Double.compare(that.y, y) == 0;
-    }
-
-    /**
-     * Converts this latitude/longitude to an instance of {@link ICoordinate}.
-     * @return a {@link ICoordinate} instance of this latitude/longitude
-     */
-    public ICoordinate toCoordinate() {
-        return new org.openstreetmap.gui.jmapviewer.Coordinate(lat(), lon());
     }