Changeset 35976 in osm for applications/editors

Timestamp:

2022-06-14T20:11:21+02:00 (2 years ago)

Author:

taylor.smock

Message:

see #22104: Remove usages of Node#getCoor where possible

This also accounts for cases where Node has the methods used later,
so a new LatLon is unnecessary.

Location:

applications/editors/josm/plugins

Files:

• CommandLine/src/org/openstreetmap/josm/plugins/commandline/LengthAction.java (modified) (2 diffs)
• CommandLine/src/org/openstreetmap/josm/plugins/commandline/PointAction.java (modified) (2 diffs)
• Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java (modified) (3 diffs)
• CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/StopAreaOperationBase.java (modified) (1 diff)
• FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (modified) (1 diff)
• comfort0/build.xml (modified) (1 diff)
• comfort0/src/net/simon04/comfort0/OsmToLevel0L.java (modified) (2 diffs)
• graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java (modified) (1 diff)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java (modified) (4 diffs)
• importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java (modified) (1 diff)
• jts/build.xml (modified) (1 diff)
• jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java (modified) (1 diff)
• measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (modified) (2 diffs)
• measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (modified) (3 diffs)
• namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java (modified) (4 diffs)
• opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (8 diffs)
• pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java (modified) (2 diffs)
• poly/src/poly/PolyExporter.java (modified) (1 diff)
• public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (modified) (4 diffs)
• reltoolbox/src/relcontext/actions/SplittingMultipolygons.java (modified) (1 diff)
• reverter/src/reverter/ChangesetReverter.java (modified) (1 diff)
• simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java (modified) (1 diff)
• terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (2 diffs)
• tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java (modified) (4 diffs)
• tracer/src/org/openstreetmap/josm/plugins/tracer/TracerGeometry.java (modified) (3 diffs)
• tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java (modified) (6 diffs)
• trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustNode.java (modified) (1 diff)
• turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiUtil.java (modified) (1 diff)
• turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)
• waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/LengthAction.java

