Changeset 12161 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-05-15T15:43:30+02:00 (7 years ago)

Author:

michael2402

Message:

See #13415: Add the ILatLon interface, unify handling of Nodes and CachedLatLon

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapViewState.java (modified) (5 diffs)
• dialogs/InspectPrimitiveDataText.java (modified) (1 diff)
• draw/MapViewPath.java (modified) (6 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 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.osm.Node;
@@ -180 +181 @@
     /**
      * Gets the {@link MapViewPoint} for the given {@link LatLon} coordinate.
+     * <p>
+     * This method exists to not break binary compatibility with old plugins
      * @param latlon the position
      * @return The point for that position.
@@ -185 +188 @@
      */
     public MapViewPoint getPointFor(LatLon latlon) {
-        return getPointFor(getProjection().latlon2eastNorth(latlon));
+        return getPointFor((ILatLon) latlon);
+    }
+
+    /**
+     * Gets the {@link MapViewPoint} for the given {@link LatLon} coordinate.
+     * @param latlon the position
+     * @return The point for that position.
+     * @since xxx
+     */
+    public MapViewPoint getPointFor(ILatLon latlon) {
+        try {
+            return getPointFor(Optional.ofNullable(latlon.getEastNorth(getProjection()))
+                    .orElseThrow(IllegalArgumentException::new));
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+            throw BugReport.intercept(e).put("latlon", latlon);
+        }
     }
 
@@ -196 +214 @@
      */
     public MapViewPoint getPointFor(Node node) {
-        try {
-            return getPointFor(Optional.ofNullable(node.getEastNorth(getProjection()))
-                    .orElseThrow(IllegalArgumentException::new));
-        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-            throw BugReport.intercept(e).put("node", node);
-        }
+        return getPointFor((ILatLon) node);
     }
 
@@ -249 +262 @@
      * Gets the current projection used for the MapView.
      * @return The projection.
+     * @see #getProjecting()
      */
     public Projection getProjection() {
         return projecting.getBaseProjection();
+    }
+
+    /**
+     * Gets the current projecting instance that is used to convert between east/north and lat/lon space.
+     * @return The projection.
+     * @since xxx
+     */
+    public Projecting getProjecting() {
+        return projecting;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -203 +203 @@
 
     void addCoordinates(Node n) {
-        if (n.getCoor() != null) {
+        if (n.isLatLonKnown()) {
             add(tr("Coordinates: "),
-                    Double.toString(n.getCoor().lat()), ", ",
-                    Double.toString(n.getCoor().lon()));
+                    Double.toString(n.lat()), ", ",
+                    Double.toString(n.lon()));
             add(tr("Coordinates (projected): "),
                     Double.toString(n.getEastNorth().east()), ", ",

trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
@@ -57 +57 @@
      * @return this for easy chaining.
      */
-    public MapViewPath moveTo(Node n) {
-        moveTo(n.getEastNorth());
+    public MapViewPath moveTo(ILatLon n) {
+        moveTo(n.getEastNorth(state.getProjecting()));
         return this;
     }
@@ -85 +85 @@
      * @return this for easy chaining.
      */
-    public MapViewPath lineTo(Node n) {
-        lineTo(n.getEastNorth());
+    public MapViewPath lineTo(ILatLon n) {
+        lineTo(n.getEastNorth(state.getProjecting()));
         return this;
     }
@@ -115 +115 @@
      * @return this for easy chaining.
      */
-    public MapViewPath shapeAround(Node p1, SymbolShape symbol, double size) {
-        shapeAround(p1.getEastNorth(), symbol, size);
+    public MapViewPath shapeAround(ILatLon p1, SymbolShape symbol, double size) {
+        shapeAround(p1.getEastNorth(state.getProjecting()), symbol, size);
         return this;
     }
@@ -144 +144 @@
      * @return this for easy chaining.
      */
-    public MapViewPath append(Iterable<Node> nodes, boolean connect) {
+    public MapViewPath append(Iterable<? extends ILatLon> nodes, boolean connect) {
         appendWay(nodes, connect, false);
         return this;
@@ -155 +155 @@
      * @return this for easy chaining.
      */
-    public MapViewPath appendClosed(Iterable<Node> nodes, boolean connect) {
+    public MapViewPath appendClosed(Iterable<? extends ILatLon> nodes, boolean connect) {
         appendWay(nodes, connect, true);
         return this;
     }
 
-    private void appendWay(Iterable<Node> nodes, boolean connect, boolean close) {
+    private void appendWay(Iterable<? extends ILatLon> nodes, boolean connect, boolean close) {
         boolean useMoveTo = !connect;
-        Node first = null;
-        for (Node n : nodes) {
+        ILatLon first = null;
+        for (ILatLon n : nodes) {
             if (useMoveTo) {
                 moveTo(n);