Changeset 28031 in osm for applications/editors/josm/plugins/opendata/modules

Timestamp:

2012-03-10T16:18:51+01:00 (13 years ago)

Author:

donvip

Message:

opendata: enhanced international support, fix Neptune import

Location:

applications/editors/josm/plugins/opendata/modules

Files:

• 00_module_dir_template/build.xml (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/modules/00_module_dir_template/build.xml

@@ -74 +74 @@
     **********************************************************
     -->
-        <target name="copy-resources" if="resources.exist">
+    <target name="copy-resources" if="resources.exist">
         <copy todir="${module.build.dir}">
             <fileset dir="resources" />
         </copy>
-        </target>
+    </target>
     <!--
     **********************************************************

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.opendata.core.io.NeptuneReader;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
 
 public class ReseauTisseoHandler extends ToulouseDataSetHandler {
 
+        private static final URL neptuneSchemaUrl = ReseauTisseoHandler.class.getResource(TOULOUSE_NEPTUNE_XSD);
+        
         public ReseauTisseoHandler() {
                 super(14022, "network=fr_tisseo");
+                NeptuneReader.registerSchema(neptuneSchemaUrl);
         }
 
@@ -39 +43 @@
         @Override
         public boolean acceptsFile(File file) {
-                return acceptsFilename(file.getName()) && (file.getName().toLowerCase().endsWith(ZIP_EXT) || acceptsXmlNeptuneFile(file));
-        }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler#getNeptuneSchema()
-         */
-        @Override
-        protected URL getNeptuneSchema() {
-                return ReseauTisseoHandler.class.getResource(TOULOUSE_NEPTUNE_XSD);
+                return acceptsFilename(file.getName()) && (file.getName().toLowerCase().endsWith(ZIP_EXT) || NeptuneReader.acceptsXmlNeptuneFile(file, neptuneSchemaUrl));
         }