Changeset 28982 in osm for applications/editors/josm/plugins

Timestamp:

2012-11-25T01:07:01+01:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] Robustness to invalid EPSG database entries

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (1 diff)

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

@@ -254 +254 @@
                                 // Find matching CRS with Bursa Wolf parameters in EPSG database
                                 for (String code : CRS.getAuthorityFactory(false).getAuthorityCodes(ProjectedCRS.class)) {
-                                        CoordinateReferenceSystem candidate = CRS.decode(code);
-                                        if (candidate instanceof AbstractCRS && crs instanceof AbstractIdentifiedObject) {
-                                                
-                                                Hints.putSystemDefault(Hints.COMPARISON_TOLERANCE, 
-                                                                Main.pref.getDouble(PREF_CRS_COMPARISON_TOLERANCE, DEFAULT_CRS_COMPARISON_TOLERANCE));
-                                                if (((AbstractCRS)candidate).equals((AbstractIdentifiedObject)crs, false)) {
-                                                        System.out.println("Found a potential CRS: "+candidate.getName());
-                                                        candidates.add(candidate);
-                                                } else if (Main.pref.getBoolean(PREF_CRS_COMPARISON_DEBUG, false)) {
-                                                        compareDebug(crs, candidate);
-                                                }
-                                                Hints.removeSystemDefault(Hints.COMPARISON_TOLERANCE);
-                                        }
+                                    try {
+                                        CoordinateReferenceSystem candidate = CRS.decode(code);
+                                        if (candidate instanceof AbstractCRS && crs instanceof AbstractIdentifiedObject) {
+                                                
+                                                Hints.putSystemDefault(Hints.COMPARISON_TOLERANCE, 
+                                                                Main.pref.getDouble(PREF_CRS_COMPARISON_TOLERANCE, DEFAULT_CRS_COMPARISON_TOLERANCE));
+                                                if (((AbstractCRS)candidate).equals((AbstractIdentifiedObject)crs, false)) {
+                                                        System.out.println("Found a potential CRS: "+candidate.getName());
+                                                        candidates.add(candidate);
+                                                } else if (Main.pref.getBoolean(PREF_CRS_COMPARISON_DEBUG, false)) {
+                                                        compareDebug(crs, candidate);
+                                                }
+                                                Hints.removeSystemDefault(Hints.COMPARISON_TOLERANCE);
+                                        }
+                                    } catch (FactoryException ex) {
+                                        // Silently ignore exceptions
+                                        //System.err.println("Warning: cannot decode "+code+". "+ex.getMessage());
+                                    }
                                 }