Changeset 18406 in josm for trunk/src/org

Timestamp:

2022-03-22T16:31:47+01:00 (3 years ago)

Author:

taylor.smock

Message:

fix #19219: Sessions without data layer should be savable as .jos

• only consider exported layers for *.jos/*.joz file type determination (patch by Bjoeni, modified)

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (modified) (2 diffs)

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

@@ -117 +117 @@
         }
 
-        boolean zipRequired = layers.stream().map(l -> exporters.get(l))
+        // TODO: resolve dependencies for layers excluded by the user
+        List<Layer> layersOut = layers.stream()
+                .filter(layer -> exporters.get(layer) != null && exporters.get(layer).shallExport())
+                .collect(Collectors.toList());
+
+        boolean zipRequired = layersOut.stream().map(exporters::get)
                 .anyMatch(ex -> ex != null && ex.requiresZip());
 
@@ -158 +163 @@
             }
         }
-
-        // TODO: resolve dependencies for layers excluded by the user
-        List<Layer> layersOut = layers.stream()
-                .filter(layer -> exporters.get(layer) != null && exporters.get(layer).shallExport())
-                .collect(Collectors.toList());
 
         Stream<Layer> layersToSaveStream = layersOut.stream()