Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

2009-07-03T22:19:22+02:00 (15 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -28 +28 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
-import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxLink;
@@ -184 +184 @@
     @Override public void visitBoundingBox(BoundingXYVisitor v) {
         for (Marker mkr : data)
-            v.visit(mkr.eastNorth);
+            v.visit(mkr.getEastNorth());
     }
 
@@ -242 +242 @@
                 if (playHeadMarker == null)
                     return;
-                addAudioMarker(playHeadMarker.time, playHeadMarker.eastNorth);
+                addAudioMarker(playHeadMarker.time, playHeadMarker.getCoor());
                 Main.map.mapView.repaint();
             }
@@ -296 +296 @@
     }
 
-    public AudioMarker addAudioMarker(double time, EastNorth en) {
+    public AudioMarker addAudioMarker(double time, LatLon coor) {
         // find first audio marker to get absolute start time
         double offset = 0.0;
@@ -313 +313 @@
 
         // make our new marker
-        AudioMarker newAudioMarker = AudioMarker.create(Main.proj.eastNorth2latlon(en),
+        AudioMarker newAudioMarker = AudioMarker.create(coor,
             AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);