Changeset 15784 in josm for trunk/src/org/openstreetmap/josm/io/GeoJSONServerReader.java

Timestamp:

2020-01-27T02:35:43+01:00 (6 years ago)

Author:

Don-vip

Message:

see #18613 - rework download tasks / URL patterns

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONServerReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/GeoJSONServerReader.java

@@ -5 +5 @@
 
 import java.io.IOException;
-import java.util.Objects;
+import java.io.InputStream;
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.io.importexport.GeoJSONImporter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.xml.sax.SAXException;
 
 /**
@@ -16 +16 @@
  * @since 15424
  */
-public class GeoJSONServerReader extends OsmServerReader {
-
-    private final String url;
+public class GeoJSONServerReader extends OsmServerLocationReader {
 
     /**
@@ -25 +23 @@
      */
     public GeoJSONServerReader(String url) {
-        this.url = Objects.requireNonNull(url);
+        super(url);
+    }
+
+    protected class GeoJsonParser extends Parser<DataSet> {
+        protected GeoJsonParser(ProgressMonitor progressMonitor, Compression compression) {
+            super(progressMonitor, compression);
+        }
+
+        @Override
+        public DataSet parse() throws OsmTransferException, IllegalDataException, IOException, SAXException {
+            in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+            if (in == null)
+                return null;
+            progressMonitor.subTask(tr("Downloading OSM data..."));
+            InputStream uncompressedInputStream = compression.getUncompressedInputStream(in); // NOPMD
+            ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(1, false);
+            return GeoJSONReader.parseDataSet(uncompressedInputStream, subTaskMonitor);
+        }
     }
 
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
-        try {
-            progressMonitor.beginTask(tr("Contacting Server..."), 10);
-            return new GeoJSONImporter().parseDataSet(url);
-        } catch (IOException | IllegalDataException e) {
-            throw new OsmTransferException(e);
-        } finally {
-            progressMonitor.finishTask();
-        }
+        return parseOsm(progressMonitor, Compression.NONE);
+    }
+
+    @Override
+    public DataSet parseOsm(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return doParse(new GeoJsonParser(progressMonitor, compression), progressMonitor);
     }
 }