Changeset 5505 in josm for trunk/src/org/openstreetmap/josm/io

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/io/session

Files:

• GeoImageSessionExporter.java (added)
• GeoImageSessionImporter.java (added)
• SessionReader.java (modified) (5 diffs)
• SessionWriter.java (modified) (2 diffs)

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);
     }