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

Timestamp:

2012-03-09T01:06:18+01:00 (13 years ago)

Author:

donvip

Message:

opendata: Initial Neptune files support

Location:

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

Files:

• OdPlugin.java (modified) (2 diffs)
• core/OdConstants.java (modified) (2 diffs)
• core/datasets/AbstractDataSetHandler.java (modified) (1 diff)
• core/datasets/fr/FrenchConstants.java (modified) (1 diff)
• core/datasets/fr/FrenchDataSetHandler.java (modified) (4 diffs)
• core/io/AbstractImporter.java (modified) (2 diffs)
• core/io/XmlImporter.java (added)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java ¶

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.opendata.core.gui.OdPreferenceSetting;
 import org.openstreetmap.josm.plugins.opendata.core.io.AbstractImporter;
+import org.openstreetmap.josm.plugins.opendata.core.io.XmlImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.archive.ZipImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.geographic.KmlKmzImporter;
@@ -55 +56 @@
                                 new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats
                                 new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), // Geographic file formats
-                                new ZipImporter() // Archive containing any of the others
+                                new ZipImporter(), // Archive containing any of the others
+                                new XmlImporter() // Generic importer for XML files (currently used for Neptune files)
                 })) {
-                        ExtensionFileFilter.importers.add(importer);
+                        ExtensionFileFilter.importers.add(0, importer);
                 }
         // Load modules

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java ¶

@@ -98 +98 @@
     public static final String ZIP_EXT = "zip";
     public static final String JAR_EXT = "jar";
+    public static final String XML_EXT = "xml";
     
     /**
@@ -115 +116 @@
     public static final ExtensionFileFilter KML_KMZ_FILE_FILTER = new ExtensionFileFilter(KML_EXT+","+KMZ_EXT, KMZ_EXT, tr("KML/KMZ files") + " (*."+KML_EXT+",*."+KMZ_EXT+")");
     public static final ExtensionFileFilter ZIP_FILE_FILTER = new ExtensionFileFilter(ZIP_EXT, ZIP_EXT, tr("Zip Files") + " (*."+ZIP_EXT+")");
+    public static final ExtensionFileFilter XML_FILE_FILTER = new ExtensionFileFilter(XML_EXT, XML_EXT, tr("OpenData XML files") + " (*."+XML_EXT+")");
     
     /**

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

@@ -58 +58 @@
 
 public abstract class AbstractDataSetHandler implements OdConstants {
+        
         public abstract boolean acceptsFilename(String filename);
+        
+        public boolean acceptsFile(File file) {
+                return acceptsFilename(file.getName());
+        }
+        
         public abstract void updateDataSet(DataSet ds);
 

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java ¶

@@ -29 +29 @@
          */
         public static final String ICON_FR_24 = "fr24.png";
+        
+        /**
+         * NEPTUNE XML Schema
+         */
+        public static final String NEPTUNE_XSD = "/neptune/neptune.xsd";
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java ¶

@@ -18 +18 @@
 import static org.openstreetmap.josm.plugins.opendata.core.io.LambertCC9ZonesProjectionPatterns.lambertCC9Zones;
 
+import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24 +26 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.geotools.referencing.CRS;
@@ -38 +47 @@
 import org.openstreetmap.josm.data.projection.UTM.Hemisphere;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.SimpleDataSetHandler;
+import org.xml.sax.SAXException;
 
 public abstract class FrenchDataSetHandler extends SimpleDataSetHandler implements FrenchConstants {
@@ -273 +283 @@
                 }
         }
+        
+        protected URL getNeptuneSchema() {
+                return FrenchDataSetHandler.class.getResource(NEPTUNE_XSD);
+        }
+
+        protected final boolean acceptsXmlNeptuneFile(File file) {
+                
+                Source xmlFile = new StreamSource(file);
+                
+                try {
+                        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+                        Schema schema = schemaFactory.newSchema(getNeptuneSchema());
+                        Validator validator = schema.newValidator();
+                        validator.validate(xmlFile);
+                        System.out.println(xmlFile.getSystemId() + " is valid");
+                        return true;
+                } catch (SAXException e) {
+                        System.out.println(xmlFile.getSystemId() + " is NOT valid");
+                        System.out.println("Reason: " + e.getLocalizedMessage());
+                } catch (IOException e) {
+                        System.out.println(xmlFile.getSystemId() + " is NOT valid");
+                        System.out.println("Reason: " + e.getLocalizedMessage());
+                }
+                
+                return false;
+        }
 }

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

@@ -44 +44 @@
     }
     
-    protected final AbstractDataSetHandler findDataSetHandler(String fileName) {
+    protected final AbstractDataSetHandler findDataSetHandler(File file) {
         for (Module module : ModuleHandler.moduleList) {
                         for (AbstractDataSetHandler dsh : module.getHandlers()) {
-                                if (dsh.acceptsFilename(fileName)) {
+                                if (dsh.acceptsFile(file)) {
                                         return dsh;
                                 }
@@ -63 +63 @@
                 if (file != null) {
                         this.file = file;
-                        this.handler = findDataSetHandler(file.getName());
+                        this.handler = findDataSetHandler(file);
                 }
                 super.importData(file, progressMonitor);