Index: applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/LambertAzimuthalEqualArea.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/LambertAzimuthalEqualArea.java (revision 28055) +++ applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/LambertAzimuthalEqualArea.java (revision 28055) @@ -0,0 +1,597 @@ +/* + * GeoTools - The Open Source Java GIS Toolkit + * http://geotools.org + * + * (C) 2006-2008, Open Source Geospatial Foundation (OSGeo) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains formulas from the PROJ package of USGS. + * USGS's work is fully acknowledged here. This derived work has + * been relicensed under LGPL with Frank Warmerdam's permission. + */ +package org.geotools.referencing.operation.projection; + +import java.awt.geom.Point2D; +import java.util.Collection; +import javax.measure.unit.NonSI; +import org.opengis.parameter.GeneralParameterDescriptor; +import org.opengis.parameter.ParameterDescriptor; +import org.opengis.parameter.ParameterDescriptorGroup; +import org.opengis.parameter.ParameterNotFoundException; +import org.opengis.parameter.ParameterValueGroup; +import org.opengis.referencing.operation.MathTransform; +import org.geotools.metadata.iso.citation.Citations; +import org.geotools.referencing.NamedIdentifier; +import org.geotools.resources.i18n.ErrorKeys; + +import static java.lang.Math.*; + + +/** + * Lambert Azimuthal Equal Area (EPSG code 9820). + *

+ * References: + *

+ * + * @see Lambert Azimuthal Equal-Area Projection on MathWorld + * @see "Lambert_Azimuthal_Equal_Area" on RemoteSensing.org + * + * @since 2.4 + * @version $Id: LambertAzimuthalEqualArea.java 37299 2011-05-25 05:21:24Z mbedward $ + * + * @source $URL: http://svn.osgeo.org/geotools/branches/2.7.x/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/LambertAzimuthalEqualArea.java $ + * @author Gerald Evenden (for original code in Proj4) + * @author Beate Stollberg + * @author Martin Desruisseaux + */ +public class LambertAzimuthalEqualArea extends MapProjection { + /** For cross-version compatibility. */ + private static final long serialVersionUID = 1639914708790574760L; + + /** Maximum difference allowed when comparing real numbers. */ + private static final double EPSILON = 1E-7; + + /** Epsilon for the comparaison of small quantities. */ + private static final double FINE_EPSILON = 1E-10; + + /** Epsilon for the comparaison of latitudes. */ + private static final double EPSILON_LATITUDE = 1E-10; + + /** Constants for authalic latitude. */ + private static final double P00 = 0.33333333333333333333, + P01 = 0.17222222222222222222, + P02 = 0.10257936507936507936, + P10 = 0.06388888888888888888, + P11 = 0.06640211640211640211, + P20 = 0.01641501294219154443; + + /** The projection mode. */ + static final int OBLIQUE=0, EQUATORIAL=1, NORTH_POLE=2, SOUTH_POLE=3; + + /** The projection mode for this particular instance. */ + final int mode; + + /** Constant parameters. */ + final double sinb1, cosb1, xmf, ymf, mmf, qp, dd, rq; + + /** Coefficients for authalic latitude. */ + private final double APA0, APA1, APA2; + + /** + * Constructs a new map projection from the supplied parameters. + * + * @param parameters The parameter values in standard units. + * @throws ParameterNotFoundException if a mandatory parameter is missing. + */ + protected LambertAzimuthalEqualArea(final ParameterValueGroup parameters) + throws ParameterNotFoundException + { + // Fetch parameters + super(parameters); + final Collection expected = getParameterDescriptors().descriptors(); + latitudeOfOrigin = doubleValue(expected, Provider.LATITUDE_OF_CENTRE, parameters); + centralMeridian = doubleValue(expected, Provider.LONGITUDE_OF_CENTRE, parameters); + ensureLatitudeInRange (Provider.LATITUDE_OF_CENTRE, latitudeOfOrigin, true); + ensureLongitudeInRange(Provider.LONGITUDE_OF_CENTRE, centralMeridian, true); + /* + * Detects the mode (oblique, etc.). + */ + final double t = abs(latitudeOfOrigin); + if (abs(t - PI/2) < EPSILON_LATITUDE) { + mode = latitudeOfOrigin < 0.0 ? SOUTH_POLE : NORTH_POLE; + } else if (abs(t) < EPSILON_LATITUDE) { + mode = EQUATORIAL; + } else { + mode = OBLIQUE; + } + /* + * Computes the constants for authalic latitude. + */ + final double es2 = excentricitySquared * excentricitySquared; + final double es3 = excentricitySquared * es2; + APA0 = P02 * es3 + P01 * es2 + P00 * excentricitySquared; + APA1 = P11 * es3 + P10 * es2; + APA2 = P20 * es3; + + final double sinphi; + qp = qsfn(1); + rq = sqrt(0.5 * qp); + mmf = 0.5 / (1 - excentricitySquared); + sinphi = sin(latitudeOfOrigin); + if (isSpherical) { + sinb1 = sin(latitudeOfOrigin); + cosb1 = cos(latitudeOfOrigin); + } else { + sinb1 = qsfn(sinphi) / qp; + cosb1 = sqrt(1.0 - sinb1 * sinb1); + } + switch (mode) { + case NORTH_POLE: // Fall through + case SOUTH_POLE: { + dd = 1.0; + xmf = ymf = rq; + break; + } + case EQUATORIAL: { + dd = 1.0 / rq; + xmf = 1.0; + ymf = 0.5 * qp; + break; + } + case OBLIQUE: { + dd = cos(latitudeOfOrigin) / + (sqrt(1.0 - excentricitySquared * sinphi * sinphi) * rq * cosb1); + xmf = rq * dd; + ymf = rq / dd; + break; + } + default: { + throw new AssertionError(mode); + } + } + } + + /** + * {@inheritDoc} + */ + public ParameterDescriptorGroup getParameterDescriptors() { + return Provider.PARAMETERS; + } + + /** + * {@inheritDoc} + */ + @Override + public ParameterValueGroup getParameterValues() { + final ParameterValueGroup values = super.getParameterValues(); + final Collection expected = getParameterDescriptors().descriptors(); + set(expected, Provider.LATITUDE_OF_CENTRE, values, latitudeOfOrigin); + set(expected, Provider.LONGITUDE_OF_CENTRE, values, centralMeridian); + return values; + } + + /** + * Transforms the specified (λ,φ) coordinates + * (units in radians) and stores the result in {@code ptDst} (linear distance + * on a unit sphere). + */ + protected Point2D transformNormalized(final double lambda, final double phi, Point2D ptDst) + throws ProjectionException + { + final double coslam = cos(lambda); + final double sinlam = sin(lambda); + final double sinphi = sin(phi); + double q = qsfn(sinphi); + final double sinb, cosb, b, c, x, y; + switch (mode) { + case OBLIQUE: { + sinb = q / qp; + cosb = sqrt(1.0 - sinb * sinb); + c = 1.0 + sinb1 * sinb + cosb1 * cosb * coslam; + b = sqrt(2.0 / c); + y = ymf * b * (cosb1 * sinb - sinb1 * cosb * coslam); + x = xmf * b * cosb * sinlam; + break; + } + case EQUATORIAL: { + sinb = q / qp; + cosb = sqrt(1.0 - sinb * sinb); + c = 1.0 + cosb * coslam; + b = sqrt(2.0 / c); + y = ymf * b * sinb; + x = xmf * b * cosb * sinlam; + break; + } + case NORTH_POLE: { + c = (PI / 2) + phi; + q = qp - q; + if (q >= 0.0) { + b = sqrt(q); + x = b * sinlam; + y = coslam * -b; + } else { + x = y = 0.; + } + break; + } + case SOUTH_POLE: { + c = phi - (PI / 2); + q = qp + q; + if (q >= 0.0) { + b = sqrt(q); + x = b * sinlam; + y = coslam * +b; + } else { + x = y = 0.; + } + break; + } + default: { + throw new AssertionError(mode); + } + } + if (abs(c) < EPSILON_LATITUDE) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + if (ptDst != null) { + ptDst.setLocation(x,y); + return ptDst; + } + return new Point2D.Double(x,y); + } + + /** + * Transforms the specified (x,y) coordinate + * and stores the result in {@code ptDst}. + */ + @Override + @SuppressWarnings("fallthrough") + protected Point2D inverseTransformNormalized(double x, double y, Point2D ptDst) + throws ProjectionException + { + final double lambda, phi; + switch (mode) { + case EQUATORIAL: // Fall through + case OBLIQUE: { + x /= dd; + y *= dd; + final double rho = hypot(x, y); + if (rho < FINE_EPSILON) { + lambda = 0.0; + phi = latitudeOfOrigin; + } else { + double sCe, cCe, /*q,*/ ab; + sCe = 2.0 * asin(0.5 * rho / rq); + cCe = cos(sCe); + sCe = sin(sCe); + x *= sCe; + if (mode == OBLIQUE) { + ab = cCe * sinb1 + y * sCe * cosb1 / rho; + //q = qp * ab; + y = rho * cosb1 * cCe - y * sinb1 * sCe; + } else { + ab = y * sCe / rho; + //q = qp * ab; + y = rho * cCe; + } + lambda = atan2(x, y); + phi = authlat(asin(ab)); + } + break; + } + case NORTH_POLE: { + y = -y; + // Fall through + } + case SOUTH_POLE: { + final double q = x*x + y*y; + if (q == 0) { + lambda = 0.; + phi = latitudeOfOrigin; + } else { + double ab = 1.0 - q / qp; + if (mode == SOUTH_POLE) { + ab = -ab; + } + lambda = atan2(x, y); + phi = authlat(asin(ab)); + } + break; + } + default: { + throw new AssertionError(mode); + } + } + if (ptDst != null) { + ptDst.setLocation(lambda, phi); + return ptDst; + } + return new Point2D.Double(lambda, phi); + } + + + /** + * Provides the transform equations for the spherical case. + * + * @version $Id: LambertAzimuthalEqualArea.java 37299 2011-05-25 05:21:24Z mbedward $ + * @author Martin Desruisseaux + */ + private static final class Spherical extends LambertAzimuthalEqualArea { + /** + * For cross-version compatibility. + */ + private static final long serialVersionUID = 2091431369806844342L; + + /** + * Constructs a new map projection from the suplied parameters. + * + * @param parameters The parameter values in standard units. + * @throws ParameterNotFoundException if a mandatory parameter is missing. + */ + protected Spherical(final ParameterValueGroup parameters) + throws ParameterNotFoundException + { + super(parameters); + ensureSpherical(); + } + + /** + * Transforms the specified (λ,φ) coordinates + * (units in radians) and stores the result in {@code ptDst} (linear distance + * on a unit sphere). + */ + @Override + protected Point2D transformNormalized(final double lambda, final double phi, Point2D ptDst) + throws ProjectionException + { + // Compute using ellipsoidal formulas, for comparaison later. + assert (ptDst = super.transformNormalized(lambda, phi, ptDst)) != null; + + final double sinphi = sin(phi); + final double cosphi = cos(phi); + final double coslam = cos(lambda); + double x,y; + switch (mode) { + case EQUATORIAL: { + y = 1.0 + cosphi * coslam; + if (y <= FINE_EPSILON) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + y = sqrt(2.0 / y); + x = y * cosphi * sin(lambda); + y *= sinphi; + break; + } + case OBLIQUE: { + y = 1.0 + sinb1 * sinphi + cosb1 * cosphi * coslam; + if (y <= FINE_EPSILON) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + y = sqrt(2.0 / y); + x = y * cosphi * sin(lambda); + y *= cosb1 * sinphi - sinb1 * cosphi * coslam; + break; + } + case NORTH_POLE: { + if (abs(phi + latitudeOfOrigin) < EPSILON_LATITUDE) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + y = (PI/4) - phi * 0.5; + y = 2.0 * sin(y); + x = y * sin(lambda); + y *= -coslam; + break; + } + case SOUTH_POLE: { + if (abs(phi + latitudeOfOrigin) < EPSILON_LATITUDE) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + y = (PI/4) - phi * 0.5; + y = 2.0 * cos(y); + x = y * sin(lambda); + y *= +coslam; + break; + } + default: { + throw new AssertionError(mode); + } + } + assert checkTransform(x, y, ptDst); + if (ptDst != null) { + ptDst.setLocation(x,y); + return ptDst; + } + return new Point2D.Double(x,y); + } + + /** + * Transforms the specified (x,y) coordinate + * and stores the result in {@code ptDst} using equations for a sphere. + */ + @Override + protected Point2D inverseTransformNormalized(double x, double y, Point2D ptDst) + throws ProjectionException + { + // Compute using ellipsoidal formulas, for comparaison later. + assert (ptDst = super.inverseTransformNormalized(x, y, ptDst)) != null; + + double lambda, phi; + final double rh = hypot(x, y); + phi = rh * 0.5; + if (phi > 1.0) { + throw new ProjectionException(ErrorKeys.TOLERANCE_ERROR); + } + phi = 2.0 * asin(phi); + switch (mode) { + case EQUATORIAL: { + final double sinz = sin(phi); + final double cosz = cos(phi); + phi = abs(rh) <= FINE_EPSILON ? 0.0 : asin(y * sinz / rh); + x *= sinz; + y = cosz * rh; + lambda = (y == 0) ? 0.0 : atan2(x, y); + break; + } + case OBLIQUE: { + final double sinz = sin(phi); + final double cosz = cos(phi); + phi = abs(rh) <= FINE_EPSILON ? latitudeOfOrigin : + asin(cosz * sinb1 + y * sinz * cosb1 / rh); + x *= sinz * cosb1; + y = (cosz - sin(phi) * sinb1) * rh; + lambda = (y == 0) ? 0.0 : atan2(x, y); + break; + } + case NORTH_POLE: { + phi = (PI / 2) - phi; + lambda = atan2(x, -y); + break; + } + case SOUTH_POLE: { + phi -= (PI / 2); + lambda = atan2(x, y); + break; + } + default: { + throw new AssertionError(mode); + } + } + assert checkInverseTransform(lambda, phi, ptDst); + if (ptDst != null) { + ptDst.setLocation(lambda, phi); + return ptDst; + } + return new Point2D.Double(lambda, phi); + } + } + + /** + * Calculates q, Snyder equation (3-12) + * + * @param sinphi sin of the latitude q is calculated for. + * @return q from Snyder equation (3-12). + */ + private double qsfn(final double sinphi) { + if (excentricity >= EPSILON) { + final double con = excentricity * sinphi; + return ((1.0 - excentricitySquared) * (sinphi / (1.0 - con*con) - + (0.5 / excentricity) * log((1.0 - con) / (1.0 + con)))); + } else { + return sinphi + sinphi; + } + } + + /** + * Determines latitude from authalic latitude. + */ + private double authlat(final double beta) { + final double t = beta + beta; + return beta + APA0 * sin(t) + APA1 * sin(t+t) + APA2 * sin(t+t+t); + } + + + + + ////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////// + //////// //////// + //////// PROVIDERS //////// + //////// //////// + ////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////// + + /** + * The {@linkplain org.geotools.referencing.operation.MathTransformProvider math transform + * provider} for an {@linkplain LambertAzimuthalEqualArea Lambert Equal Area} projection + * (EPSG code 9820). + * + * @since 2.4 + * @version $Id: LambertAzimuthalEqualArea.java 37299 2011-05-25 05:21:24Z mbedward $ + * @author Beate Stollberg + * + * @see org.geotools.referencing.operation.DefaultMathTransformFactory + */ + public static class Provider extends AbstractProvider { + /** + * For cross-version compatibility. + */ + private static final long serialVersionUID = 3877793025552244132L; + + /** + * The operation parameter descriptor for the {@link #latitudeOfOrigin} + * parameter value. Valid values range is from -90 to 90°. Default value is 0. + */ + public static final ParameterDescriptor LATITUDE_OF_CENTRE = createDescriptor( + new NamedIdentifier[] { + new NamedIdentifier(Citations.OGC, "latitude_of_center"), + new NamedIdentifier(Citations.EPSG, "Latitude of natural origin"), + new NamedIdentifier(Citations.EPSG, "Spherical latitude of origin"), + new NamedIdentifier(Citations.ESRI, "Latitude_Of_Origin"), + new NamedIdentifier(Citations.GEOTIFF, "ProjCenterLat") + }, + 0, -90, 90, NonSI.DEGREE_ANGLE); + + /** + * The operation parameter descriptor for the {@link #centralMeridian} + * parameter value. Valid values range is from -180 to 180°. Default value is 0. + */ + public static final ParameterDescriptor LONGITUDE_OF_CENTRE = createDescriptor( + new NamedIdentifier[] { + new NamedIdentifier(Citations.OGC, "longitude_of_center"), + new NamedIdentifier(Citations.EPSG, "Longitude of natural origin"), + new NamedIdentifier(Citations.EPSG, "Spherical longitude of origin"), + new NamedIdentifier(Citations.ESRI, "Central_Meridian"), + new NamedIdentifier(Citations.GEOTIFF, "ProjCenterLong") + }, + 0, -180, 180, NonSI.DEGREE_ANGLE); + + /** + * The parameters group. + */ + static final ParameterDescriptorGroup PARAMETERS = createDescriptorGroup(new NamedIdentifier[] { + new NamedIdentifier(Citations.OGC, "Lambert_Azimuthal_Equal_Area"), + new NamedIdentifier(Citations.EPSG, "Lambert Azimuthal Equal Area"), + new NamedIdentifier(Citations.EPSG, "Lambert Azimuthal Equal Area (Spherical)"), + new NamedIdentifier(Citations.GEOTIFF, "CT_LambertAzimEqualArea"), + new NamedIdentifier(Citations.EPSG, "9820"), + }, new ParameterDescriptor[] { + SEMI_MAJOR, SEMI_MINOR, + LATITUDE_OF_CENTRE, LONGITUDE_OF_CENTRE, + FALSE_EASTING, FALSE_NORTHING + }); + + /** + * Constructs a new provider. + */ + public Provider() { + super(PARAMETERS); + } + + /** + * Creates a transform from the specified group of parameter values. + * + * @param parameters The group of parameter values. + * @return The created math transform. + * @throws ParameterNotFoundException if a required parameter was not found. + */ + public MathTransform createMathTransform(final ParameterValueGroup parameters) + throws ParameterNotFoundException + { + return isSpherical(parameters) ? new Spherical(parameters) : + new LambertAzimuthalEqualArea(parameters); + } + } +} Index: applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/MapProjection.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/MapProjection.java (revision 28054) +++ applications/editors/josm/plugins/opendata/includes/org/geotools/referencing/operation/projection/MapProjection.java (revision 28055) @@ -688,4 +688,11 @@ /** + * Default version of {@link #checkTransform(double,double,Point2D,double)}. + */ + static boolean checkTransform(final double x, final double y, final Point2D expected) { + return checkTransform(x, y, expected, EPSILON); + } + + /** * Checks if inverse transform using spherical formulas produces the same result * than ellipsoidal formulas. This method is invoked during assertions only. @@ -707,4 +714,11 @@ } return tolerance < Double.POSITIVE_INFINITY; + } + + /** + * Default version of {@link #checkInverseTransform(double,double,Point2D,double)}. + */ + static boolean checkInverseTransform(double longitude, double latitude, Point2D expected) { + return checkInverseTransform(longitude, latitude, expected, EPSILON); } Index: applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (revision 28054) +++ applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (revision 28055) @@ -16,4 +16,9 @@ package org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.hydrologie; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; import java.net.MalformedURLException; import java.net.URL; @@ -29,15 +34,32 @@ public class EauxDeSurfaceHandler extends DataGouvDataSetHandler { - private static final String ZIP_PATTERN = "FR(I|J|K|L)_SW"; - private static final String SHP_PATTERN = "FR_(I|J|K|L)_SWB_.W_20......"; + private static final String ZIP_PATTERN = "FR(.*)_SW"; + private static final String SHP_PATTERN = "FR_(.*)_SWB_.W_20......"; - private static final String[] letters = new String[]{"I","J","K","L"}; - private static final String[] names = new String[]{"Guadeloupe","Martinique","Guyane","La Réunion"}; - private static final String[] urls = new String[]{ - "Couche-SIG-des-caractéristiques-des-bassins-2010-%3A-eaux-de-surface---Guadeloupe-30381899", - "Couche-SIG-des-caractéristiques-des-bassins-2010-%3A-eaux-de-surface---Martinique-30381935", - "Couche-SIG-des-caractéristiques-des-bassins-2010-%3A-eaux-de-surface---Guyane-30381988", - "Couche-SIG-des-caractéristiques-des-bassins-2010-%3A-eaux-de-surface---Réunion-30381991" - }; + private static final class WaterAgency { + public final String code; + public final String name; + public final String suffix; + public WaterAgency(String code, String name, String suffix) { + this.code = code; + this.name = name; + this.suffix = suffix; + } + } + + private static final WaterAgency[] waterAgencies = new WaterAgency[]{ + new WaterAgency("A", "Escaut Somme", "Escaut-Somme-30381967"), + new WaterAgency("B1", "Meuse", "Meuse-30381855"), + new WaterAgency("B2", "Sambre", "Sambre-30381857"), + new WaterAgency("C", "Rhin", "Rhin-30381951"), + new WaterAgency("D", "Rhône Méditerranée", "Rhône-Méditerranée-30382014"), + new WaterAgency("E", "Corse", "Corse-30381905"), + new WaterAgency("F", "Adour Garonne", "Adour-Garonne-30381839"), + new WaterAgency("G", "Loire Bretagne", "Loire-Bretagne-30381904"), + new WaterAgency("I", "Guadeloupe", "Guadeloupe-30381899"), + new WaterAgency("J", "Martinique", "Martinique-30381935"), + new WaterAgency("K", "Guyane", "Guyane-30381988"), + new WaterAgency("L", "La Réunion", "Réunion-30381991"), + }; public EauxDeSurfaceHandler() { @@ -67,7 +89,7 @@ Matcher m = Pattern.compile(".*"+pattern+"\\....").matcher(filename); if (m.matches()) { - for (int i =0; i> result = new ArrayList>(); try { - for (int i =0; i getDownloadURL(int i) throws MalformedURLException { - return new Pair(names[i], new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+letters[i]+"_SW.zip")); + private Pair getDownloadURL(WaterAgency a) throws MalformedURLException { + return new Pair(a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip")); + } + + /* (non-Javadoc) + * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#notifyTempFileWritten(java.io.File) + */ + @Override + public void notifyTempFileWritten(File file) { + if (file.getName().matches(SHP_PATTERN.replace("(.*)", "F")+"\\.prj")) { // Adour-Garonne .prj files cannot be parsed because they do not contain quotes... + try { + BufferedReader reader = new BufferedReader(new FileReader(file)); + String line = reader.readLine(); + reader.close(); + if (!line.contains("\"")) { + for (String term : new String[]{"GCS_ETRS_1989", "D_ETRS_1989", "GRS_1980", "Greenwich", "Degree"}) { + line = line.replace(term, "\""+term+"\""); + } + BufferedWriter writer = new BufferedWriter(new FileWriter(file)); + writer.write(line); + writer.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } } } Index: applications/editors/josm/plugins/opendata/resources/META-INF/services/org.geotools.referencing.operation.MathTransformProvider =================================================================== --- applications/editors/josm/plugins/opendata/resources/META-INF/services/org.geotools.referencing.operation.MathTransformProvider (revision 28054) +++ applications/editors/josm/plugins/opendata/resources/META-INF/services/org.geotools.referencing.operation.MathTransformProvider (revision 28055) @@ -28,5 +28,5 @@ org.geotools.referencing.operation.projection.LambertConformal2SP$Provider org.geotools.referencing.operation.projection.LambertConformalBelgium$Provider -#org.geotools.referencing.operation.projection.LambertAzimuthalEqualArea$Provider +org.geotools.referencing.operation.projection.LambertAzimuthalEqualArea$Provider #org.geotools.referencing.operation.projection.Orthographic$Provider #org.geotools.referencing.operation.projection.Stereographic$Provider Index: applications/editors/josm/plugins/opendata/resources/org/geotools/referencing/crs/epsg.properties =================================================================== --- applications/editors/josm/plugins/opendata/resources/org/geotools/referencing/crs/epsg.properties (revision 28054) +++ applications/editors/josm/plugins/opendata/resources/org/geotools/referencing/crs/epsg.properties (revision 28055) @@ -13,7 +13,10 @@ 2980=PROJCS["Combani 1950 / UTM zone 38S", GEOGCS["Combani 1950", DATUM["Combani 1950", SPHEROID["International 1924", 6378388.0, 297.0, AUTHORITY["EPSG","7022"]], TOWGS84[-382.0, -59.0, -262.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6632"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4632"]], PROJECTION["Transverse_Mercator", AUTHORITY["EPSG","9807"]], PARAMETER["central_meridian", 45.0], PARAMETER["latitude_of_origin", 0.0], PARAMETER["scale_factor", 0.9996], PARAMETER["false_easting", 500000.0], PARAMETER["false_northing", 10000000.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","2980"]] 2987=PROJCS["Saint Pierre et Miquelon 1950 / UTM zone 21N", GEOGCS["Saint Pierre et Miquelon 1950", DATUM["Saint Pierre et Miquelon 1950", SPHEROID["Clarke 1866", 6378206.4, 294.9786982138982, AUTHORITY["EPSG","7008"]], TOWGS84[30.0, 430.0, 368.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6638"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4638"]], PROJECTION["Transverse_Mercator", AUTHORITY["EPSG","9807"]], PARAMETER["central_meridian", -57.0], PARAMETER["latitude_of_origin", 0.0], PARAMETER["scale_factor", 0.9996], PARAMETER["false_easting", 500000.0], PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","2987"]] +3034=PROJCS["ETRS89 / LCC Europe", GEOGCS["ETRS89", DATUM["European Terrestrial Reference System 1989", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6258"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4258"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", 10.0], PARAMETER["latitude_of_origin", 52.0], PARAMETER["standard_parallel_1", 65.0], PARAMETER["false_easting", 4000000.0], PARAMETER["false_northing", 2800000.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 35.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3034"]] +3035=PROJCS["ETRS89 / LAEA Europe", GEOGCS["ETRS89", DATUM["European Terrestrial Reference System 1989", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6258"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4258"]], PROJECTION["Lambert_Azimuthal_Equal_Area", AUTHORITY["EPSG","9820"]], PARAMETER["latitude_of_center", 52.0], PARAMETER["longitude_of_center", 10.0], PARAMETER["false_easting", 4321000.0], PARAMETER["false_northing", 3210000.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3035"]] 3312=PROJCS["CSG67 / UTM zone 21N", GEOGCS["CSG67", DATUM["Centre Spatial Guyanais 1967", SPHEROID["International 1924", 6378388.0, 297.0, AUTHORITY["EPSG","7022"]], TOWGS84[-186.0, 230.0, 110.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6623"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4623"]], PROJECTION["Transverse_Mercator", AUTHORITY["EPSG","9807"]], PARAMETER["central_meridian", -57.0], PARAMETER["latitude_of_origin", 0.0], PARAMETER["scale_factor", 0.9996], PARAMETER["false_easting", 500000.0], PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3312"]] +3416=PROJCS["ETRS89 / Austria Lambert", GEOGCS["ETRS89", DATUM["European Terrestrial Reference System 1989", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6258"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4258"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", 13.333333333333334], PARAMETER["latitude_of_origin", 47.5], PARAMETER["standard_parallel_1", 49.0], PARAMETER["false_easting", 400000.0], PARAMETER["false_northing", 400000.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 46.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3416"]] +3447=PROJCS["ETRS89 / Belgian Lambert 2005", GEOGCS["ETRS89", DATUM["European Terrestrial Reference System 1989", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6258"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4258"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", 4.359215833333335], PARAMETER["latitude_of_origin", 50.79781500000001], PARAMETER["standard_parallel_1", 51.16666666666667], PARAMETER["false_easting", 150328.0], PARAMETER["false_northing", 166262.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 49.833333333333336], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3447"]] 3727=PROJCS["Reunion 1947 / TM Reunion", GEOGCS["Reunion 1947", DATUM["Reunion 1947", SPHEROID["International 1924", 6378388.0, 297.0, AUTHORITY["EPSG","7022"]], TOWGS84[94.0, -948.0, -1262.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6626"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4626"]], PROJECTION["Transverse_Mercator", AUTHORITY["EPSG","9807"]], PARAMETER["central_meridian", 55.53333333333333], PARAMETER["latitude_of_origin", -21.116666666666667], PARAMETER["scale_factor", 1.0], PARAMETER["false_easting", 160000.0], PARAMETER["false_northing", 50000.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3727"]] - 3812=PROJCS["ETRS89 / Belgian Lambert 2008", GEOGCS["ETRS89", DATUM["European Terrestrial Reference System 1989", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6258"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4258"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", 4.359215833333335], PARAMETER["latitude_of_origin", 50.79781500000001], PARAMETER["standard_parallel_1", 51.16666666666667], PARAMETER["false_easting", 649328.0], PARAMETER["false_northing", 665262.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 49.833333333333336], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3812"]] 3942=PROJCS["RGF93 / CC42", GEOGCS["RGF93", DATUM["Reseau Geodesique Francais 1993", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6171"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4171"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", 3.0], PARAMETER["latitude_of_origin", 42.0], PARAMETER["standard_parallel_1", 42.75], PARAMETER["false_easting", 1700000.0], PARAMETER["false_northing", 1200000.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 41.25], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","3942"]] @@ -93,12 +96,4 @@ 27573=PROJCS["NTF (Paris) / Lambert zone III",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.999877499],PARAMETER["false_easting",600000],PARAMETER["false_northing",3200000],AUTHORITY["EPSG","27573"],AXIS["X",EAST],AXIS["Y",NORTH]] 27574=PROJCS["NTF (Paris) / Lambert zone IV",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",46.85],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.99994471],PARAMETER["false_easting",234.358],PARAMETER["false_northing",4185861.369],AUTHORITY["EPSG","27574"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27581=PROJCS["NTF (Paris) / France I (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",55],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.999877341],PARAMETER["false_easting",600000],PARAMETER["false_northing",1200000],AUTHORITY["EPSG","27581"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27582=PROJCS["NTF (Paris) / France II (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",52],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.99987742],PARAMETER["false_easting",600000],PARAMETER["false_northing",2200000],AUTHORITY["EPSG","27582"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27583=PROJCS["NTF (Paris) / France III (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.999877499],PARAMETER["false_easting",600000],PARAMETER["false_northing",3200000],AUTHORITY["EPSG","27583"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27584=PROJCS["NTF (Paris) / France IV (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",46.85],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.99994471],PARAMETER["false_easting",234.358],PARAMETER["false_northing",4185861.369],AUTHORITY["EPSG","27584"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27591=PROJCS["NTF (Paris) / Nord France (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",55],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.999877341],PARAMETER["false_easting",600000],PARAMETER["false_northing",200000],AUTHORITY["EPSG","27591"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27592=PROJCS["NTF (Paris) / Centre France (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",52],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.99987742],PARAMETER["false_easting",600000],PARAMETER["false_northing",200000],AUTHORITY["EPSG","27592"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27593=PROJCS["NTF (Paris) / Sud France (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",49],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.999877499],PARAMETER["false_easting",600000],PARAMETER["false_northing",200000],AUTHORITY["EPSG","27593"],AXIS["X",EAST],AXIS["Y",NORTH]] -#27594=PROJCS["NTF (Paris) / Corse (deprecated)",GEOGCS["NTF (Paris)",DATUM["Nouvelle_Triangulation_Francaise_Paris",SPHEROID["Clarke 1880 (IGN)",6378249.2,293.4660212936269,AUTHORITY["EPSG","7011"]],TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY["EPSG","6807"]],PRIMEM["Paris",2.33722917,AUTHORITY["EPSG","8903"]],UNIT["grad",0.01570796326794897,AUTHORITY["EPSG","9105"]],AUTHORITY["EPSG","4807"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_1SP"],PARAMETER["latitude_of_origin",46.85],PARAMETER["central_meridian",0],PARAMETER["scale_factor",0.99994471],PARAMETER["false_easting",234.358],PARAMETER["false_northing",185861.369],AUTHORITY["EPSG","27594"],AXIS["X",EAST],AXIS["Y",NORTH]] 27700=PROJCS["OSGB 1936 / British National Grid", GEOGCS["OSGB 1936", DATUM["OSGB 1936", SPHEROID["Airy 1830", 6377563.396, 299.3249646, AUTHORITY["EPSG","7001"]], TOWGS84[446.448, -125.157, 542.06, 0.15, 0.247, 0.842, -20.489], AUTHORITY["EPSG","6277"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4277"]], PROJECTION["Transverse_Mercator", AUTHORITY["EPSG","9807"]], PARAMETER["central_meridian", -2.0], PARAMETER["latitude_of_origin", 49.0], PARAMETER["scale_factor", 0.9996012717], PARAMETER["false_easting", 400000.0], PARAMETER["false_northing", -100000.0], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","27700"]] Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 28054) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 28055) @@ -36,4 +36,5 @@ 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,5 +475,7 @@ 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 result = new ArrayList(); AbstractDerivedCRS crs = (AbstractDerivedCRS) sourceCRS; @@ -558,3 +561,7 @@ return setSkipXsdValidationInZipReading; } + + public void notifyTempFileWritten(File file) { + // Do nothing, let handler overload this method if they need it + } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java (revision 28054) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java (revision 28055) @@ -107,4 +107,5 @@ throw new IOException("Could not create temp file: " + file.getAbsolutePath()); } + // Write temp file FileOutputStream fos = new FileOutputStream(file); byte[] buffer = new byte[8192]; @@ -114,8 +115,14 @@ } 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