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

Timestamp:

2013-09-21T13:19:50+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #9091 - rework osm/gpx download tasks - take into account recent changes from OSM server:

• new hashtag scheme
• GPX traces now returned as Bzip2-compressed files

File:

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

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

@@ -34 +34 @@
     private boolean doAuthenticate = false;
     protected boolean gpxParsedProperly;
+    
+    protected enum Compression {
+        NONE,
+        BZIP2,
+        GZIP
+    }
 
     /**
@@ -162 +168 @@
     }
 
+    /**
+     * Download OSM files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public abstract DataSet parseOsm(final ProgressMonitor progressMonitor) throws OsmTransferException;
 
+    /**
+     * Download OSM Change files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    /**
+     * Download BZip2-compressed OSM Change files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    /**
+     * Download GZip-compressed OSM Change files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    /**
+     * Retrieve raw gps waypoints from the server API.
+     * @param progressMonitor The progress monitor
+     * @return The corresponding GPX tracks
+     * @throws OsmTransferException if any error occurs
+     */
     public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    /**
+     * Retrieve BZip2-compressed GPX files from somewhere.
+     * @param progressMonitor The progress monitor
+     * @return The corresponding GPX tracks
+     * @throws OsmTransferException if any error occurs
+     * @since 6244
+     */
+    public GpxData parseRawGpsBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
+    /**
+     * Download BZip2-compressed OSM files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public DataSet parseOsmBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    /**
+     * Download GZip-compressed OSM files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs 
+     */
     public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;