Changeset 33680 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2017-09-29T20:13:22+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: allow to download cadastre files from URL

Location:

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre

Files:

• CadastrePlugin.java (modified) (2 diffs)
• download/CadastreDownloadTask.java (added)
• download/CadastreServerReader.java (added)
• edigeo/pci/EdigeoPciImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePlugin.java

@@ -48 +48 @@
 import org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode.WMSAdjustAction;
 import org.openstreetmap.josm.plugins.fr.cadastre.actions.upload.CheckSourceUploadHook;
+import org.openstreetmap.josm.plugins.fr.cadastre.download.CadastreDownloadTask;
 import org.openstreetmap.josm.plugins.fr.cadastre.edigeo.pci.EdigeoPciImporter;
 import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
@@ -229 +230 @@
         registerSessionLayerExporter(WMSLayer.class, CadastreSessionExporter.class);
         registerSessionLayerImporter("cadastre-fr", CadastreSessionImporter.class);
+
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(CadastreDownloadTask.class);
+        //DownloadDialog.addDownloadSource(new CadastreDownloadSource());
     }
 

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciImporter.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.Logging;
@@ -55 +57 @@
         }
     }
+
+    /**
+     * Import data from an URL.
+     * @param source source URL
+     * @return imported data set
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if an error was found while parsing the data
+     */
+    public DataSet parseDataSet(final String source) throws IOException, IllegalDataException {
+        try (CachedFile cf = new CachedFile(source)) {
+            this.file = cf.getFile();
+            return parseDataSet(cf.getInputStream(), NullProgressMonitor.INSTANCE);
+        }
+    }
 }