Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/data/projection/Projections.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/data/projection/Projections.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import java.util.regex.Pattern;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.ILatLon;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.datum.Datum;
 import org.openstreetmap.josm.data.projection.datum.GRS80Datum;
@@ -181 +177 @@
 
     /**
-     * Convert from lat/lon to easting/northing using the current projection.
-     *
-     * @param ll the geographical point to convert (in WGS84 lat/lon)
-     * @return the corresponding east/north coordinates
-     * @since 12725
-     * @deprecated use <code>Main.getProjection().latlon2eastNorth(ll)</code>
-     */
-    @Deprecated
-    public static EastNorth project(ILatLon ll) {
-        if (ll == null) return null;
-        return Main.getProjection().latlon2eastNorth(ll);
-    }
-
-    /**
-     * Convert from lat/lon to easting/northing using the current projection.
-     *
-     * @param ll the geographical point to convert (in WGS84 lat/lon)
-     * @return the corresponding east/north coordinates
-     * @deprecated use <code>Main.getProjection().latlon2eastNorth(ll)</code>
-     */
-    @Deprecated
-    public static EastNorth project(LatLon ll) {
-        return project((ILatLon) ll);
-    }
-
-    /**
-     * Convert from easting/norting to lat/lon using the current projection.
-     *
-     * @param en the geographical point to convert (in projected coordinates)
-     * @return the corresponding lat/lon (WGS84)
-     * @deprecated use <code>Main.getProjection().eastNorth2latlon(en)</code>
-     */
-    @Deprecated
-    public static LatLon inverseProject(EastNorth en) {
-        if (en == null) return null;
-        return Main.getProjection().eastNorth2latlon(en);
-    }
-
-    /**
      * Plugins can register additional base projections.
      *