Changeset 14101 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-08-07T00:24:36+02:00 (6 years ago)

Author:

Don-vip

Message:

see #8765, fix #11086 - Support notes in osmChange (.osc) files created by OsmAnd

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/importexport/OsmChangeImporter.java (modified) (5 diffs)
• layer/NoteLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmChangeImporter.java

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -22 +25 @@
 import org.openstreetmap.josm.io.OsmChangeReader;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -29 +33 @@
 public class OsmChangeImporter extends FileImporter {
 
+    /**
+     * File filter for OsmChange files.
+     */
     public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
             "osc", "osc", tr("OsmChange File"), true);
 
     /**
-     * Constructs a new {@code OsmChangeImporter}.
+     * Constructs a new {@code OsmChangeImporter} with default file filter.
      */
     public OsmChangeImporter() {
@@ -39 +46 @@
     }
 
+    /**
+     * Constructs a new {@code OsmChangeImporter} with custom file filter.
+     * @param filter file filter
+     */
     public OsmChangeImporter(ExtensionFileFilter filter) {
         super(filter);
@@ -54 +65 @@
 
     protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException {
-        final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor);
-        final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
-        addDataLayer(dataSet, layer, associatedFile.getPath());
+        final Pair<DataSet, NoteData> p = OsmChangeReader.parseDataSetAndNotes(in, progressMonitor);
+        final boolean hasOsmData = p.a != null && !p.a.allPrimitives().isEmpty();
+        final boolean hasNotes = p.b != null && !p.b.getNotes().isEmpty();
+        if (hasOsmData) {
+            addLayer(new OsmDataLayer(p.a, associatedFile.getName(), associatedFile));
+        }
+        if (hasNotes) {
+            addLayer(new NoteLayer(p.b, associatedFile.getName()));
+        }
+        if (!hasOsmData && !hasNotes) {
+            // FIXME: remove UI stuff from IO subsystem
+            GuiHelper.runInEDT(() -> {
+                JOptionPane.showMessageDialog(
+                        Main.parent,
+                        tr("No data found in file {0}.", associatedFile.getPath()),
+                        tr("Open OsmChange file"),
+                        JOptionPane.INFORMATION_MESSAGE);
+            });
+        }
     }
 
-    protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) {
+    protected void addLayer(final Layer layer) {
         // FIXME: remove UI stuff from IO subsystem
-        //
         GuiHelper.runInEDT(() -> {
-            if (dataSet.allPrimitives().isEmpty()) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("No data found in file {0}.", filePath),
-                        tr("Open OsmChange file"),
-                        JOptionPane.INFORMATION_MESSAGE);
-            }
             MainApplication.getLayerManager().addLayer(layer);
             layer.onPostLoadFromFile();

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

@@ -102 +102 @@
     }
 
+    /**
+     * Create a new note layer with a notes data
+     * @param noteData Notes data
+     * @param name The name of the layer. Typically "Notes"
+     * @since 14101
+     */
+    public NoteLayer(NoteData noteData, String name) {
+        super(name);
+        this.noteData = noteData;
+        this.noteData.addNoteDataUpdateListener(this);
+    }
+
     /** Convenience constructor that creates a layer with an empty note list */
     public NoteLayer() {