Changeset 29014 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2012-12-01T22:45:02+01:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] Use GeoTools plugin + simplify build.xml + change resources location

Location:

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

Files:

• geotools (added)
• geotools/data (added)
• geotools/data/shapefile (added)
• geotools/data/shapefile/TabFiles.java (added)
• openstreetmap/josm/plugins/opendata/core/OdConstants.java (modified) (1 diff)
• openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java (modified) (1 diff)
• openstreetmap/josm/plugins/opendata/core/io/geographic/TabReader.java (modified) (2 diffs)

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

@@ -143 +143 @@
      * Resources
      */
-    public static final String RESOURCE_PATH = "/org/openstreetmap/josm/plugins/opendata/core/resources/";
+    public static final String RESOURCE_PATH = "/resources/org/openstreetmap/josm/plugins/opendata/core/resources/";
     public static final String DICTIONARY_FR = RESOURCE_PATH+"dictionary.fr.csv";
 }

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

@@ -33 +33 @@
          * NEPTUNE XML Schema
          */
-        public static final String NEPTUNE_XSD = "/neptune/neptune.xsd";
+        public static final String NEPTUNE_XSD = "/resources/neptune/neptune.xsd";
 }

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

@@ -21 +21 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.geotools.data.DataUtilities;
-import org.geotools.data.shapefile.ShpFileType;
-import org.geotools.data.shapefile.ShpFiles;
+import org.geotools.data.shapefile.TabFiles;
 import org.geotools.data.shapefile.dbf.DbaseFileReader;
 import org.geotools.data.shapefile.dbf.DbaseFileReader.Row;
@@ -54 +51 @@
                 return new TabReader(handler).parse(in, file, instance, Charset.forName(ISO8859_15));
         }
-        
-        private class TabFiles extends ShpFiles {
-                public TabFiles(File headerFile, File dataFile) throws IllegalArgumentException {
-                        super(DataUtilities.fileToURL(headerFile));
-                        urls.put(ShpFileType.DBF, DataUtilities.fileToURL(dataFile));
-                }
                 
-                @Override
-            protected String baseName(Object obj) {
-            if (obj instanceof URL) {
-                return toBase(((URL) obj).toExternalForm());
-            }
-            return null;
-            }
-            
-            private String toBase(String path) {
-                return path.substring(0, path.toLowerCase().lastIndexOf(".tab"));
-            }
-        }
-        
         private class TabOsmReader extends SpreadSheetReader {