Changeset 28054 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2012-03-12T22:03:36+01:00 (14 years ago)

Author:

donvip

Message:

opendata: various download improvements

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• actions/DownloadDataTask.java (modified) (5 diffs)
• datasets/AbstractDataSetHandler.java (modified) (1 diff)
• io/archive/ZipReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java

@@ -18 +18 @@
 import java.io.File;
 import java.util.concurrent.Future;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -25 +26 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.AbstractReader;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.DataSetUpdater;
@@ -32 +34 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;
 
-public class DownloadDataTask extends DownloadOsmTask {
+public class DownloadDataTask extends DownloadOsmTask implements OdConstants {
 
         private AbstractDataSetHandler handler;
@@ -54 +56 @@
         @Override
         public boolean acceptsUrl(String url) {
+                this.handler = null;
                 for (Module module : ModuleHandler.moduleList) {
                         for (AbstractDataSetHandler handler : module.getHandlers()) {
@@ -60 +63 @@
                                         return true;
                                 }
+                        }
+                }
+                for (String ext : new String[]{ZIP_EXT, CSV_EXT, KML_EXT, KMZ_EXT, XLS_EXT, ODS_EXT, SHP_EXT, MIF_EXT, TAB_EXT}) {
+                        if (Pattern.compile(".*\\."+ext, Pattern.CASE_INSENSITIVE).matcher(url).matches()) {
+                                return true;
                         }
                 }

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

@@ -548 +548 @@
                 return false;
         }
+
+        private boolean setSkipXsdValidationInZipReading = false;
+        
+        public final void setSkipXsdValidationInZipReading(boolean skip) {
+                setSkipXsdValidationInZipReading = skip;
+        }
+        
+        public boolean skipXsdValidationInZipReading() {
+                return setSkipXsdValidationInZipReading;
+        }
 }

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

@@ -119 +119 @@
                                         }
                                         for (String ext : new String[] {
-                                                        CSV_EXT, KML_EXT, KMZ_EXT, XLS_EXT, ODS_EXT, SHP_EXT, MIF_EXT, TAB_EXT, XML_EXT
+                                                        CSV_EXT, KML_EXT, KMZ_EXT, XLS_EXT, ODS_EXT, SHP_EXT, MIF_EXT, TAB_EXT
                                         }) {
                                                 if (entry.getName().toLowerCase().endsWith("."+ext)) {
@@ -126 +126 @@
                                                         break;
                                                 }
+                                        }
+                                        // Special treatment for XML files (check supported XSD), unless handler explicitely skip it
+                                        if (XML_FILE_FILTER.accept(file) && ((handler != null && handler.skipXsdValidationInZipReading()) 
+                                                        || OdPlugin.getInstance().xmlImporter.acceptFile(file))) {
+                                                candidates.add(file);
+                                                System.out.println(entry.getName());
                                         }
                                 } else if (!file.mkdir()) {