Changeset 9560 in josm

Timestamp:

2016-01-21T19:10:28+01:00 (8 years ago)

Author:

bastiK

Message:

added Lambert Azimuthal Equal Area projection (see #12186)
(imports pieces of code from the Geotools project)

Location:

trunk

Files:

• data_nodist/projection/projection-regression-test-data (modified) (6 diffs)
• src/org/openstreetmap/josm/data/projection/Projections.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (added)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) (1 diff)

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

@@ -945 +945 @@
   en  526816.7954149537 -6164357.90894286
   ll2 -55.62433263256851 -8.5742806503242
+EPSG:2163
+  ll  12.526637770006957 -147.98080061150574
+  en  -5141128.167378954 -2188265.6514135734
+  ll2 12.526637770006953 -147.98080061150574
 EPSG:2164
   ll  -62.32215364049232 -1.4097532551364758
@@ -6157 +6161 @@
   en  552213.8284095287 7322183.704802955
   ll2 66.0154186196242 58.151160665498494
+EPSG:3035
+  ll  -45.40063789010833 -114.5250706603789
+  en  -7518153.250978978 662760.3359244876
+  ll2 -45.400637891794425 -114.52507066037893
 EPSG:3036
   ll  41.91433993365871 33.792320014545986
@@ -9605 +9613 @@
   en  21221.886057121756 -5878316.329362738
   ll2 -30.985259804928983 113.97942223611584
+EPSG:3408
+  ll  14.029915387907806 -67.12353635759212
+  en  -7225573.641936907 -3048704.612567137
+  ll2 14.029915387907804 -67.12353635759212
+EPSG:3409
+  ll  63.43741087713781 -84.44919915879865
+  en  -1.2343491854085062E7 1199589.7562103607
+  ll2 63.437410877137815 -84.44919915879865
 EPSG:3411
   ll  69.74806132169249 48.794738310977124
@@ -10241 +10257 @@
   en  3904167.5064407806 7650010.159560557
   ll2 65.28507670710617 -42.087409865931924
+EPSG:3571
+  ll  64.89964936582356 170.5317439480662
+  en  -457227.6665739163 -2741615.032569975
+  ll2 64.89964936164473 170.5317439480662
+EPSG:3572
+  ll  80.65412551155194 -36.295596276000964
+  en  954663.40670505 419155.45358554856
+  ll2 80.65412550591607 -36.29559627600095
+EPSG:3573
+  ll  -64.1444437814515 -139.25591996218657
+  en  -7856996.652497751 -9614455.935271448
+  ll2 -64.14444377767273 -139.25591996218657
+EPSG:3574
+  ll  -79.21995095992453 -64.95019752248338
+  en  -5350993.180484241 -1.1501332058751125E7
+  ll2 -79.21995095376043 -64.95019752248338
+EPSG:3575
+  ll  -57.24760170920752 24.22564317410226
+  en  3003306.07375122 -1.1846652341148507E7
+  ll2 -57.24760170926206 24.22564317410226
+EPSG:3576
+  ll  -72.86593883837658 18.30093381962338
+  en  -1.1961406582415022E7 -3956073.2817943534
+  ll2 -72.86593883150354 18.30093381962338
 EPSG:3577
   ll  75.16436397991066 25.748997302526107
@@ -11377 +11417 @@
   en  -1165170.92007724 2182203.5152833266
   ll2 54.42419666854405 -96.78338500410386
+EPSG:3973
+  ll  -32.92058330453359 -131.90745870565144
+  en  -8325985.986854717 7472436.641807936
+  ll2 -32.92058329590132 -131.90745870565144
+EPSG:3974
+  ll  24.238413439108 -123.04426714785009
+  en  -8965055.968158651 -5831827.935238246
+  ll2 24.238413421706944 -123.0442671478501
 EPSG:3976
   ll  -61.485142666969146 135.3681857020244
@@ -14693 +14741 @@
   en  4100444.8234785083 7345095.225093836
   ll2 88.59195068562225 30.30319700189411
+EPSG:5633
+  ll  32.10143683187792 -99.66468396965172
+  en  -2142969.481850708 7670026.090342333
+  ll2 32.101436822321624 -99.66468396965169
 EPSG:5634
   ll  44.73235142741427 43.761338436519054
   en  6507108.804053778 2601340.739292636
   ll2 44.732351427414365 43.76133843651906
+EPSG:5635
+  ll  13.8511931628463 -38.372594402366516
+  en  -875071.4496919811 633020.5706892838
+  ll2 13.85119314420695 -38.372594402366516
+EPSG:5636
+  ll  82.16595216810498 -135.31921297760783
+  en  3784001.435651803 8032209.811246303
+  ll2 82.16595216315453 -135.3192129776078
 EPSG:5637
   ll  -1.7906977289314252 20.152006290816047
   en  5565308.0616947375 -3620252.247669873
   ll2 -1.7906977289313901 20.152006290816054
+EPSG:5638
+  ll  19.825020641428466 -15.645404488722676
+  en  1576211.9705871982 120318.8894550018
+  ll2 19.8250206217897 -15.645404488722686
 EPSG:5639
   ll  49.029161950629934 12.564236704801559

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.projection.proj.ClassProjFactory;
 import org.openstreetmap.josm.data.projection.proj.DoubleStereographic;
+import org.openstreetmap.josm.data.projection.proj.LambertAzimuthalEqualArea;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
 import org.openstreetmap.josm.data.projection.proj.LonLat;
@@ -89 +90 @@
         registerBaseProjection("cass", CassiniSoldner.class, "core");
         registerBaseProjection("josm:smerc", Mercator.class, "core");
+        registerBaseProjection("laea", LambertAzimuthalEqualArea.class, "core");
         registerBaseProjection("lcc", LambertConformalConic.class, "core");
         registerBaseProjection("lonlat", LonLat.class, "core");

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

@@ -124 +124 @@
         testProj("omerc", EPS, "+lat_0=4 +lonc=115 +alpha=53 +no_uoff +gamma=53.130 +bounds=112,4,116,7");
         testProj("cass", 1e-3, "+lat_0=11 +bounds=-1.0,-89,1.0,89");
+        testProj("laea", 3e-3, "+lat_0=34");
 
         if (error2) {