Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.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/GeoImageLayer.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -63 +63 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
-import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
@@ -244 +244 @@
         final File image;
         ImageLoader.Entry icon;
-
         Date time;
-        LatLon coor;
-        EastNorth pos;
+        CachedLatLon pos;
 
         public ImageEntry(File image) {
@@ -290 +288 @@
                 for (Collection<WayPoint> segment : trk.trackSegs) {
                     for (WayPoint p : segment) {
+                        LatLon c = p.getCoor();
                         if (!p.attr.containsKey("time"))
-                            throw new IOException(tr("No time for point {0} x {1}",p.latlon.lat(),p.latlon.lon()));
+                            throw new IOException(tr("No time for point {0} x {1}",c.lat(),c.lon()));
                         Date d = null;
                         try {
                             d = DateParser.parse((String) p.attr.get("time"));
                         } catch (ParseException e) {
-                            throw new IOException(tr("Cannot read time \"{0}\" from point {1} x {2}",p.attr.get("time"),p.latlon.lat(),p.latlon.lon()));
+                            throw new IOException(tr("Cannot read time \"{0}\" from point {1} x {2}",p.attr.get("time"),c.lat(),c.lon()));
                         }
-                        gps.add(new TimedPoint(d, p.eastNorth));
+                        gps.add(new TimedPoint(d, c));
                     }
                 }
@@ -364 +363 @@
     private static final class TimedPoint implements Comparable<TimedPoint> {
         Date time;
-        EastNorth pos;
-        public TimedPoint(Date time, EastNorth pos) {
+        CachedLatLon pos;
+
+        public TimedPoint(Date time, LatLon pos) {
             this.time = time;
-            this.pos = pos;
+            this.pos.setCoor(pos);
         }
         public int compareTo(TimedPoint point) {
@@ -404 +404 @@
                     if (e.pos == null)
                         continue;
-                    Point p = Main.map.mapView.getPoint(e.pos);
+                    Point p = Main.map.mapView.getPoint(e.pos.getEastNorth());
                     Rectangle r = new Rectangle(p.x-ICON_SIZE/2, p.y-ICON_SIZE/2, ICON_SIZE, ICON_SIZE);
                     if (r.contains(ev.getPoint())) {
@@ -536 +536 @@
 
             if (centerToggle.getModel().isSelected())
-                Main.map.mapView.zoomTo(currentImageEntry.pos);
+                Main.map.mapView.zoomTo(currentImageEntry.pos.getEastNorth());
 
             dlg.setTitle(currentImageEntry.image +
-                    " (" + currentImageEntry.coor.toDisplayString() + ")");
+                    " (" + currentImageEntry.pos.toDisplayString() + ")");
             dlg.setCursor(Cursor.getDefaultCursor());
         }
@@ -612 +612 @@
                 }
 
-                Point p = mv.getPoint(e.pos);
+                Point p = mv.getPoint(e.pos.getEastNorth());
                 Rectangle r = new Rectangle(p.x-ICON_SIZE / 2, p.y-ICON_SIZE / 2, ICON_SIZE, ICON_SIZE);
                 if (r.contains(mousePosition)) {
@@ -624 +624 @@
             ImageEntry e = data.get(i);
             if (e.pos != null) {
-                Point p = mv.getPoint(e.pos);
+                Point p = mv.getPoint(e.pos.getEastNorth());
                 Rectangle r = new Rectangle(p.x-ICON_SIZE / 2, p.y-ICON_SIZE / 2, ICON_SIZE, ICON_SIZE);
                 g.drawImage(e.getIcon(), r.x, r.y, null);
@@ -686 +686 @@
                 Date time = new Date(tp.time.getTime() - (delta+gpstimezone));
                 if (time.after(e.time) && lastTP != null) {
-                    double x = (lastTP.pos.east()+tp.pos.east())/2;
-                    double y = (lastTP.pos.north()+tp.pos.north())/2;
-                    e.pos = new EastNorth(x,y);
+                    e.pos.setCoor(lastTP.pos.getCenter(tp.pos));
                     break;
                 }
@@ -696 +694 @@
                 e.pos = gps.getLast().pos;
             }
-            e.coor = Main.proj.eastNorth2latlon(e.pos);
         }
     }