Changeset 9567 in josm for trunk/scripts

Timestamp:

2016-01-22T20:59:38+01:00 (9 years ago)

Author:

bastiK

Message:

epsg script: list missing projections only for entries that are not excluded already for another reason (see #12186)

File:

• trunk/scripts/BuildProjectionDefinitions.java (modified) (2 diffs)

trunk/scripts/BuildProjectionDefinitions.java

@@ -143 +143 @@
         }
 
-        // exclude entries where we don't support the base projection
-        Proj bp = Projections.getBaseProjection(proj);
-        if (!"utm".equals(proj) && bp == null) {
-            result = false;
-            noBaseProjection++;
-            if (!"geocent".equals(proj)) {
-                if (!baseProjectionMap.containsKey(proj)) {
-                    baseProjectionMap.put(proj, 0);
-                }
-                baseProjectionMap.put(proj, baseProjectionMap.get(proj)+1);
-            }
-        }
-
         // no support for NAD27 datum, as it requires a conversion database
         String datum = parameters.get(CustomProjection.Param.datum.key);
@@ -169 +156 @@
         }
         
+        // exclude entries where we don't support the base projection
+        Proj bp = Projections.getBaseProjection(proj);
+        if (result && !"utm".equals(proj) && bp == null) {
+            result = false;
+            noBaseProjection++;
+            if (!"geocent".equals(proj)) {
+                if (!baseProjectionMap.containsKey(proj)) {
+                    baseProjectionMap.put(proj, 0);
+                }
+                baseProjectionMap.put(proj, baseProjectionMap.get(proj)+1);
+            }
+        }
+
         if (result && "omerc".equals(proj) && !parameters.containsKey(CustomProjection.Param.bounds.key)) {
             result = false;