Changeset 14216 in josm

Timestamp:

2018-09-01T16:40:32+02:00 (6 years ago)

Author:

Don-vip

Message:

allow to download OSM JSON from RemoteControl

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmServerLocationReader.java (modified) (1 diff)
• OsmServerReader.java (modified) (3 diffs)

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

@@ -200 +200 @@
                 return null;
             progressMonitor.subTask(tr("Downloading OSM data..."));
-            return OsmReader.parseDataSet(compression.getUncompressedInputStream(in), progressMonitor.createSubTaskMonitor(1, false));
+            InputStream uncompressedInputStream = compression.getUncompressedInputStream(in);
+            ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(1, false);
+            if ("application/json".equals(contentType)) {
+                return OsmJsonReader.parseDataSet(uncompressedInputStream, subTaskMonitor);
+            } else {
+                return OsmReader.parseDataSet(uncompressedInputStream, subTaskMonitor);
+            }
         }
     }

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

@@ -43 +43 @@
     private boolean doAuthenticate;
     protected boolean gpxParsedProperly;
+    protected String contentType;
 
     /**
@@ -190 +191 @@
             try {
                 response = client.connect(progressMonitor);
+                contentType = response.getContentType();
             } catch (IOException e) {
                 Logging.error(e);
@@ -210 +212 @@
                     String errorBody = fetchResponseText(response);
                     throw new OsmApiException(response.getResponseCode(), errorHeader, errorBody, url.toString(), null,
-                            response.getContentType());
+                            contentType);
                 }