Changeset 35216 in osm for applications/editors/josm

Timestamp:

2019-11-02T15:39:26+01:00 (5 years ago)

Author:

donvip

Message:

update to JOSM 15496

Location:

applications/editors/josm/plugins/measurement

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="recompile dure to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="15496"/>
     <property name="plugin.canloadatruntime" value="true"/>
     

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -286 +286 @@
 
                 for (GpxTrack trk : gpx.data.tracks) {
-                    for (GpxTrackSegment trkseg : trk.getSegments()) {
+                    for (IGpxTrackSegment trkseg : trk.getSegments()) {
                         for(WayPoint p: trkseg.getWayPoints()){
                             points.add(p);

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.MainApplication;
 
@@ -43 +43 @@
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON3){
+        if (e.getButton() == MouseEvent.BUTTON3) {
             MeasurementPlugin.getCurrentLayer().removeLastPoint();
-        } else if (e.getButton() == MouseEvent.BUTTON1){
-            LatLon coor = MainApplication.getMap().mapView.getLatLon(e.getX(), e.getY());
+        } else if (e.getButton() == MouseEvent.BUTTON1) {
+            Node coor = new Node(MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY()));
             if (coor.isOutSideWorld()) {
                 JOptionPane.showMessageDialog(MainApplication.getMainFrame(),tr("Can not draw outside of the world."));