Changeset 28142 in osm for applications/editors/josm

Timestamp:

2012-03-23T21:22:46+01:00 (13 years ago)

Author:

donvip

Message:

opendata: fix filename parsing in network reading, add initial French National Forest inventory support (datagouvfr module)

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/ecologie/InventaireForestierNationalHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.AssainissementHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.ForetsPubliquesHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.InventaireForestierNationalHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.ReservesBiologiquesHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.education.Etab1er2ndDegreHandler;
@@ -47 +48 @@
         handlers.add(new ReservesBiologiquesHandler());
         handlers.add(new EauxDeSurfaceHandler());
+        handlers.add(new InventaireForestierNationalHandler());
     }
 }

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

@@ -85 +85 @@
         } else if (contentType.startsWith("application/octet-stream")) {
                 //return OdsReader.class;//FIXME, can be anything
+        } else if (contentType.startsWith("text/csv")) {
+                return CsvReader.class;
         } else if (contentType.startsWith("text/plain")) {//TODO: extract charset
                 return CsvReader.class;
@@ -138 +140 @@
             if (readerClass == null) {
                 readerClass = findReaderByExtension(url.toLowerCase());
-                if (readerClass != null) {
-                        filename = url.substring(url.lastIndexOf('/'));
-                }
             }
             if (readerClass == null) {
                         throw new OsmTransferException("Cannot find appropriate reader !");//TODO handler job ?
+            } else if (findReaderByExtension(url.toLowerCase()) != null) {
+                filename = url.substring(url.lastIndexOf('/')+1);
             }
             if (readerClass.equals(ZipReader.class)) {