@@ -137 +137 @@
         mousePos = e.getPoint();
         if (nearestNode != null) {
-            drawStartPos = MainApplication.getMap().mapView.getPoint(nearestNode.getCoor());
+            drawStartPos = MainApplication.getMap().mapView.getPoint(nearestNode);
         } else {
             drawStartPos = mousePos;
@@ -186 +186 @@
         MapFrame map = MainApplication.getMap();
         if (nearestNode != null)
-            drawEndPos = map.mapView.getPoint(nearestNode.getCoor());
+            drawEndPos = map.mapView.getPoint(nearestNode);
         else
             drawEndPos = mousePos;

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/PointAction.java

@@ -76 +76 @@
         if (e.getButton() == MouseEvent.BUTTON1) {
             if (isCtrlDown) {
-                if (pointList.size() > 0) {
+                if (!pointList.isEmpty()) {
                     pointList.remove(pointList.size() - 1);
                     updateTextEdit();
@@ -88 +88 @@
                     return;
                 }
-                LatLon coor = node.getCoor();
-                String point = String.valueOf(coor.getX()) + "," + String.valueOf(coor.getY());
+                String point = node.lon() + "," + node.lat();
                 int maxInstances = parentPlugin.currentCommand.parameters.get(parentPlugin.currentCommand.currentParameterNum).maxInstances;
                 if (maxInstances == 1) {

applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -85 +86 @@
         int c1=0,c2;
         double latDif,lonDif;
-        LatLon llc = nodeCommon.getCoor();
+        ILatLon llc = nodeCommon;
         for (Node n1 : nodesWay1) {
-            LatLon ll1 = n1.getCoor();
-            if (ll1 == null || llc == null) {
+            ILatLon ll1 = n1;
+            if (!ll1.isLatLonKnown() || !llc.isLatLonKnown()) {
                 Logging.warn("Null coordinates: {0} / {1}", n1, nodeCommon);
                 continue;
@@ -106 +107 @@
                     continue;
                 }
-                LatLon ll2 = n2.getCoor();
+                ILatLon ll2 = n2;
                 Node nodeOfGrid = new Node(new LatLon(ll2.lat()+latDif, ll2.lon()+lonDif));
                 cmds.add(new AddCommand(ds, nodeOfGrid));

applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/StopAreaOperationBase.java

@@ -115 +115 @@
         if (platform instanceof Way) {
             // p = mapView.getPoint((Node) stopArea.selectedObject);
-            Double sumLat = 0.0;
-            Double sumLon = 0.0;
-            Integer countNode = 0;
+            double sumLat = 0.0;
+            double sumLon = 0.0;
+            final int countNode = ((Way) platform).getNodesCount();
             for (Node node : ((Way) platform).getNodes()) {
-                LatLon coord = node.getCoor();
-                sumLat += coord.getX();
-                sumLon += coord.getY();
-                countNode++;
+                sumLat += node.lat();
+                sumLon += node.lon();
             }
             return new LatLon(sumLon / countNode, sumLat / countNode);

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java

@@ -275 +275 @@
 
                 for (Node node : way.getNodes()) {
-                    mapViewer.addMapMarker(new MapMarkerDot(Color.GREEN, node.getCoor().lat(), node.getCoor().lon()));
+                    mapViewer.addMapMarker(new MapMarkerDot(Color.GREEN, node.lat(), node.lon()));
                 }
             }

applications/editors/josm/plugins/comfort0/build.xml

@@ -3 +3 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9229"/>
+    <property name="plugin.main.version" value="12164"/>
     <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/OsmToLevel0L.java

@@ -3 +3 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.KeyValueVisitor;
@@ -79 +79 @@
         sb.append(p.getType().getAPIName()).append(" ").append(p.getUniqueId());
         if (p instanceof Node) {
-            final LatLon latLon = ((Node) p).getCoor();
-            if (latLon != null) {
+            final ILatLon latLon = (Node) p;
+            if (latLon.isLatLonKnown()) {
                 sb.append(": ").append(latLon.lat()).append(", ").append(latLon.lon());
             }

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

@@ -29 +29 @@
     @Override
     public double getLat(Node node) {
-        return node.getCoor().lat();
+        return node.lat();
     }
 
     @Override
     public double getLon(Node node) {
-        return node.getCoor().lon();
+        return node.lon();
     }
 

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java

@@ -23 +23 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -342 +342 @@
     }
 
-    protected static final boolean areNodeListAndBboxEqual(List<Node> nodes, BBox bBox) {
+    protected static boolean areNodeListAndBboxEqual(List<Node> nodes, BBox bBox) {
         if (nodes.size() == 5) {
             Map<Double, List<Integer>> latMap = new HashMap<>();
             Map<Double, List<Integer>> lonMap = new HashMap<>();
 
-            for (int i=0; i<4; i++) {
-                LatLon c = nodes.get(i).getCoor();
+            for (int i = 0; i < 4; i++) {
+                ILatLon c = nodes.get(i);
                 if (i > 1) {
-                    LatLon b = nodes.get(i-1).getCoor();
+                    ILatLon b = nodes.get(i - 1);
                     if (b.lat() != c.lat() && b.lon() != c.lon()) {
                         return false;
                     }
                 }
-                List<Integer> latList = latMap.get(c.lat());
-                if (latList == null) {
-                    latList = new ArrayList<>();
-                    latMap.put(c.lat(), latList);
-                }
+                List<Integer> latList = latMap.computeIfAbsent(c.lat(), lat -> new ArrayList<>(1));
                 latList.add(i);
-                List<Integer> lonList = lonMap.get(c.lon());
-                if (lonList == null) {
-                    lonList = new ArrayList<>();
-                    lonMap.put(c.lon(), lonList);
-                }
+                List<Integer> lonList = lonMap.computeIfAbsent(c.lon(), lon -> new ArrayList<>(1));
                 lonList.add(i);
             }
@@ -392 +384 @@
     }
 
-    protected static final String getNodeListShape(List<Node> nodes) {
+    protected static String getNodeListShape(List<Node> nodes) {
         StringBuilder result = new StringBuilder("            <shape>\n");
         int size = nodes.size();
@@ -402 +394 @@
             if (j == size)
                 j = 0;
-            LatLon ll = nodes.get(i).getCoor();
+            ILatLon ll = nodes.get(i);
             result.append("<point lat='")
                   .append(DF.format(ll.lat())).append("' lon='")

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java

@@ -137 +137 @@
                         break;
                     case PathIterator.SEG_CLOSE:
-                        if (currentway.firstNode().getCoor().equalsEpsilon(nodes.getLast().getCoor(), ILatLon.MAX_SERVER_PRECISION)) {
+                        if (currentway.firstNode().equalsEpsilon(nodes.getLast(), ILatLon.MAX_SERVER_PRECISION)) {
                             currentway.removeNode(nodes.removeLast());
                         }

applications/editors/josm/plugins/jts/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12164"/>
     
     <property name="plugin.author" value="Josh Doe &lt;josh@joshdoe.com&gt;"/>

applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java

@@ -71 +71 @@
             return new Coordinate(node.getEastNorth().getX(), node.getEastNorth().getY());
         else
-            return new Coordinate(node.getCoor().getX(), node.getCoor().getY());
+            return new Coordinate(node.lon(), node.lat());
     }
 

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -209 +209 @@
                         } else {
                             length += lastNode.getCoor().greatCircleDistance(n.getCoor());
-                            segAngle = MeasurementLayer.angleBetween(lastNode.getCoor(), n.getCoor());
+                            segAngle = MeasurementLayer.angleBetween(lastNode, n);
                             lastNode = n;
                         }
@@ -235 +235 @@
                         wayArea += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
                                 - (MeasurementLayer.calcY(n.getCoor()) * MeasurementLayer.calcX(lastN.getCoor()));
-                        segAngle = MeasurementLayer.angleBetween(lastN.getCoor(), n.getCoor());
+                        segAngle = MeasurementLayer.angleBetween(lastN, n);
                     }
                     lastN = n;

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.measurement;
 /// @author Raphael Mack <ramack@raphael-mack.de>
+
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -28 +29 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.IGpxTrack;
@@ -171 +173 @@
     }
 
-    public static double angleBetween(LatLon p1, LatLon p2){
+    public static double angleBetween(ILatLon p1, ILatLon p2){
         double lat1, lon1, lat2, lon2;
         double dlon;

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java

@@ -60 +60 @@
                 }
                 pairs: for (Pair<Node, Node> pair : way.getNodePairs(false)) {
-                    double x1Pair = pair.a.getCoor().getX();
-                    double y1Pair = pair.a.getCoor().getY();
-                    double x2Pair = pair.b.getCoor().getX();
-                    double y2Pair = pair.b.getCoor().getY();
+                    double x1Pair = pair.a.lon();
+                    double y1Pair = pair.a.lat();
+                    double x2Pair = pair.b.lon();
+                    double y2Pair = pair.b.lat();
                     double aPair = 0.0;
                     double bPair = 0.0;
@@ -77 +77 @@
                     int crossCount = 0;
                     areaLine: for (Pair<Node, Node> areaLine : areaBorderLines) {
-                        double x1Line = areaLine.a.getCoor().getX();
-                        double y1Line = areaLine.a.getCoor().getY();
-                        double x2Line = areaLine.b.getCoor().getX();
-                        double y2Line = areaLine.b.getCoor().getY();
+                        double x1Line = areaLine.a.lon();
+                        double y1Line = areaLine.a.lat();
+                        double x2Line = areaLine.b.lon();
+                        double y2Line = areaLine.b.lat();
                         boolean areaLinePerpendicular = false;
                         double aLine = 0.0;
@@ -178 +178 @@
                         }
                         if (raySource != null) {
-                            double rsX = raySource.getCoor().getX();
-                            double rsY = raySource.getCoor().getY();
+                            double rsX = raySource.lon();
+                            double rsY = raySource.lat();
                             if (areaLinePerpendicular) {
                                 if (x1Line == x2Line) {
@@ -218 +218 @@
         List<Node> nodes = way.getNodes();
         for (Node node : nodes) {
-            if (node.getCoor().getX() < x) {
-                x = node.getCoor().getX();
-            }
-            if (node.getCoor().getY() > y) {
-                y = node.getCoor().getY();
+            if (node.lon() < x) {
+                x = node.lon();
+            }
+            if (node.lat() > y) {
+                y = node.lat();
             }
         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.GraphicsEnvironment;
-import java.awt.Point;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25 +24 @@
 import javax.swing.Icon;
 import javax.swing.JOptionPane;
-import javax.xml.crypto.dsig.TransformException;
 
 import org.geotools.geometry.jts.JTS;
@@ -37 +35 @@
 import org.geotools.util.factory.Hints;
 import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
 import org.opengis.geometry.MismatchedDimensionException;
 import org.opengis.referencing.FactoryException;
@@ -44 +43 @@
 import org.opengis.referencing.crs.ProjectedCRS;
 import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.datum.Datum;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.OperationNotFoundException;
+import org.opengis.referencing.operation.TransformException;
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -54 +55 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.projection.datum.Datum;
 import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -113 +113 @@
             LatLon ll = new LatLon(p.getY(), p.getX());
             for (Node node : nodes.values()) {
-                if (node.getCoor().equalsEpsilon(ll, ILatLon.MAX_SERVER_PRECISION)) {
+                if (node.equalsEpsilon(ll, ILatLon.MAX_SERVER_PRECISION)) {
                     return node;
                 }
@@ -261 +261 @@
         CoordinateSystem cs2 = crs2.getCoordinateSystem();
         if (!compareDebug("cs", cs1, cs2)) {
-            Integer dim1 = cs1.getDimension();
-            Integer dim2 = cs2.getDimension();
+            int dim1 = cs1.getDimension();
+            int dim2 = cs2.getDimension();
             if (compareDebug("cs.dim", dim1, dim2)) {
                 for (int i = 0; i < dim1; i++) {
@@ -397 +397 @@
                 }
 
-                if (candidates.size() > 0) {
+                if (!candidates.isEmpty()) {
                     CoordinateReferenceSystem newCRS = candidates.get(0);
                     try {

applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java

@@ -27 +27 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -307 +307 @@
             }
 
-            LatLon ll = ((Node) selected.iterator().next()).getCoor();
+            ILatLon ll = ((Node) selected.iterator().next());
             return new EastNorth(ll.lon() * 1000, ll.lat() * 1000);
         }

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -102 +102 @@
 
         for (Node n : w.getNodes()) {
-            writer.println(String.format(Locale.ENGLISH, "   %f   %f", n.getCoor().lon(), n.getCoor().lat()));
+            writer.println(String.format(Locale.ENGLISH, "   %f   %f", n.lon(), n.lat()));
         }
         writer.println("END");

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java

@@ -1868 +1868 @@
                     if ("backward".equals(itineraryData.getValueAt(i, 1))) {
                         for (int j = way.getNodesCount() - 2; j >= 0; --j) {
-                            SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).getCoor().lat(),
-                                    way.getNode(j + 1).getCoor().lon(),
-                                    way.getNode(j).getCoor().lat(), way.getNode(j).getCoor().lon(),
+                            SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).lat(),
+                                    way.getNode(j + 1).lon(),
+                                    way.getNode(j).lat(), way.getNode(j).lon(),
                                     distance);
                             segmentMetrics.add(sm);
@@ -1877 +1877 @@
                     } else {
                         for (int j = 0; j < way.getNodesCount() - 1; ++j) {
-                            SegmentMetric sm = new SegmentMetric(way.getNode(j).getCoor().lat(),
-                                    way.getNode(j).getCoor().lon(),
-                                    way.getNode(j + 1).getCoor().lat(),
-                                    way.getNode(j + 1).getCoor().lon(), distance);
+                            SegmentMetric sm = new SegmentMetric(way.getNode(j).lat(),
+                                    way.getNode(j).lon(),
+                                    way.getNode(j + 1).lat(),
+                                    way.getNode(j + 1).lon(), distance);
                             segmentMetrics.add(sm);
                             distance += sm.length;
@@ -1894 +1894 @@
     private StopReference detectMinDistance(Node node, Vector<SegmentMetric> segmentMetrics,
             boolean rhsPossible, boolean lhsPossible) {
-        if (node == null || node.getCoor() == null)
+        if (node == null || !node.isLatLonKnown())
             return null;
 
@@ -1900 +1900 @@
         double position = -1.0;
         double distance = 180.0;
-        double lat = node.getCoor().lat();
-        double lon = node.getCoor().lon();
+        double lat = node.lat();
+        double lon = node.lon();
 
         int curIndex = -2;

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java

@@ -52 +52 @@
                 return false;
             for (Node n : way.getNodes()) {
-                LatLon ll = n.getCoor();
-                if (n.isIncomplete() || (a != null && !a.contains(ll.getX(), ll.getY())))
+                if (n.isIncomplete() || (a != null && !a.contains(n.lon(), n.lat())))
                     return false;
             }

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -499 +499 @@
         try {
             for (Node n : nodes) {
-                if (!n.isDeleted() && n.getCoor() == null) {
+                if (!n.isDeleted() && !n.isLatLonKnown()) {
                     PrimitiveId id = n.getPrimitiveId();
                     OsmPrimitive p = ds.getPrimitiveById(id);

applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java

@@ -56 +56 @@
     private static boolean isInBounds(final Node node, final List<Bounds> bounds) {
         for (final Bounds b : bounds) {
-            if (b.contains(node.getCoor())) {
+            if (b.contains(node)) {
                 return true;
             }

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -758 +758 @@
      */
     private double calculateSideness(Node a, Node b, Node c, Node d) {
-        final double ndx = b.getCoor().getX() - a.getCoor().getX();
-        final double pdx = d.getCoor().getX() - c.getCoor().getX();
-        final double ndy = b.getCoor().getY() - a.getCoor().getY();
-        final double pdy = d.getCoor().getY() - c.getCoor().getY();
+        final double ndx = b.lon() - a.lon();
+        final double pdx = d.lon() - c.lon();
+        final double ndy = b.lat() - a.lat();
+        final double pdy = d.lat() - c.lat();
 
         return (ndx * pdx + ndy * pdy)
@@ -780 +780 @@
     private Node interpolateNode(Node a, Node b, double f) {
         Node n = new Node(a.getEastNorth().interpolate(b.getEastNorth(), f));
-        LatLon latLon = n.getCoor();
-                if (latLon.equalsEpsilon(a.getCoor(), ILatLon.MAX_SERVER_PRECISION))
+                if (n.equalsEpsilon(a, ILatLon.MAX_SERVER_PRECISION))
             return a;
-        if (latLon.equalsEpsilon(b.getCoor(), ILatLon.MAX_SERVER_PRECISION))
+        if (n.equalsEpsilon(b, ILatLon.MAX_SERVER_PRECISION))
             return b;
         return n;

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java

@@ -49 +49 @@
             LatLon ll = n.getCoor();
             BBox bbox = new BBox(
-                    ll.getX() - MIN_DISTANCE,
-                    ll.getY() - MIN_DISTANCE,
-                    ll.getX() + MIN_DISTANCE,
-                    ll.getY() + MIN_DISTANCE);
+                    n.lon() - MIN_DISTANCE,
+                    n.lat() - MIN_DISTANCE,
+                    n.lon() + MIN_DISTANCE,
+                    n.lat() + MIN_DISTANCE);
 
             // bude se node slucovat s jinym?
@@ -129 +129 @@
         LatLon ll = node.getCoor();
         BBox bbox = new BBox(
-                ll.getX() - MIN_DISTANCE_TW,
-                ll.getY() - MIN_DISTANCE_TW,
-                ll.getX() + MIN_DISTANCE_TW,
-                ll.getY() + MIN_DISTANCE_TW);
+                node.lon() - MIN_DISTANCE_TW,
+                node.lat() - MIN_DISTANCE_TW,
+                node.lon() + MIN_DISTANCE_TW,
+                node.lat() + MIN_DISTANCE_TW);
 
         // node nebyl slouceny s jinym
@@ -188 +188 @@
         while (i < way.getNodesCount()) {
             // usecka n1, n2
-            LatLon n1 = way.getNodes().get(i).getCoor();
-            LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor();
+            Node n1 = way.getNodes().get(i);
+            Node n2 = way.getNodes().get((i + 1) % way.getNodesCount());
             System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount()));
             double minDistanceSq = MIN_DISTANCE_SQ;
             //double maxAngle = MAX_ANGLE;
             List<Node> nodes = MainApplication.getLayerManager().getEditDataSet().searchNodes(new BBox(
-                Math.min(n1.getX(), n2.getX()) - minDistanceSq,
-                Math.min(n1.getY(), n2.getY()) - minDistanceSq,
-                Math.max(n1.getX(), n2.getX()) + minDistanceSq,
-                Math.max(n1.getY(), n2.getY()) + minDistanceSq
+                Math.min(n1.lon(), n2.lon()) - minDistanceSq,
+                Math.min(n1.lat(), n2.lat()) - minDistanceSq,
+                Math.max(n1.lon(), n2.lon()) + minDistanceSq,
+                Math.max(n1.lat(), n2.lat()) + minDistanceSq
             ));
             Node nearestNode = null;
@@ -204 +204 @@
                     continue;
                 }
-                LatLon nn = nod.getCoor();
-                double dist = TracerGeometry.distanceFromSegment(nn, n1, n2);
-                double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
+                double dist = TracerGeometry.distanceFromSegment(nod, n1, n2);
+                double angle = TracerGeometry.angleOfLines(n1, nod, nod, n2);
                 System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
-                if (!n1.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION)
-                 && !n2.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
+                if (!n1.equalsEpsilon(nod, ILatLon.MAX_SERVER_PRECISION)
+                 && !n2.equalsEpsilon(nod, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
                     //maxAngle = angle;
                     nearestNode = nod;

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerGeometry.java

@@ -7 +7 @@
 package org.openstreetmap.josm.plugins.tracer;
 
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 
-public class TracerGeometry {
+public final class TracerGeometry {
+    private TracerGeometry() {
+        // Hide constructor
+    }
 
     /**
@@ -19 +22 @@
      * @return Angle in degrees.
      */
-    static public double angleOfLines(LatLon a, LatLon b, LatLon c, LatLon d) {
+    public static double angleOfLines(ILatLon a, ILatLon b, ILatLon c, ILatLon d) {
         return (Math.abs(
                     Math.atan2(a.lat() - b.lat(), a.lon() - b.lon()) -
@@ -33 +36 @@
      * @return Distance.
      */
-    static public double distanceFromSegment(LatLon c, LatLon a, LatLon b) {
+    public static double distanceFromSegment(ILatLon c, ILatLon a, ILatLon b) {
         return distanceFromSegment(
-                c.getX(), c.getY(),
-                a.getX(), a.getY(),
-                b.getX(), b.getY()
+                c.lon(), c.lat(),
+                a.lon(), a.lat(),
+                b.lon(), b.lat()
         );
     }
 
-    static private double distanceFromSegment(double cx, double cy, double ax, double ay, double bx, double by) {
+    private static double distanceFromSegment(double cx, double cy, double ax, double ay, double bx, double by) {
         double r_numerator = (cx - ax) * (bx - ax) + (cy - ay) * (by - ay);
         double r_denomenator = (bx - ax) * (bx - ax) + (by - ay) * (by - ay);

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java

@@ -82 +82 @@
         }
 
-        private static double calcAlpha(LatLon oP1, Node n) {
-                LatLon oP2 = n.getCoor();
-
-                double dAlpha = Math.atan((oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX())) * 180 / Math.PI + (oP1.getX() > oP2.getX() ? 180 : 0);
+        private static double calcAlpha(LatLon oP1, Node oP2) {
+
+                double dAlpha = Math.atan((oP2.lat() - oP1.lat()) / (oP2.lon() - oP1.lon())) * 180 / Math.PI + (oP1.lon() > oP2.lon() ? 180 : 0);
                 return checkAlpha(dAlpha);
         }
@@ -333 +332 @@
                 //List<Command> cmds = new LinkedList<Command>();
 
-                LatLon ll = node.getCoor();
+                //LatLon ll = node.getCoor();
                 //BBox bbox = new BBox(
                 //        ll.getX() - MIN_DISTANCE_TW,
@@ -358 +357 @@
                         for (Pair<Node, Node> np : ww.getNodePairs(false)) {
                                 //double dist1 = TracerGeometry.distanceFromSegment(ll, np.a.getCoor(), np.b.getCoor());
-                                double dist = distanceFromSegment2(ll, np.a.getCoor(), np.b.getCoor());
+                                double dist = distanceFromSegment2(node, np.a, np.b);
                                 //System.out.println(" distance: " + dist1 + "  " + dist);
 
@@ -381 +380 @@
         }
 
-        private static double distanceFromSegment2(LatLon c, LatLon a, LatLon b) {
+        private static double distanceFromSegment2(ILatLon c, ILatLon a, ILatLon b) {
                 double x;
                 double y;
 
                 StraightLine oStraightLine1 = new StraightLine(
-                                new Point2D.Double(a.getX(), a.getY()),
-                                new Point2D.Double(b.getX(), b.getY()));
+                                new Point2D.Double(a.lon(), a.lat()),
+                                new Point2D.Double(b.lon(), b.lat()));
                 StraightLine oStraightLine2 = new StraightLine(
-                                new Point2D.Double(c.getX(), c.getY()),
-                                new Point2D.Double(c.getX() + (a.getY()-b.getY()), c.getY() - (a.getX()-b.getX())));
+                                new Point2D.Double(c.lon(), c.lat()),
+                                new Point2D.Double(c.lon() + (a.lat()-b.lat()), c.lat() - (a.lon()-b.lon())));
                 Point2D.Double oPoint = oStraightLine1.GetIntersectionPoint(oStraightLine2);
 
-                if ((oPoint.x > a.getX() && oPoint.x > b.getX()) || (oPoint.x < a.getX() && oPoint.x < b.getX()) ||
-                                (oPoint.y > a.getY() && oPoint.y > b.getY()) || (oPoint.y < a.getY() && oPoint.y < b.getY())) {
+                if ((oPoint.x > a.lon() && oPoint.x > b.lon()) || (oPoint.x < a.lon() && oPoint.x < b.lon()) ||
+                                (oPoint.y > a.lat() && oPoint.y > b.lat()) || (oPoint.y < a.lat() && oPoint.y < b.lat())) {
                         return 100000;
                 }
 
-                x = c.getX()-oPoint.getX();
-                y = c.getY()-oPoint.getY();
+                x = c.lon()-oPoint.getX();
+                y = c.lat()-oPoint.getY();
 
                 return Math.sqrt((x*x)+(y*y));
@@ -421 +420 @@
                 while (i < way.getNodesCount()) {
                         // usecka n1, n2
-                        LatLon n1 = way.getNodes().get(i).getCoor();
-                        LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor();
+                        ILatLon n1 = way.getNodes().get(i);
+                        ILatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount());
                         System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount()));
                         double minDistanceSq = Double.MAX_VALUE;
@@ -438 +437 @@
                                         continue;
                                 }
-                                LatLon nn = nod.getCoor();
-                                //double dist = TracerGeometry.distanceFromSegment(nn, n1, n2);
-                                double dist = distanceFromSegment2(nn, n1, n2);
-                                //                double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
+                                //double dist = TracerGeometry.distanceFromSegment(nod, n1, n2);
+                                double dist = distanceFromSegment2(nod, n1, n2);
+                                //                double angle = TracerGeometry.angleOfLines(n1, nod, nod, n2);
                                 //System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
-                                if (!n1.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION)
-                                 && !n2.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
+                                if (!n1.equalsEpsilon(nod, ILatLon.MAX_SERVER_PRECISION)
+                                 && !n2.equalsEpsilon(nod, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
                                         minDistanceSq = dist;
                                         //                    maxAngle = angle;

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustNode.java

@@ -25 +25 @@
 
     public static String generateNodeSigtext(Node node) {
-        LatLon point = node.getCoor();
         String sigtext = node.getUniqueId() + "(";
-        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.latToString(point) + ",";
-        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.lonToString(point) + ")";
+        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.latToString(node) + ",";
+        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.lonToString(node) + ")";
         return sigtext;
     }

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiUtil.java

@@ -134 +134 @@
 
     public static Point2D loc(Node node) {
-        final EastNorth loc = ProjectionRegistry.getProjection().latlon2eastNorth(node.getCoor());
+        final EastNorth loc = node.getEastNorth();
         return new Point2D.Double(loc.getX(), -loc.getY());
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

@@ -64 +64 @@
         Node n1 = nodes.get(1);
 
-        double x = n1.getCoor().getX() - n0.getCoor().getX();
-        double y = n1.getCoor().getY() - n0.getCoor().getY();
+        double x = n1.lon() - n0.lon();
+        double y = n1.lat() - n0.lat();
         return Math.atan2(y, x);
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -450 +450 @@
 
     static boolean isInArea(Node node, Area area) {
-        LatLon ll = node.getCoor();
-        return node.isNewOrUndeleted() || area == null || ll == null || area.contains(ll.getX(), ll.getY());
+        return node.isNewOrUndeleted() || area == null || !node.isLatLonKnown() || area.contains(node.lon(), node.lat());
     }
 

applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.UndoRedoHandler;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -111 +111 @@
             DownloadOsmTask downloadTask = new DownloadOsmTask();
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
-            LatLon ll = selectedNode.getCoor();
+            ILatLon ll = selectedNode;
             final Future<?> future = downloadTask.download(
                     new DownloadParams(),
@@ -308 +308 @@
         for (DataSource datasource : MainApplication.getLayerManager().getEditDataSet().getDataSources()) {
             Bounds bounds = datasource.bounds;
-            if (bounds != null && bounds.contains(node.getCoor())) return true;
+            if (bounds != null && bounds.contains(node)) return true;
         }
         return false;