Changeset 228 in josm for src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2007-05-07T23:26:58+02:00 (17 years ago)

Author:

framm

Message:

Support compressed downloads from the server (by announcing capability via appropriate Accept header). Set property osm-server.use-compression to false if you do not want compressed downloads. Based on Patch by Tom Hughes <tom@…>.

File:

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

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

@@ -5 +5 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+import java.util.zip.GZIPInputStream;
 
 import org.openstreetmap.josm.Main;
@@ -10 +13 @@
 
 /**
- * This DataReader read directly from the REST API of the osm server.
+ * This DataReader reads directly from the REST API of the osm server.
+ * 
+ * It supports plain text transfer as well as gzip or deflate encoded transfers;
+ * if compressed transfers are unwanted, set property osm-server.use-compression
+ * to false.
  *
  * @author imi
@@ -32 +39 @@
                         return null;
                 }
+                
+                if (Boolean.parseBoolean(Main.pref.get("osm-server.use-compression", "true")))
+                        activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
+
                 System.out.println("got return: "+activeConnection.getResponseCode());
                 activeConnection.setConnectTimeout(15000);
                 if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
                         return null;
-                return new ProgressInputStream(activeConnection, pleaseWaitDlg);
+
+                String encoding = activeConnection.getContentEncoding();
+                InputStream inputStream = new ProgressInputStream(activeConnection, pleaseWaitDlg);
+                if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
+                        inputStream = new GZIPInputStream(inputStream);
+                }
+                else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+                        inputStream = new InflaterInputStream(inputStream, new Inflater(true));
+                }
+                return inputStream;
         }
 }