Index: applications/editors/josm/plugins/ColumbusCSV/build.xml =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 35977) +++ applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 35978) @@ -4,5 +4,5 @@ - + Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 35977) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 35978) @@ -59,11 +59,11 @@ public static double getLonDist(WayPoint w1, WayPoint w2) { - LatLon ll = new LatLon(w1.getCoor().lat(), w2.getCoor().lon()); - return w1.getCoor().greatCircleDistance(ll); + LatLon ll = new LatLon(w1.lat(), w2.lon()); + return w1.greatCircleDistance(ll); } public static double getLatDist(WayPoint w1, WayPoint w2) { - LatLon ll = new LatLon(w2.getCoor().lat(), w1.getCoor().lon()); - return w1.getCoor().greatCircleDistance(ll); + LatLon ll = new LatLon(w2.lat(), w1.lon()); + return w1.greatCircleDistance(ll); } Index: applications/editors/josm/plugins/CommandLine/build.xml =================================================================== --- applications/editors/josm/plugins/CommandLine/build.xml (revision 35977) +++ applications/editors/josm/plugins/CommandLine/build.xml (revision 35978) @@ -4,5 +4,5 @@ - + - + - + - + - + Index: applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java =================================================================== --- applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java (revision 35977) +++ applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java (revision 35978) @@ -131,5 +131,5 @@ Integer direction = null; if (prevWp != null) { - direction = Long.valueOf(Math.round(180.0 / Math.PI * -prevWp.getCoor().bearing(curWp.getCoor()))).intValue(); + direction = Long.valueOf(Math.round(180.0 / Math.PI * -prevWp.bearing(curWp))).intValue(); } Index: applications/editors/josm/plugins/addrinterpolation/build.xml =================================================================== --- applications/editors/josm/plugins/addrinterpolation/build.xml (revision 35977) +++ applications/editors/josm/plugins/addrinterpolation/build.xml (revision 35978) @@ -4,5 +4,5 @@ - + - + Index: applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java =================================================================== --- applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java (revision 35977) +++ applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java (revision 35978) @@ -19,4 +19,5 @@ import javax.json.JsonObject; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat; @@ -349,5 +350,5 @@ final boolean needReset; final boolean needFullReset = lastUserId != userId; - if (needFullReset || (lastPosition != null && pos.greatCircleDistance(lastPosition) > MAX_JUMP)) { + if (needFullReset || (lastPosition != null && pos.greatCircleDistance((ILatLon) lastPosition) > MAX_JUMP)) { // reset messages lastId = 0; Index: applications/editors/josm/plugins/imagery_offset_db/build.xml =================================================================== --- applications/editors/josm/plugins/imagery_offset_db/build.xml (revision 35977) +++ applications/editors/josm/plugins/imagery_offset_db/build.xml (revision 35978) @@ -5,5 +5,5 @@ - + Index: applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java =================================================================== --- applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java (revision 35977) +++ applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java (revision 35978) @@ -11,4 +11,5 @@ import java.util.TreeMap; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.imagery.OffsetBookmark; @@ -151,5 +152,5 @@ setOffsetGood(true); } else { - setOffsetGood(data.lastChecked != null && center.greatCircleDistance(data.lastChecked) <= maxDistance * 1000); + setOffsetGood(data.lastChecked != null && center.greatCircleDistance((ILatLon) data.lastChecked) <= maxDistance * 1000); } } @@ -264,5 +265,5 @@ continue; } - LatLon lastPos = new LatLon(dparts[0], dparts[1]); + ILatLon lastPos = new LatLon(dparts[0], dparts[1]); if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) { // apply offset Index: applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java =================================================================== --- applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java (revision 35977) +++ applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java (revision 35978) @@ -26,4 +26,5 @@ 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.Projection; @@ -68,5 +69,5 @@ */ public void updateLocation() { - LatLon center = ImageryOffsetTools.getMapCenter(); + ILatLon center = ImageryOffsetTools.getMapCenter(); directionArrow.updateIcon(center); double distance = center.greatCircleDistance(offset.getPosition()); @@ -151,5 +152,5 @@ Projection proj = ProjectionRegistry.getProjection(); EastNorth pos = proj.latlon2eastNorth(offset.getPosition()); - LatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy)); + ILatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy)); double length = correctedCenterLL.greatCircleDistance(offset.getImageryPos()); double direction = length < 1e-2 ? 0.0 : -correctedCenterLL.bearing(offset.getImageryPos()); @@ -261,5 +262,5 @@ } - public void updateIcon(LatLon from) { + public void updateIcon(ILatLon from) { distance = from.greatCircleDistance(to); direction = -to.bearing(from); Index: applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java =================================================================== --- applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java (revision 35977) +++ applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java (revision 35978) @@ -12,4 +12,5 @@ import javax.swing.JOptionPane; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.tools.ImageProvider; @@ -80,5 +81,5 @@ StringBuilder sb = new StringBuilder(); if (offset instanceof ImageryOffset) { - double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance(offset.getPosition()); + double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance((ILatLon) offset.getPosition()); if (odist < 1e-2) odist = 0.0; sb.append(tr("An imagery offset of {0}", ImageryOffsetTools.formatDistance(odist))).append('\n'); @@ -88,5 +89,5 @@ } - double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance(offset.getPosition()); + double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance((ILatLon) offset.getPosition()); sb.append(dist < 50 ? tr("Determined right here") : tr("Determined {0} away", ImageryOffsetTools.formatDistance(dist))); Index: applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/CorridorGeography.java =================================================================== --- applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/CorridorGeography.java (revision 35977) +++ applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/CorridorGeography.java (revision 35978) @@ -4,4 +4,5 @@ import java.util.Vector; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; @@ -17,5 +18,5 @@ private static final double MIN_LENGTH = 10.; - private void setExtraElements(CorridorPart.ReachableSide side, LatLon from, LatLon to, + private void setExtraElements(CorridorPart.ReachableSide side, ILatLon from, ILatLon to, boolean extraWayUp, double minLength) { LatLon middleCoor = new LatLon((from.lat() + to.lat())/2., @@ -27,5 +28,5 @@ middleNode.setCoor(middleCoor); - LatLon start = from; + ILatLon start = from; if (side == CorridorPart.ReachableSide.LEFT) { if (middleCoor.lat() < start.lat()) @@ -71,5 +72,5 @@ public void appendNodes(CorridorPart.Type type, CorridorPart.ReachableSide side, String level, - LatLon from, LatLon to, ModelGeography target) { + ILatLon from, ILatLon to, ModelGeography target) { if (type == CorridorPart.Type.STAIRS_UP || type == CorridorPart.Type.STAIRS_DOWN) { setExtraElements(side, from, to, type == CorridorPart.Type.STAIRS_UP, MIN_LENGTH); Index: applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/ModelGeography.java =================================================================== --- applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/ModelGeography.java (revision 35977) +++ applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/ModelGeography.java (revision 35978) @@ -85,8 +85,8 @@ public void finishWay(Strip strip, int partIndex, boolean isOuter, String level) { - if (nodes.size() > 0) { + if (!nodes.isEmpty()) { CorridorPart part = strip.partAt(partIndex); strip.geographyAt(partIndex).appendNodes(part.getType(), part.getSide(), level, - nodes.elementAt(nodes.size()-1).getCoor(), nodes.elementAt(0).getCoor(), this); + nodes.elementAt(nodes.size()-1), nodes.elementAt(0), this); nodes.add(nodes.elementAt(0)); } @@ -98,7 +98,7 @@ public void appendCorridorPart(CorridorPart part, CorridorGeography partGeography, int beamIndex, int partIndex, String level) { - if (nodes.size() > 0) + if (!nodes.isEmpty()) partGeography.appendNodes(part.getType(), part.getSide(), level, - nodes.elementAt(nodes.size()-1).getCoor(), + nodes.elementAt(nodes.size()-1), beamsGeography.elementAt(beamIndex).coorAt(partIndex), this); } @@ -113,8 +113,8 @@ 0, strip.width / 2.)); - if (nodes.size() > 0) { + if (!nodes.isEmpty()) { CorridorPart part = strip.partAt(partIndex); strip.geographyAt(partIndex).appendNodes(part.getType(), part.getSide(), level, - nodes.elementAt(nodes.size()-1).getCoor(), nodePool.elementAt(nodePoolCount).getCoor(), this); + nodes.elementAt(nodes.size()-1), nodePool.elementAt(nodePoolCount), this); } nodes.add(nodePool.elementAt(nodePoolCount)); @@ -183,5 +183,5 @@ private void adjustMultipolygonRelation(IndoorSweeplineModel.Type type, String level) { if (members.size() > 1) { - if (wayPool.size() > 0) + if (!wayPool.isEmpty()) wayPool.elementAt(0).removeAll(); Index: applications/editors/josm/plugins/infomode/build.xml =================================================================== --- applications/editors/josm/plugins/infomode/build.xml (revision 35977) +++ applications/editors/josm/plugins/infomode/build.xml (revision 35978) @@ -5,5 +5,5 @@ - + - + Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 35977) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 35978) @@ -204,9 +204,9 @@ } else { for (Node n : nodes) { - if (n.getCoor() != null) { + if (n.isLatLonKnown()) { if (lastNode == null) { lastNode = n; } else { - length += lastNode.getCoor().greatCircleDistance(n.getCoor()); + length += lastNode.greatCircleDistance(n); segAngle = MeasurementLayer.angleBetween(lastNode, n); lastNode = n; @@ -223,6 +223,6 @@ boolean isCircle = true; for (Node n: w.getNodes()) { - if (lastN != null && lastN.getCoor() != null && n.getCoor() != null) { - final double segLength = lastN.getCoor().greatCircleDistance(n.getCoor()); + if (lastN != null && lastN.isLatLonKnown() && n.isLatLonKnown()) { + final double segLength = lastN.greatCircleDistance(n); if (firstSegLength == null) { firstSegLength = segLength; @@ -233,6 +233,6 @@ length += segLength; //http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/ - wayArea += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor())) - - (MeasurementLayer.calcY(n.getCoor()) * MeasurementLayer.calcX(lastN.getCoor())); + wayArea += (MeasurementLayer.calcX(n) * MeasurementLayer.calcY(lastN)) + - (MeasurementLayer.calcY(n) * MeasurementLayer.calcX(lastN)); segAngle = MeasurementLayer.angleBetween(lastN, n); } Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 35977) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 35978) @@ -157,14 +157,14 @@ * https://stackoverflow.com/questions/4681737/how-to-calculate-the-area-of-a-polygon-on-the-earths-surface-using-python */ - public static double calcX(LatLon p1){ + public static double calcX(ILatLon p1){ return p1.lat() * Math.PI * 6367000 / 180; } - public static double calcY(LatLon p1){ + public static double calcY(ILatLon p1){ return p1.lon() * ( Math.PI * 6367000 / 180) * Math.cos(p1.lat() * Math.PI / 180); } public static double calcDistance(WayPoint p1, WayPoint p2){ - return p1.getCoor().greatCircleDistance(p2.getCoor()); + return p1.greatCircleDistance(p2); } Index: applications/editors/josm/plugins/opendata/build.xml =================================================================== --- applications/editors/josm/plugins/opendata/build.xml (revision 35977) +++ applications/editors/josm/plugins/opendata/build.xml (revision 35978) @@ -1,5 +1,5 @@ - + Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (revision 35977) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (revision 35978) @@ -23,4 +23,5 @@ import javax.xml.validation.Validator; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; @@ -239,5 +240,5 @@ } - protected static final boolean isNullLatLon(LatLon ll) { + protected static boolean isNullLatLon(ILatLon ll) { return ll.lat() == 0.0 && ll.lon() == 0.0; } @@ -362,5 +363,5 @@ for (RelationMember member : stopArea.getMembers()) { // Fix stop coordinates if needed - if (member.getRole().equals(OSM_PLATFORM) && isNullLatLon(member.getNode().getCoor())) { + if (member.getRole().equals(OSM_PLATFORM) && isNullLatLon(member.getNode())) { member.getNode().setCoor(createLatLon(areaCentroid)); } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (revision 35977) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (revision 35978) @@ -253,5 +253,5 @@ firstNode = n; } - if (n == firstNode || n.getCoor().greatCircleDistance(firstNode.getCoor()) + if (n == firstNode || n.greatCircleDistance(firstNode) > Config.getPref().getDouble(OdConstants.PREF_TOLERANCE, OdConstants.DEFAULT_TOLERANCE)) { ds.addPrimitive(n); Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java =================================================================== --- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (revision 35977) +++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (revision 35978) @@ -12,5 +12,4 @@ import org.openstreetmap.josm.data.DataSource; -import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; @@ -200,8 +199,7 @@ bi.addId(id - lastid); lastid = id; - LatLon coor = i.getCoor(); - if (coor != null) { - int lat = mapDegrees(coor.lat()); - int lon = mapDegrees(coor.lon()); + if (i.isLatLonKnown()) { + int lat = mapDegrees(i.lat()); + int lon = mapDegrees(i.lon()); bi.addLon(lon - lastlon); lastlon = lon; @@ -235,7 +233,6 @@ for (Node i : contents) { long id = i.getUniqueId(); - LatLon coor = i.getCoor(); - int lat = mapDegrees(coor.lat()); - int lon = mapDegrees(coor.lon()); + int lat = mapDegrees(i.lat()); + int lon = mapDegrees(i.lon()); Osmformat.Node.Builder bi = Osmformat.Node.newBuilder(); bi.setId(id); @@ -385,5 +382,5 @@ nodes = new NodeGroup(); } - if (node.getCoor() != null) { + if (node.isLatLonKnown()) { nodes.add(node); checkLimit(); Index: applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java =================================================================== --- applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java (revision 35977) +++ applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java (revision 35978) @@ -7,4 +7,5 @@ import org.openstreetmap.josm.data.ImageData; 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.ProjectionRegistry; @@ -226,5 +227,5 @@ private void changeDirection(ImageEntry photo, ImageData data, MouseEvent evt) { - final LatLon photoLL = photo.getPos(); + final ILatLon photoLL = photo.getPos(); if (photoLL == null) { // Direction cannot be set if image doesn't have a position. Index: applications/editors/josm/plugins/public_transport/build.xml =================================================================== --- applications/editors/josm/plugins/public_transport/build.xml (revision 35977) +++ applications/editors/josm/plugins/public_transport/build.xml (revision 35978) @@ -5,5 +5,5 @@ - + Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 35977) +++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 35978) @@ -70,5 +70,5 @@ double totalDistance = 0; for (int i = min; i < max; ++i) { - totalDistance += way.getNode(i).getCoor().greatCircleDistance(way.getNode(i + 1).getCoor()); + totalDistance += way.getNode(i).greatCircleDistance(way.getNode(i + 1)); } return totalDistance; @@ -138,6 +138,6 @@ public double estimateDistance(AStarAlgorithm.Vertex vertex) { NodeVertex nodeVertex = (NodeVertex) vertex; - return ((NodeVertex) super.end).node.getCoor() - .greatCircleDistance(nodeVertex.node.getCoor()); + return ((NodeVertex) super.end).node + .greatCircleDistance(nodeVertex.node); } } Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (revision 35977) +++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (revision 35978) @@ -9,4 +9,5 @@ import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.coor.ILatLon; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.IGpxTrackSegment; @@ -121,7 +122,7 @@ if (j < k) { double dist = 0; - LatLon latLonI = wayPoints.elementAt(i).getCoor(); + ILatLon latLonI = wayPoints.elementAt(i).getCoor(); for (int l = j; l < k; ++l) { - double distL = latLonI.greatCircleDistance(wayPoints.elementAt(l).getCoor()); + double distL = latLonI.greatCircleDistance(wayPoints.elementAt(l)); if (distL > dist) dist = distL; @@ -148,5 +149,5 @@ LatLon latLon = wayPoints.elementAt(i).getCoor(); - if ((lastStopCoor != null) && (lastStopCoor.greatCircleDistance(latLon) < threshold)) + if ((lastStopCoor != null) && (lastStopCoor.greatCircleDistance((ILatLon) latLon) < threshold)) continue; Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 35977) +++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 35978) @@ -180,5 +180,5 @@ while (iter.hasNext()) { Node node = iter.next(); - if (coor.greatCircleDistance(node.getCoor()) < 1000) { + if (coor.greatCircleDistance(node) < 1000) { nearBusStop = true; break; Index: applications/editors/josm/plugins/routing/build.xml =================================================================== --- applications/editors/josm/plugins/routing/build.xml (revision 35977) +++ applications/editors/josm/plugins/routing/build.xml (revision 35978) @@ -5,5 +5,5 @@ - + Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java =================================================================== --- applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java (revision 35977) +++ applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java (revision 35978) @@ -41,5 +41,5 @@ this.from = from; this.to = to; - this.length = from.getCoor().greatCircleDistance(to.getCoor()); + this.length = from.greatCircleDistance(to); } Index: applications/editors/josm/plugins/simplifyarea/build.xml =================================================================== --- applications/editors/josm/plugins/simplifyarea/build.xml (revision 35977) +++ applications/editors/josm/plugins/simplifyarea/build.xml (revision 35978) @@ -4,5 +4,5 @@ - + - + Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java =================================================================== --- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java (revision 35977) +++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java (revision 35978) @@ -95,5 +95,5 @@ Node signedNode = TrustNode.generateNodeFromSigtext(signedPlaintext); Node currentNode = (Node) trust.getOsmPrimitive(); - double dist = signedNode.getCoor().greatCircleDistance(currentNode.getCoor()); + double dist = signedNode.greatCircleDistance(currentNode); /** is distance between signed Node and current Node inside tolerance? */ @@ -157,5 +157,5 @@ Node signedNode = signedSegment.get(i); Node currentNode = nodes.get(i); - double dist = signedNode.getCoor().greatCircleDistance(currentNode.getCoor()); + double dist = signedNode.greatCircleDistance(currentNode); if (dist > tolerance) return false; } Index: applications/editors/josm/plugins/turnlanes/build.xml =================================================================== --- applications/editors/josm/plugins/turnlanes/build.xml (revision 35977) +++ applications/editors/josm/plugins/turnlanes/build.xml (revision 35978) @@ -5,5 +5,5 @@ - +