Changeset 29497 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2013-04-14T16:34:48+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] fix #josm8309 - Fallback to EPSG:4326 when no projection found for shapefiles

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (4 diffs)

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

@@ -26 +26 @@
 import java.util.Map;
 import java.util.Set;
+
+import javax.swing.JOptionPane;
 
 import org.geotools.data.DataStore;
@@ -48 +50 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.NationalHandlers;
@@ -81 +84 @@
         }
         
-        private void parseFeature(Feature feature, Component parent) 
+        private void parseFeature(Feature feature, final Component parent) 
                         throws UserCancelException, GeoMathTransformException, FactoryException, GeoCrsException, MismatchedDimensionException, TransformException {
                 featurePrimitives.clear();
@@ -89 +92 @@
                         GeometryDescriptor desc = geometry.getDescriptor();
                         
-                        if (crs == null && desc != null && desc.getCoordinateReferenceSystem() != null) {
-                                crs = desc.getCoordinateReferenceSystem();
-                                findMathTransform(parent, true);
-                        } else if (crs == null) {
-                                throw new GeoCrsException("Unable to detect CRS !");
+                        if (crs == null) {
+                        if (desc != null && desc.getCoordinateReferenceSystem() != null) {
+                                crs = desc.getCoordinateReferenceSystem();
+                        } else {
+                            GuiHelper.runInEDTAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (0 == JOptionPane.showConfirmDialog(
+                                    parent,
+                                    tr("Unable to detect Coordinate Reference System.\nWould you like to fallback to ESPG:4326 (WGS 84) ?"),
+                                    tr("Warning: CRS not found"),
+                                    JOptionPane.YES_NO_CANCEL_OPTION
+                            )) {
+                                crs = wgs84;
+                            }
+                        }
+                    });
+                        }
+                if (crs != null) {
+                    findMathTransform(parent, true);
+                } else {
+                    throw new GeoCrsException(tr("Unable to detect CRS !"));
+                }
                         }