Changeset 13441 in josm for trunk

Timestamp:

2018-02-18T22:04:03+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15880, see #15970 - ignore equatorial stereographic projections for now

Location:

trunk

Files:

• data_nodist/projection/projection-reference-data (modified) (2 diffs)
• data_nodist/projection/projection-regression-test-data (modified) (2 diffs)
• scripts/BuildProjectionDefinitions.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java (modified) (1 diff)

trunk/data_nodist/projection/projection-reference-data

@@ -45881 +45881 @@
     -160.07590829432814,32.11980859496357,-1.507518480579749E7,3571559.760558292
     60.39325329944734,-8.89613845560865,6634638.778015221,-989205.463034758
-<EPSG:53026> +proj=stere +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +a=6371000 +b=6371000 +units=m +no_defs  <>
-    40.42376185284917,36.89322879284906,4107255.971710112,4754605.867872995
-    -94.55718062357333,-2.9569970243057213,-1.3778069452766148E7,-713966.163962113
-    -109.37778469627341,66.87517335137669,-5428075.389411426,1.3473961573441872E7
-    83.3250015628625,-61.29966292162436,5756276.921630432,-1.0585663346410455E7
-    51.50577089554389,-5.272671963280075,6130745.113452208,-722887.336402056
-    -48.66531456772225,76.08115949811803,-1985932.242183774,1.0672337822148724E7
-    47.41811879043098,-14.282330978918125,5491292.010941673,-1898531.040013871
-    -49.24282044156655,19.749998876468112,-5626735.978917658,2666995.865419155
 <EPSG:53028> +proj=cass +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +a=6371000 +b=6371000 +units=m +no_defs  <>
     0.8578209028332946,5.758150627748947,94904.00671269,640348.421641093
@@ -45917 +45908 @@
     179.97821016834962,-22.600499677645132,1.8505676332751736E7,-2500296.421571374
     -101.27859431467866,75.32867211875893,-2864467.891709976,8363623.966195609
-<EPSG:54026> +proj=stere +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs  <>
-    107.59420860233638,62.16807985119611,1.3300667394706957E7,2.6252485023742866E7
-    79.47062843598161,77.24374979370869,5356352.618325572,2.390397331620702E7
-    -163.12295470459568,-55.26739984042287,-9371944.971985318,-4.6252381662244335E7
-    -167.1113672686503,32.44572532708382,-2.737357860736383E7,7.749597928365001E7
-    -93.31039725344527,44.02903546429987,-1.917036796802695E7,1.8438170025579017E7
-    -10.119643837451605,68.44991126675434,-1214431.461080506,1.7384674665194422E7
-    -24.145525272274455,34.7645275912879,-4906122.009879157,8269174.570335681
-    -133.17972355191225,17.083735579939727,-5.149636426121571E7,2.155811698059414E7
 <EPSG:54028> +proj=cass +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs  <>
     -0.9415625415552098,-58.16518999118915,-55418.84717627,-6450068.264050342

trunk/data_nodist/projection/projection-regression-test-data

@@ -15929 +15929 @@
   en  612336.6663195428 -6004596.491506822
   ll2 -31.606909554154495 95.38371313695333
-EPSG:53026
-  ll  69.21901002534425 168.09542183024365
-  en  1.8712296762823246E7 1.0819158560322696E7
-  ll2 69.21901002534425 168.09542183024365
 EPSG:53028
   ll  -35.72259959292767 0.08011233833985498
@@ -16125 +16121 @@
   en  -5064010.776136052 6540685.607089906
   ll2 58.98219418668685 -88.06214048573408
-EPSG:54026
-  ll  49.0603674470659 -67.81684967996605
-  en  -7549337.1735777985 6285110.701172777
-  ll2 49.06036744706591 -67.81684967996605
 EPSG:54028
   ll  21.630537363040688 0.6844020151189876

trunk/scripts/BuildProjectionDefinitions.java

@@ -46 +46 @@
     private static int noEsri = 0;
     private static int noOmercNoBounds = 0;
+    private static int noEquatorStereo = 0;
 
     /**
@@ -111 +112 @@
                 System.out.println(String.format(" * projection is Oblique Mercator (requires bounds), but no bounds specified: %d entries", noOmercNoBounds));
             }
+            if (noEquatorStereo > 0) {
+                System.out.println(String.format(" * projection is Equatorial Stereographic (see #15970): %d entries", noEquatorStereo));
+            }
             System.out.println();
             System.out.println(String.format("written %d entries from %s", noJosm, JOSM_EPSG_FILE));
@@ -194 +198 @@
             noOmercNoBounds++;
         }
+        // TODO: implement equatorial stereographic, see https://josm.openstreetmap.de/ticket/15970
+        if (result && "stere".equals(proj) && "0".equals(parameters.get(CustomProjection.Param.lat_0.key))) {
+            result = false;
+            noEquatorStereo++;
+        }
 
         return result;

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -53 +53 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
+    public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20000);
 
     /**

trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java

@@ -26 +26 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().https();
+    public JOSMTestRules test = new JOSMTestRules().platform().https().timeout(20000);
 
     /**