Changeset 29686 in osm

Timestamp:

2013-06-21T02:08:30+02:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] initial Route500 support

Location:

applications/editors/josm/plugins/opendata

Files:

• modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/DataGouvFrModule.java (modified) (2 diffs)
• modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/DataGouvFrModule.java

@@ -32 +32 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.transport.AeroportsHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.transport.PassageNiveauHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.transport.Route500Handler;
 
 public class DataGouvFrModule extends AbstractModule {
@@ -51 +52 @@
         handlers.add(InventaireForestierNationalHandler.class);
         handlers.add(AeroportsHandler.class);
+        handlers.add(Route500Handler.class);
     }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java

@@ -159 +159 @@
         }
 
+    protected final boolean accepts7ZipFilename(String filename, String ... expected) {
+        return acceptsFilename(filename, expected, SEVENZIP_EXT);
+    }
+
         protected final boolean acceptsCsvKmzFilename(String filename, String ... expected) {
                 return acceptsFilename(filename, expected, CSV_EXT, KMZ_EXT);

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
+import org.openstreetmap.josm.plugins.opendata.core.io.archive.ArchiveReader;
+import org.openstreetmap.josm.plugins.opendata.core.io.archive.SevenZipReader;
 import org.openstreetmap.josm.plugins.opendata.core.io.archive.ZipReader;
 import org.openstreetmap.josm.plugins.opendata.core.io.geographic.GmlReader;
@@ -84 +86 @@
         if (contentType.startsWith("application/zip")) {
                 return ZipReader.class;
+        } else if (contentType.startsWith("application/x-7z-compressed")) {
+            return SevenZipReader.class;
         } else if (contentType.startsWith("application/vnd.ms-excel")) {
                 return XlsReader.class;
@@ -122 +126 @@
         } else if (filename.endsWith("."+ZIP_EXT)) {
                 return ZipReader.class;
+        } else if (filename.endsWith("."+SEVENZIP_EXT)) {
+            return SevenZipReader.class;
         } else {
                 return null;
@@ -151 +157 @@
             }
             instance = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-            if (readerClass.equals(ZipReader.class)) {
-                ZipReader zipReader = new ZipReader(in, handler, promptUser);
+            if (readerClass.equals(ZipReader.class) || readerClass.equals(SevenZipReader.class)) {
+                ArchiveReader zipReader = readerClass.equals(ZipReader.class) 
+                        ? new ZipReader(in, handler, promptUser) : new SevenZipReader(in, handler, promptUser);
                 DataSet ds = zipReader.parseDoc(instance);
                 file = zipReader.getReadFile();