Changeset 5505 in josm for trunk

Timestamp:

2012-09-08T12:18:04+02:00 (12 years ago)

Author:

bastiK

Message:

add session support for geoimage layers (see #4029)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionSaveAsAction.java (modified) (2 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (5 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (2 diffs)
• io/session/GeoImageSessionExporter.java (added)
• io/session/GeoImageSessionImporter.java (added)
• io/session/SessionReader.java (modified) (5 diffs)
• io/session/SessionWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -79 +79 @@
 
         JFileChooser fc;
-        
+
         if (zipRequired) {
             fc = createAndOpenFileChooser(false, false, tr("Save session"), joz, JFileChooser.FILES_ONLY, "lastDirectory");
@@ -109 +109 @@
         if (fn.indexOf('.') == -1) {
             file = new File(file.getPath() + (zip ? ".joz" : ".jos"));
-        }
-        if (!SaveActionBase.confirmOverwrite(file))
-            return;
+            if (!SaveActionBase.confirmOverwrite(file))
+                return;
+        }
 
         List<Layer> layersOut = new ArrayList<Layer>();

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

@@ -238 +238 @@
             if (layer != null) {
                 Main.main.addLayer(layer);
-                layer.hook_up_mouse_events(); // Main.map.mapView should exist
-                // now. Can add mouse listener
-                Main.map.mapView.addPropertyChangeListener(layer);
-                if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
-                    ImageViewerDialog.newInstance();
-                    Main.map.addToggleDialog(ImageViewerDialog.getInstance());
-                }
 
                 if (! canceled && layer.data.size() > 0) {
@@ -270 +263 @@
     }
 
-    private GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer) {
+    public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer) {
 
         super(tr("Geotagged Images"));
@@ -723 +716 @@
     private MapModeChangeListener mapModeListener = null;
 
-    private void hook_up_mouse_events() {
+    @Override
+    public void hookUpMapView() {
         mouseAdapter = new MouseAdapter() {
             private final boolean isMapModeOk() {
@@ -808 +802 @@
             }
         });
+
+        Main.map.mapView.addPropertyChangeListener(this);
+        if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
+            ImageViewerDialog.newInstance();
+            Main.map.addToggleDialog(ImageViewerDialog.getInstance());
+        }
     }
 
@@ -839 +839 @@
     }
 
+    public GpxLayer getGpxLayer() {
+        return gpxLayer;
+    }
+
     public void jumpToNextMarker() {
         showNextPhoto();

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -80 +80 @@
         return exifTime;
     }
-    LatLon getExifCoor() {
+    public LatLon getExifCoor() {
         return exifCoor;
     }
     public Double getExifImgDir() {
         return exifImgDir;
+    }
+
+    public boolean hasThumbnail() {
+        return thumbnail != null;
     }
 
@@ -102 +106 @@
         this.elevation = elevation;
     }
-    void setFile(File file) {
+    public void setFile(File file) {
         this.file = file;
     }
-    void setExifOrientation(Integer exifOrientation) {
+    public void setExifOrientation(Integer exifOrientation) {
         this.exifOrientation = exifOrientation;
     }
-    void setExifTime(Date exifTime) {
+    public void setExifTime(Date exifTime) {
         this.exifTime = exifTime;
     }
-    void setGpsTime(Date gpsTime) {
+    public void setGpsTime(Date gpsTime) {
         this.gpsTime = gpsTime;
     }
-    void setExifCoor(LatLon exifCoor) {
+    public void setExifCoor(LatLon exifCoor) {
         this.exifCoor = exifCoor;
     }
-    void setExifImgDir(double exifDir) {
+    public void setExifImgDir(double exifDir) {
         this.exifImgDir = exifDir;
     }

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -58 +58 @@
         registerSessionLayerImporter("imagery", ImagerySessionImporter.class);
         registerSessionLayerImporter("tracks", GpxTracksSessionImporter.class);
+        registerSessionLayerImporter("geoimage", GeoImageSessionImporter.class);
     }
 
@@ -103 +104 @@
         private String layerName;
         private int layerIndex;
-        private LinkedHashMap<Integer,SessionLayerImporter> layerDependencies;
-
-        public ImportSupport(String layerName, int layerIndex, LinkedHashMap<Integer,SessionLayerImporter> layerDependencies) {
+        private List<LayerDependency> layerDependencies;
+
+        public ImportSupport(String layerName, int layerIndex, List<LayerDependency> layerDependencies) {
             this.layerName = layerName;
             this.layerIndex = layerIndex;
@@ -234 +235 @@
          * layer. All the dependent importers have loaded completely at this point.
          */
-        public LinkedHashMap<Integer,SessionLayerImporter> getLayerDependencies() {
+        public List<LayerDependency> getLayerDependencies() {
             return layerDependencies;
+        }
+    }
+
+    public static class LayerDependency {
+        private Integer index;
+        private Layer layer;
+        private SessionLayerImporter importer;
+
+        public LayerDependency(Integer index, Layer layer, SessionLayerImporter importer) {
+            this.index = index;
+            this.layer = layer;
+            this.importer = importer;
+        }
+
+        public SessionLayerImporter getImporter() {
+            return importer;
+        }
+
+        public Integer getIndex() {
+            return index;
+        }
+
+        public Layer getLayer() {
+            return layer;
         }
     }
@@ -338 +363 @@
             } else {
                 importers.put(idx, imp);
-                LinkedHashMap<Integer,SessionLayerImporter> depsImp = new LinkedHashMap<Integer,SessionLayerImporter>();
+                List<LayerDependency> depsImp = new ArrayList<LayerDependency>();
                 for (int d : deps.get(idx)) {
                     SessionLayerImporter dImp = importers.get(d);
@@ -356 +381 @@
                         }
                     }
-                    depsImp.put(d, dImp);
+                    depsImp.add(new LayerDependency(d, layersMap.get(d), dImp));
                 }
                 ImportSupport support = new ImportSupport(name, idx, depsImp);

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -48 +49 @@
         registerSessionLayerExporter(WMSLayer.class , ImagerySessionExporter.class);
         registerSessionLayerExporter(GpxLayer.class , GpxTracksSessionExporter.class);
+        registerSessionLayerExporter(GeoImageLayer.class , GeoImageSessionExporter.class);
     }