Changeset 33241 in osm

Timestamp:

2017-04-15T16:47:18+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm14653 - Overpass Download - PBF format

Location:

applications/editors/josm/plugins/pbf

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pbf/PbfPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java (modified) (4 diffs)

applications/editors/josm/plugins/pbf/build.xml

@@ -3 +3 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="11626"/>
+    <property name="plugin.main.version" value="11919"/>
 
     <property name="plugin.author" value="Don-vip"/>

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/PbfPlugin.java

@@ -4 +4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.io.OverpassDownloadReader;
+import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -9 +11 @@
 import org.openstreetmap.josm.plugins.pbf.io.PbfExporter;
 import org.openstreetmap.josm.plugins.pbf.io.PbfImporter;
+import org.openstreetmap.josm.plugins.pbf.io.PbfReader;
 
 /**
@@ -28 +31 @@
         // Allow JOSM to download remote *.osm.pbf files
         Main.main.menu.openLocation.addDownloadTaskClass(DownloadPbfTask.class);
+        // Alow JOSM to download PBF data from Overpass API
+        OverpassDownloadReader.registerOverpassOutpoutFormatReader(OverpassOutpoutFormat.PBF, PbfReader.class);
     }
 }

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -276 +277 @@
             }
             if (discourageUpload)
-                ds.setUploadDiscouraged(true);
+                ds.setUploadPolicy(UploadPolicy.DISCOURAGED);
         }
 
@@ -295 +296 @@
         public void complete() {
             if (discourageUpload)
-                ds.setUploadDiscouraged(true);
+                ds.setUploadPolicy(UploadPolicy.DISCOURAGED);
         }
     }
@@ -314 +315 @@
         ProgressMonitor monitor = progressMonitor == null ? NullProgressMonitor.INSTANCE : progressMonitor;
         CheckParameterUtil.ensureParameterNotNull(source, "source");
-
-        PbfReader reader = new PbfReader();
-
+        return new PbfReader().doParseDataSet(source, monitor);
+    }
+
+    @Override
+    protected DataSet doParseDataSet(InputStream source, ProgressMonitor monitor)
+            throws IllegalDataException {
         try {
             monitor.beginTask(tr("Prepare OSM data...", 2));
             monitor.indeterminateSubTask(tr("Reading OSM data..."));
 
-            reader.parse(source);
+            parse(source);
             monitor.worked(1);
 
             monitor.indeterminateSubTask(tr("Preparing data set..."));
-            reader.prepareDataSet();
+            prepareDataSet();
             monitor.worked(1);
-            return reader.getDataSet();
+            return getDataSet();
         } catch (IllegalDataException e) {
             throw e;