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

Timestamp:

2012-03-12T23:46:51+01:00 (13 years ago)

Author:

donvip

Message:

opendata: download improvements

Location:

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

Files:

• datasets/AbstractDataSetHandler.java (modified) (3 diffs)
• io/archive/ZipReader.java (modified) (2 diffs)

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

@@ -36 +36 @@
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.referencing.operation.MathTransform;
@@ -474 +475 @@
         
         public MathTransform findMathTransform(CoordinateReferenceSystem sourceCRS, CoordinateReferenceSystem targetCRS, boolean lenient) throws FactoryException {
-                if (sourceCRS instanceof AbstractDerivedCRS && sourceCRS.getName().getCode().equalsIgnoreCase("Lambert_Conformal_Conic")) {
+                if (sourceCRS instanceof GeographicCRS && sourceCRS.getName().getCode().equalsIgnoreCase("GCS_ETRS_1989")) {
+                        return CRS.findMathTransform(CRS.decode("EPSG:4258"), targetCRS, lenient);
+                } else if (sourceCRS instanceof AbstractDerivedCRS && sourceCRS.getName().getCode().equalsIgnoreCase("Lambert_Conformal_Conic")) {
                         List<MathTransform> result = new ArrayList<MathTransform>();
                         AbstractDerivedCRS crs = (AbstractDerivedCRS) sourceCRS;
@@ -558 +561 @@
                 return setSkipXsdValidationInZipReading;
         }
+
+        public void notifyTempFileWritten(File file) {
+                // Do nothing, let handler overload this method if they need it
+        }
 }

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

@@ -107 +107 @@
                                         throw new IOException("Could not create temp file: " + file.getAbsolutePath());
                                 }
+                                // Write temp file
                                         FileOutputStream fos = new FileOutputStream(file);
                                         byte[] buffer = new byte[8192];
@@ -114 +115 @@
                                         }
                                         fos.close();
+                                        // Allow handler to perform specific treatments (for example, fix invalid .prj files)
+                                        if (handler != null) {
+                                                handler.notifyTempFileWritten(file);
+                                        }
+                                        // Set last modification date
                                         long time = entry.getTime();
                                         if (time > -1) {
                                                 file.setLastModified(time);
                                         }
+                                        // Test file name to see if it may contain useful data
                                         for (String ext : new String[] {
                                                         CSV_EXT, KML_EXT, KMZ_EXT, XLS_EXT, ODS_EXT, SHP_EXT, MIF_EXT, TAB_EXT