Changeset 11661 in josm

Timestamp:

2017-03-04T12:26:37+01:00 (7 years ago)

Author:

bastiK

Message:

see #5399 - update ProjectionRefTest

Location:

trunk

Files:

• data_nodist/projection/projection-reference-data (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (2 diffs)

trunk/data_nodist/projection/projection-reference-data

@@ -33470 +33470 @@
     -6.727564907759373,83.63519833445251,-216874.700708727,4425682.806734157
     36.50142962768149,-4.70135234354907,4678188.079717332,-5406749.218224123
-<EPSG:21781> +proj=somerc +lat_0=46d57'8.66" +lon_0=7d26'22.5" +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.374,15.056,405.346 +units=m +bounds=5.7,45.7,10.6,47.9  <>
-    9.82022967492809,45.88641772774894,784866.479906033,84450.743875092
-    8.891588492193241,46.36858378723954,711800.509604853,136280.002175705
-    9.554990703319264,47.19793101821633,760350.003825178,229605.258302477
-    6.242991128633595,46.54193643101183,508290.035152368,155216.546122153
-    7.7372942074149975,46.023753225689774,623127.336453907,96955.745019694
-    7.32895149546506,47.61863020895797,591755.169099147,274223.630384767
-    5.946105825891006,46.25246123668608,484907.564282969,123433.495532274
-    6.512894139499955,45.94531631398674,528207.38771442,88617.071243456
+<EPSG:21781> +proj=somerc +lat_0=46d57'8.66" +lon_0=7d26'22.5" +x_0=600000 +y_0=200000 +ellps=bessel +nadgrids=CHENYX06_etrs.gsb +towgs84=674.374,15.056,405.346 +units=m +bounds=5.7,45.7,10.6,47.9  <>
+    7.938448129853736,46.79465315433036,638158.985520956,182731.071647371
+    7.441723602005019,46.08070477065818,600238.61689251,103243.283478341
+    8.288777166913963,47.46265495427786,664099.893483817,257221.894602634
+    7.437825319631524,46.9366096732191,599938.464581551,198390.971031227
+    6.419341714956735,46.11979656063479,521205.769486789,108101.747007159
+    9.5514416864746,45.724171144382964,764493.431359238,65823.6056569
+    9.873056604271362,47.620151303083325,782984.550667565,277226.14897261
+    8.097837497762685,46.055825668328055,651018.209361449,100691.844768734
 <EPSG:21782> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=0 +y_0=0 +ellps=bessel +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +no_defs  <>
     3.520346745457715,19.179134404638127,-465079.938639453,-3194627.589840587

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -63 +63 @@
 
     private static final String REFERENCE_DATA_FILE = "data_nodist/projection/projection-reference-data";
+    private static final String PROJ_LIB_DIR = "data_nodist/projection";
 
     private static class RefEntry {
@@ -233 +234 @@
         args.addAll(Arrays.asList(def.split(" ")));
         ProcessBuilder pb = new ProcessBuilder(args);
+        pb.environment().put("PROJ_LIB", new File(PROJ_LIB_DIR).getAbsolutePath());
 
         String output;