Changeset 12778 in josm for trunk

Timestamp:

2017-09-08T01:04:05+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - deprecate Projections#project and Projections#inverseProject

replacement is a bit more verbose, but the fact that Main.proj is
involved need not be hidden

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinNodeWayAction.java (modified) (3 diffs)
• command/MoveCommand.java (modified) (3 diffs)
• data/osm/Node.java (modified) (2 diffs)
• data/osm/NodeData.java (modified) (2 diffs)
• data/projection/Projections.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)
• io/session/SessionWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -19 +19 @@
 import java.util.TreeSet;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -138 +138 @@
                 if (joinWayToNode) {
                     for (Node node : nodesInSegment) {
-                        EastNorth newPosition = Geometry.closestPointToSegment(w.getNode(segmentIndex).getEastNorth(),
-                                                                            w.getNode(segmentIndex+1).getEastNorth(),
-                                                                            node.getEastNorth());
-                        MoveCommand c = new MoveCommand(node, Projections.inverseProject(newPosition));
+                        EastNorth newPosition = Geometry.closestPointToSegment(
+                                w.getNode(segmentIndex).getEastNorth(),
+                                w.getNode(segmentIndex+1).getEastNorth(),
+                                node.getEastNorth());
+                        MoveCommand c = new MoveCommand(
+                                node, Main.getProjection().eastNorth2latlon(newPosition));
                         // Avoid moving a given node several times at the same position in case of overlapping ways
                         if (!cmds.contains(c)) {

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -14 +14 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20 +21 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -72 +72 @@
      */
     public MoveCommand(Node node, LatLon position) {
-        this(Collections.singleton((OsmPrimitive) node), Projections.project(position).subtract(node.getEastNorth()));
+        this(Collections.singleton((OsmPrimitive) node),
+                Main.getProjection().latlon2eastNorth(position).subtract(node.getEastNorth()));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.data.projection.Projecting;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -142 +141 @@
             invalidateEastNorthCache();
         } else if (eastNorth != null) {
-            LatLon ll = Projections.inverseProject(eastNorth);
+            LatLon ll = Main.getProjection().eastNorth2latlon(eastNorth);
             this.lat = ll.lat();
             this.lon = ll.lon();

trunk/src/org/openstreetmap/josm/data/osm/NodeData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
-import org.openstreetmap.josm.data.projection.Projections;
 
 /**
@@ -83 +83 @@
         // No internal caching of projected coordinates needed. In contrast to getEastNorth()
         // on Node, this method is rarely used. Caching would be overkill.
-        return Projections.project(getCoor());
+        return Main.getProjection().latlon2eastNorth(getCoor());
     }
 
     @Override
     public void setEastNorth(EastNorth eastNorth) {
-        setCoor(Projections.inverseProject(eastNorth));
+        setCoor(Main.getProjection().eastNorth2latlon(eastNorth));
     }
 

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

@@ -194 +194 @@
      * @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;
@@ -205 +207 @@
      * @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);
@@ -215 +219 @@
      * @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;

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -53 +53 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
@@ -715 +714 @@
      */
     public void zoomTo(ILatLon newCenter) {
-        zoomTo(Projections.project(newCenter));
+        zoomTo(getProjection().latlon2eastNorth(newCenter));
     }
 

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -266 +265 @@
         MapView mapView = MainApplication.getMap().mapView;
         EastNorth center = mapView.getCenter();
-        LatLon centerLL = Projections.inverseProject(center);
+        LatLon centerLL = Main.getProjection().eastNorth2latlon(center);
         centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
         centerEl.setAttribute("lon", Double.toString(centerLL.lon()));