Changeset 13628 in josm for trunk

Timestamp:

2018-04-14T16:56:19+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16129 - handle projection definitions with both +datum and +towgs84

Location:

trunk

Files:

• data_nodist/projection/projection-regression-test-data (modified) (45 diffs)
• src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (3 diffs)

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

@@ -11 +11 @@
 EPSG:102003
   ll  64.3489401651619 -148.3996632217208
-  en  -2855897.760275051 3678484.721086486
-  ll2 64.34894016516189 -148.3996632217208
+  en  -3066392.322892552 3667183.9504527776
+  ll2 64.32543402895615 -148.34914606607416
 EPSG:102004
   ll  69.15552856554989 -175.9529010161351
-  en  -3312829.6952230353 5089484.13314109
-  ll2 69.1555285655499 -175.95290101613512
+  en  -3514220.0078932443 5028593.7483504005
+  ll2 69.14066747232546 -175.85561949418678
 EPSG:102007
   ll  15.370505263890166 -19.522648664299737
-  en  1.401723468337563E7 4125503.2398055447
-  ll2 15.370505263890152 -19.52264866429971
+  en  1.3788298371264037E7 4170514.188365902
+  ll2 15.372766555628845 -19.520435562031945
 EPSG:102008
   ll  -26.310430235490784 -144.84790265811282
@@ -103 +103 @@
 EPSG:102039
   ll  48.27220329831079 -88.8242557198501
-  en  537162.8749315344 2828453.468360626
-  ll2 48.27220329831079 -88.8242557198501
+  en  302592.16886249685 2813232.166451573
+  ll2 48.26781896680329 -88.82435301284839
 EPSG:102041
   ll  47.63039849236007 -122.06414248203222
@@ -111 +111 @@
 EPSG:102042
   ll  48.718086673339016 -70.07935638415587
-  en  894798.3996083565 1589063.5663247386
-  ll2 48.71808667333899 -70.07935638415587
+  en  662979.9619159531 1611660.469566133
+  ll2 48.71118823740593 -70.08186702963175
 EPSG:102043
   ll  18.253765035222607 -64.070562017384
@@ -363 +363 @@
 EPSG:102194
   ll  55.55633946879572 20.33702116637442
-  en  584311.7535226268 855666.7351134392
-  ll2 55.55633946879554 20.3370211663746
+  en  584311.7535226273 855666.7351134177
+  ll2 55.556339468795166 20.3370211663746
 EPSG:102195
   ll  51.534730275608965 15.538687174062309
-  en  5537375.275309833 5711274.058298525
-  ll2 51.53473027560918 15.538687174062302
+  en  5537375.275309834 5711274.058298512
+  ll2 51.53473027560895 15.538687174062316
 EPSG:102196
   ll  52.84283253396581 19.32544885774991
-  en  6589300.739562813 5857502.30806816
-  ll2 52.84283253396554 19.325448857750157
+  en  6589300.739562813 5857502.308068145
+  ll2 52.84283253396527 19.32544885775015
 EPSG:102197
   ll  51.87714645422046 22.359782928556516
-  en  7593633.327674415 5750105.530679146
-  ll2 51.87714645422006 22.35978292855683
+  en  7593633.327674415 5750105.530679133
+  ll2 51.87714645421983 22.35978292855682
 EPSG:102198
   ll  51.97028399400007 22.788247347949472
-  en  8416732.041504536 5760287.237906056
-  ll2 51.97028399399997 22.788247347949305
+  en  8416732.041504536 5760287.237906044
+  ll2 51.97028399399974 22.78824734794931
 EPSG:102204
   ll  16.255410769285433 47.27455422048304
@@ -387 +387 @@
 EPSG:102213
   ll  70.73594793543805 168.00514656845584
-  en  610616.0466851984 7850686.751439499
-  ll2 70.73594793541108 168.00514656843941
+  en  596206.5929112661 7688652.6076484
+  ll2 70.73057089091995 168.11984061215918
 EPSG:102215
   ll  70.77359049339142 -84.12534931337862
@@ -403 +403 @@
 EPSG:102218
   ll  47.94542350313402 -117.65117633681534
-  en  775434.1150192074 1545100.952392558
-  ll2 47.945423503133966 -117.65117633681534
+  en  558866.5937886492 1462027.0965900973
+  ll2 47.93778799044712 -117.6473436710714
 EPSG:102219
   ll  45.90312522827716 -87.4403891216519
-  en  2357410.635543994 1989727.2033385623
-  ll2 45.90312522825249 -87.4403891216391
+  en  1592431.9632084796 1989336.3073754983
+  ll2 45.901876927410875 -87.44044080986359
 EPSG:102220
   ll  44.70125731001757 -88.95822630991704
@@ -535 +535 @@
 EPSG:102389
   ll  46.80380536647594 -96.76355143164051
-  en  2903843.2426849487 436941.30734704784
-  ll2 46.803805366475885 -96.76355143164051
+  en  2145390.4695625687 337005.28192046727
+  ll2 46.80113730012217 -96.76326475906245
 EPSG:102390
   ll  46.91291531592281 -96.84074924622256
@@ -575 +575 @@
 EPSG:102399
   ll  48.595499820228646 -110.23025961328446
-  en  -312040.8606233376 685915.4155488475
-  ll2 48.59549982022864 -110.23025961328446
+  en  -539954.4217952507 640689.3310369517
+  ll2 48.588694869694876 -110.22776583350931
 EPSG:102400
   ll  51.43034552696036 -0.23983905945396394
@@ -787 +787 @@
 EPSG:102459
   ll  43.27187216663565 -116.337664657473
-  en  2468602.603589906 585622.2587706276
-  ll2 43.27187216663565 -116.33766465747301
+  en  1740024.009926 350430.73662884283
+  ll2 43.27014743892636 -116.33700622175301
 EPSG:102461
   ll  20.280148936833193 -155.19299053832034
@@ -875 +875 @@
 EPSG:102562
   ll  -32.55405912309591 19.313960351990115
-  en  29487.37590016946 -3603336.4502546457
-  ll2 -32.554059123095925 19.31396035199011
+  en  29487.37590016979 -3603336.450254645
+  ll2 -32.55405912309592 19.313960351990115
 EPSG:102563
   ll  -29.971909785368105 20.99280579942949
-  en  -694.3370624816544 -3316999.5574631626
-  ll2 -29.971909785366808 20.992805799429494
+  en  -694.3370624819927 -3316999.5574632348
+  ll2 -29.971909785368112 20.99280579942949
 EPSG:102564
   ll  -27.555945966328807 23.912029527718573
-  en  90076.16950921979 -3049565.179871942
-  ll2 -27.555945966328135 23.912029527718634
+  en  90076.16950921953 -3049565.1798719782
+  ll2 -27.555945966328796 23.912029527718634
 EPSG:102565
   ll  -31.602859355300605 25.508094201949106
-  en  48217.49404033936 -3497928.18828385
-  ll2 -31.602859355298634 25.50809420194911
+  en  48217.494040338854 -3497928.18828396
+  ll2 -31.60285935530061 25.50809420194911
 EPSG:102566
   ll  -33.59245916611226 26.91530770134665
-  en  -7861.448167838229 -3718460.752219062
-  ll2 -33.59245916611227 26.915307701346652
+  en  -7861.448167838559 -3718460.7522190604
+  ll2 -33.59245916611226 26.91530770134665
 EPSG:102567
   ll  -30.438051343963142 29.4973931015477
-  en  47779.729716704795 -3368779.1486160997
-  ll2 -30.438051343961664 29.497393101547708
+  en  47779.729716704445 -3368779.1486161808
+  ll2 -30.43805134396314 29.497393101547704
 EPSG:102568
   ll  -28.874510286042796 31.312429896414745
-  en  30479.60581672704 -3195400.834693064
-  ll2 -28.874510286041836 31.31242989641474
+  en  30479.605816727242 -3195400.834693116
+  ll2 -28.874510286042792 31.312429896414745
 EPSG:102581
   ll  17.000473321656553 -57.97078946083836
@@ -935 +935 @@
 EPSG:102589
   ll  47.63013941269964 -71.9592559629138
-  en  3519633.1308237347 8468655.000421284
-  ll2 47.630139412699656 -71.9592559629138
+  en  2742959.3596141725 8519692.673997657
+  ll2 47.62494431021093 -71.96090679185963
 EPSG:102592
   ll  53.3975910241483 -43.22973366400631
@@ -951 +951 @@
 EPSG:102600
   ll  35.93004737850804 -114.47034670191559
-  en  1634103.2132434899 8410214.10949793
-  ll2 35.930047378508 -114.47034670191559
+  en  921815.6559987781 8143998.821847687
+  ll2 35.937797397027744 -114.47338095845382
 EPSG:102604
   ll  32.10422589440318 -82.34870386548124
-  en  356428.3634497832 1.2302790261975637E7
-  ll2 32.10422589440343 -82.34870386548124
+  en  -387583.19550875766 1.2366923922138957E7
+  ll2 32.120525419700854 -82.34682505223232
 EPSG:102605
   ll  43.37948398818094 -113.92321394583989
-  en  2506220.0503602326 1353183.8881320339
-  ll2 43.37948398818094 -113.92321394583989
+  en  2282859.233865 1286085.8930022726
+  ll2 43.37829405790123 -113.922836634279
 EPSG:102629
   ll  -42.14185334127607 -81.40883857100559
-  en  1856228.2513868466 -2.6417595900844395E7
-  ll2 -42.14185334070912 -81.40883857078892
+  en  1815612.527314988 -2.6334365127496745E7
+  ll2 -42.13737670642801 -81.39798895429615
 EPSG:102630
   ll  22.224283719776338 -85.7455759972714
-  en  2561962.0591127863 -2822738.561764224
-  ll2 22.224283719775894 -85.74557599727103
+  en  1856268.6563662756 -2790725.2523979573
+  ll2 22.25167566747666 -85.74389162519473
 EPSG:102632
   ll  6.095369449121762 -142.9812009775053
-  en  1284092.7585329288 -1.7425390166701507E7
-  ll2 6.095369449121758 -142.981200977505
+  en  709734.736790784 -1.7857479901843667E7
+  ll2 6.115513072261219 -142.9964227787714
 EPSG:102633
   ll  28.354179096641047 -144.01300624401566
-  en  2279535.3599626953 -9338347.082139218
-  ll2 28.35417909663937 -144.01300624401156
+  en  1658931.0776998654 -9786809.054295963
+  ll2 28.355997090224182 -144.0146110950884
 EPSG:102634
   ll  -41.34345454356089 -150.76580740289822
-  en  1430149.4864875916 -3.465826041376043E7
-  ll2 -41.34345454356086 -150.76580740289825
+  en  1200778.1611109623 -3.51327410666479E7
+  ll2 -41.32628482095048 -150.8115100108002
 EPSG:102635
   ll  62.12811884082282 -155.89274819526557
-  en  1316467.2390424805 2974550.1198752597
-  ll2 62.128118840819354 -155.8927481952657
+  en  853190.1737191995 2494063.1211325056
+  ll2 62.105976752238426 -155.84121756539358
 EPSG:102636
   ll  4.859650111264983 -160.9282978283395
-  en  574406.6055467289 -1.7871690298194163E7
-  ll2 4.859650111262653 -160.92829782825473
+  en  16426.871549121533 -1.838300735764148E7
+  ll2 4.869177399757098 -160.93709845821382
 EPSG:102637
   ll  -58.912456013873154 -167.1077875353252
-  en  675507.6325070101 -4.110496820429909E7
-  ll2 -58.912456012359414 -167.1077875339163
+  en  538984.4817086409 -4.1644817703150414E7
+  ll2 -58.90010904933882 -167.17787413922068
 EPSG:102638
   ll  16.701658851457907 -169.565877723284
-  en  392126.68670905905 -1.356560913327453E7
-  ll2 16.701658851435123 -169.56587772323135
+  en  -165702.5292793057 -1.4090527649814442E7
+  ll2 16.697148505461882 -169.561459159066
 EPSG:102639
   ll  48.71471834244676 -175.50960266474917
-  en  310617.9120395904 -1880867.8064420682
-  ll2 48.71471833986992 -175.50960266356293
+  en  -118183.47658719412 -2392429.219541003
+  ll2 48.69520648333955 -175.46926741409143
 EPSG:102640
   ll  37.94626630478963 -92.16544408763697
-  en  2.2933034137957945E7 8145043.122086864
-  ll2 37.94626630478973 -92.16544408763697
+  en  2.2641022824352622E7 7418159.107644348
+  ll2 37.95561119518674 -92.16577544380186
 EPSG:102648
   ll  24.553311335732445 -113.31072992484745
-  en  -345290.9308559673 -2331666.246025301
-  ll2 24.55331133571368 -113.31072992488374
+  en  -1050429.850543948 -2530687.798650488
+  ll2 24.5742034909599 -113.31779887623593
 EPSG:102649
   ll  -9.51738498151434 -114.22565353984105
-  en  -131890.9716553448 -1.4710750534870088E7
-  ll2 -9.517384981513386 -114.22565353982235
+  en  -584428.930932441 -1.4936606049682215E7
+  ll2 -9.482902031216453 -114.24266941510103
 EPSG:102650
   ll  29.52826704089749 -109.38810120589598
-  en  2087866.4228080853 -509169.35175151285
-  ll2 29.528267040683144 -109.38810120550191
+  en  1371647.4266634188 -716043.756900072
+  ll2 29.545126135762985 -109.39296141159072
 EPSG:102661
   ll  -4.936367263670945 -149.94595142781378
-  en  3664475.496840069 -8633709.432730114
-  ll2 -4.93636726351697 -149.94595143104297
+  en  3141380.9908759654 -9099693.700026099
+  ll2 -4.9147623139364 -149.96546625124193
 EPSG:102662
   ll  59.060289029436234 -162.77360162612726
-  en  491931.10364842694 1.4160069167762563E7
-  ll2 59.06028902509316 -162.77360161877186
+  en  29265.112285962874 1.3682394251964577E7
+  ll2 59.03935251792493 -162.7236658800616
 EPSG:102664
   ll  12.267950015817675 -164.9487521799175
-  en  -307102.32572953176 -3453399.196860082
-  ll2 12.267950015536421 -164.948752178411
+  en  -879699.730271911 -3969012.4973182846
+  ll2 12.269552874278467 -164.95037394309767
 EPSG:102665
   ll  -8.631111023225046 -163.12362808187856
-  en  572166.9929625578 -1.0999334628580773E7
-  ll2 -8.631111023220935 -163.12362808180546
+  en  63069.29412357321 -1.1523404768832447E7
+  ll2 -8.615083679257042 -163.13984903638425
 EPSG:102688
   ll  48.338405178752254 -66.34005199564369
-  en  3.1217785399232518E7 1948144.1449705444
-  ll2 48.33840517875229 -66.34005199564369
+  en  3.0455822091530055E7 1969271.0961782562
+  ll2 48.3312221165944 -66.34314962223397
 EPSG:102689
   ll  -4.163535914246159 -31.63971436664218
-  en  4.450704126550948E7 -1.1053202024595063E7
-  ll2 -4.163535914246134 -31.63971436664218
+  en  4.3553449945591435E7 -1.097174217600177E7
+  ll2 -4.141406015817323 -31.620182659240502
 EPSG:102690
   ll  70.80849815487551 -111.7003011440221
-  en  9341603.776379313 1.183177405314516E7
-  ll2 70.8084981548755 -111.7003011440221
+  en  8546805.468943214 1.1843968234563943E7
+  ll2 70.77897953530439 -111.67300148659719
 EPSG:102696
   ll  -8.468650874699463 -94.2549111901395
-  en  -537154.4015475494 -1.6093158830616718E7
-  ll2 -8.468650874680923 -94.25491118986969
+  en  -995262.5206084226 -1.6137961700852359E7
+  ll2 -8.431643425937233 -94.25817799808861
 EPSG:102697
   ll  -18.964849360666875 -86.86577698785803
-  en  3589507.3892724956 -1.9927575650925204E7
-  ll2 -18.964849360188207 -86.86577698780631
+  en  3251276.0792348646 -1.9886998646269497E7
+  ll2 -18.934226572249166 -86.86295870306768
 EPSG:102698
   ll  72.95281517031788 -87.98932665115481
-  en  3486646.6788037964 1.3470277691417193E7
-  ll2 72.95281516837092 -87.98932666937561
+  en  2813002.6388218645 1.3415868819504699E7
+  ll2 72.92113427180745 -87.99235943920306
 EPSG:102700
   ll  50.72394848620715 -40.36962006192391
-  en  1.600575953431333E7 8992135.374607027
-  ll2 50.723948486207156 -40.36962006192391
+  en  1.529588856550034E7 8778138.887434462
+  ll2 50.70800665448154 -40.38621893885118
 EPSG:102701
   ll  21.21403167847671 -156.73311870175584
@@ -1075 +1075 @@
 EPSG:102705
   ll  40.68399989035333 -96.68317898122699
-  en  165394.2468626539 158121.6091064029
-  ll2 40.683999890353334 -96.68317898122699
+  en  -595542.2973852563 95052.14681824931
+  ll2 40.68947372036676 -96.68380754236202
 EPSG:102720
   ll  -3.286059114886246 -137.67239481213107
-  en  -1.6579571623602156E7 -1.6172120232632278E7
-  ll2 -3.286059114886203 -137.67239481213107
+  en  -1.7509073854877945E7 -1.6325327918748282E7
+  ll2 -3.258941528681771 -137.69315185675205
 EPSG:102721
   ll  19.330965961432625 -21.417912943935164
-  en  2.7346532222972058E7 4031329.3862948245
-  ll2 19.330965961432643 -21.417912943935164
+  en  2.6534640565621234E7 3795732.792443811
+  ll2 19.331447996492987 -21.41731614013546
 EPSG:102726
   ll  59.52619654695356 -129.89776322686384
-  en  6399109.727750382 5953367.623613542
-  ll2 59.526196546953535 -129.89776322686384
+  en  5709775.008047804 5670320.957085177
+  ll2 59.504960521385236 -129.87508332112716
 EPSG:102727
   ll  82.77605956462706 -118.15234219544013
-  en  5089179.39291466 1.6899086309983715E7
-  ll2 82.77605956462706 -118.15234219544013
+  en  4286493.453646549 1.646295581319843E7
+  ll2 82.74233324418825 -118.0267914105636
 EPSG:102733
   ll  45.78762174399489 0.8865475829342415
-  en  2.1217570514285456E7 1.3154361384447146E7
-  ll2 45.787621743994876 0.8865475829342415
+  en  2.055297728934212E7 1.3270578132914634E7
+  ll2 45.76822868939708 0.8467228973831255
 EPSG:102761
   ll  0.5380590000332575 -67.06283281037184
-  en  415310.8807299132 -5721024.387042763
-  ll2 0.5380590000332954 -67.06283281037184
+  en  -155023.94817915148 -5495799.3924534805
+  ll2 0.5736408634295509 -67.04917284608794
 EPSG:102799
   ll  50.3325179285198 -5.4483220261357905
-  en  16688.20574015405 224677.15164300444
-  ll2 50.33251792136355 -5.448322013447556
+  en  16622.7100619275 224744.31827503128
+  ll2 50.33251792836005 -5.448322026152741
 EPSG:102800
   ll  50.33868361384302 -5.419267357325847
-  en  9789.84112071534 225278.99434305605
-  ll2 50.33868360670039 -5.4192673446152195
+  en  9724.077972548024 225346.10413346055
+  ll2 50.33868361369115 -5.41926735734288
 EPSG:102801
   ll  50.37780779478753 -5.207330806372917
-  en  16054.207609732053 228966.73137237458
-  ll2 50.37780778773055 -5.207330793500562
+  en  16057.542271601968 228967.54682735197
+  ll2 50.37780779468419 -5.207330806388961
 EPSG:102802
   ll  50.31980768657761 -5.225980109925288
-  en  14449.440273569635 222583.80105580064
-  ll2 50.31980767947014 -5.225980097088413
+  en  14452.822817939683 222584.6668814465
+  ll2 50.31980768647066 -5.2259801099417516
 EPSG:102803
   ll  50.51023667081913 -5.160225088270365
-  en  11031.193040661776 243553.37051659677
-  ll2 50.51023666387874 -5.160225075313904
+  en  11034.376769558876 243554.04832507682
+  ll2 50.510236670724446 -5.160225088285429
 EPSG:102804
   ll  50.276499630704066 -4.943366374588619
-  en  16374.415691379982 216952.54387855777
-  ll2 50.276499623616225 -4.943366361574855
+  en  16377.705275874352 216953.7571805532
+  ll2 50.276499630642355 -4.943366374601707
 EPSG:102805
   ll  50.33937799470931 -4.929409106788824
-  en  17644.264953770762 223907.9652268447
-  ll2 50.339377987673274 -4.929409093740433
+  en  17647.450153078244 223909.11542116376
+  ll2 50.339377994649304 -4.929409106801552
 EPSG:102806
   ll  50.256401475017064 -4.788224507509349
-  en  17343.93548646185 214303.96418730315
-  ll2 50.25640146793562 -4.788224494398806
+  en  17347.040620286512 214305.32547918544
+  ll2 50.25640147497247 -4.788224507520176
 EPSG:102807
   ll  50.456857519755694 -4.843159580899311
-  en  14281.52498761611 236740.60674265804
-  ll2 50.45685751282542 -4.843159567745231
+  en  14284.494992865366 236741.5947140634
+  ll2 50.45685751970548 -4.843159580910543
 EPSG:102808
   ll  50.454190313320446 -4.638849933389208
-  en  18771.48556539844 235914.16644367017
-  ll2 50.454190306412066 -4.63884992009816
+  en  18774.259129621147 235915.34485957568
+  ll2 50.454190313288336 -4.638849933397642
 EPSG:102809
   ll  50.51481255046721 -4.624739366323391
-  en  20011.84446229384 242624.1584113889
-  ll2 50.5148125436085 -4.624739352998265
+  en  20014.526420421054 242625.21199328618
+  ll2 50.5148125504361 -4.624739366331564
 EPSG:102810
   ll  50.43646652859604 -4.502899681593006
-  en  18355.489914937498 233621.1052343684
-  ll2 50.43646652168644 -4.502899668218839
+  en  18358.10509124401 233622.37842737196
+  ll2 50.43646652857265 -4.5028996815997715
 EPSG:102811
   ll  50.26446349454684 -4.586512473547381
-  en  11753.599532746419 214707.48757465475
-  ll2 50.264463487494645 -4.586512460299323
+  en  11756.449166671722 214708.91649301164
+  ll2 50.2644634945184 -4.586512473555366
 EPSG:102812
   ll  50.4476560212478 -4.44757050631844
-  en  11325.653386533086 234745.7027982234
-  ll2 50.44765601435165 -4.4475704929032265
+  en  11328.175044306787 234746.9722768648
+  ll2 50.44765602122735 -4.447570506324565
 EPSG:102813
   ll  50.244124730521506 -4.306765111479372
-  en  20620.641307904792 211801.45803712602
-  ll2 50.244124723477555 -4.3067650980581655
+  en  20623.088140370557 211802.96162895396
+  ll2 50.244124730507195 -4.306765111484185
 EPSG:102814
   ll  50.74348288407695 -4.2243012595587786
-  en  16163.962128340907 267153.65895288513
-  ll2 50.74348287743172 -4.224301245874799
+  en  16165.879031453573 267154.4342538877
+  ll2 50.743482884065386 -4.224301259562595
 EPSG:102815
   ll  50.359438310385286 -4.239484715080827
-  en  13803.341787169484 224487.94031340862
-  ll2 50.35943830343525 -4.239484701567719
+  en  13805.56613790206 224489.41853500254
+  ll2 50.35943831037329 -4.239484715084961
 EPSG:102816
   ll  50.497071834226745 -4.0119873748173385
-  en  16399.206463754817 239336.8987087797
-  ll2 50.49707182739716 -4.011987361101275
+  en  16400.964746893616 239338.22367660434
+  ll2 50.49707183422042 -4.011987374819781
 EPSG:102817
   ll  50.27944098995152 -3.9681255731619967
-  en  18870.08825087195 215057.97609890153
-  ll2 50.27944098295592 -3.9681255595127647
+  en  18872.05110138745 215059.7010948296
+  ll2 50.27944098994599 -3.968125573164247
 EPSG:102818
   ll  50.576927524327026 -3.989863521592909
-  en  18207.611665273085 248187.2538655836
-  ll2 50.57692751756122 -3.9898635078286913
+  en  18209.295458012144 248188.35808179853
+  ll2 50.57692752432111 -3.9898635215952036
 EPSG:102819
   ll  50.64024628913671 -3.8056075758825028
-  en  16424.168744533134 254895.09750637808
-  ll2 50.64024628242884 -3.805607561975741
+  en  16425.468590965844 254896.0844843876
+  ll2 50.6402462891334 -3.805607575883922
 EPSG:102820
   ll  50.350669278532415 -3.779980814635566
-  en  17464.670267839596 222652.60325431178
-  ll2 50.35066927160077 -3.7799808008397884
+  en  17466.29378540443 222654.38490865374
+  ll2 50.350669278529374 -3.779980814636929
 EPSG:102821
   ll  50.766654558216246 -3.794085491471608
-  en  17580.730924200863 268947.19109465735
-  ll2 50.766654551608966 -3.794085477503062
+  en  17582.059024373608 268948.11906758155
+  ll2 50.76665455821306 -3.794085491472963
 EPSG:102822
   ll  50.689546104851956 -3.5800350137671004
-  en  16491.480876166737 260025.93774066085
-  ll2 50.689546098191336 -3.580034999700238
+  en  16492.576048365852 260027.16551194555
+  ll2 50.68954610485046 -3.5800350137678274
 EPSG:102823
   ll  50.84135152526739 -3.63505046357665
-  en  12978.213428181873 277001.5107818614
-  ll2 50.84135151872513 -3.6350504494770317
+  en  12979.416062053788 277002.42221266916
+  ll2 50.84135152526556 -3.6350504635774996
 EPSG:102824
   ll  51.13335795005362 -3.3244431480263334
-  en  18432.27231631559 309051.3762258919
-  ll2 51.133357943754476 -3.324443133608888
+  en  18433.11500427843 309051.7524571625
+  ll2 51.133357950053096 -3.3244431480266208
 EPSG:102825
   ll  50.91002640648978 -3.1847202938429677
-  en  27812.509781521992 284048.89824667596
-  ll2 50.91002640001523 -3.184720279440969
+  en  27813.252898106366 284049.70920908276
+  ll2 50.91002640648951 -3.184720293843135
 EPSG:102826
   ll  51.96918307364082 -3.069451625873041
-  en  14632.172237669874 401766.14354900294
-  ll2 51.969183068041545 -3.069451610937934
+  en  14632.60537948487 401765.4153590562
+  ll2 51.96918307364067 -3.069451625873131
 EPSG:102827
   ll  51.40903291319444 -2.9208788801557026
-  en  24056.805367626483 339313.9363557647
-  ll2 51.409032907127155 -2.9208788653739277
+  en  24057.174985283047 339314.16620332794
+  ll2 51.409032913194366 -2.9208788801557475
 EPSG:102828
   ll  51.81081408928388 -1.5098442064106479
-  en  87924.8791326948 383735.475816496
-  ll2 51.8108140835611 -1.5098441906589481
+  en  87923.7981455573 383734.7697955969
+  ll2 51.81081408928388 -1.509844206410646
 EPSG:102829
   ll  50.70429030862609 -2.3374245165314416
-  en  30281.698528716417 260573.62627808025
-  ll2 50.70429030201934 -2.3374245017513857
+  en  30281.466616474452 260574.69138701382
+  ll2 50.70429030862609 -2.337424516531442
 EPSG:102830
   ll  51.50443126003729 -1.207293105389948
-  en  31128.302297561007 349819.1367572479
-  ll2 51.50443125407681 -1.2072930896390894
+  en  31126.93008391218 349819.009276618
+  ll2 51.504431260037265 -1.207293105389927
 EPSG:102831
   ll  51.73027367749277 -1.406305801453167
-  en  17106.61782449941 374824.87279256695
-  ll2 51.7302736717067 -1.4063057856879815
+  en  17105.48929204245 374824.3543126998
+  ll2 51.73027367749277 -1.406305801453162
 EPSG:102832
   ll  51.46451826108911 -0.7224505680945288
-  en  30854.72943143807 345836.3121868377
-  ll2 51.46451825510901 -0.7224505521385084
+  en  30853.560014961622 345836.09776881884
+  ll2 51.464518261088685 -0.7224505680942945
 EPSG:102833
   ll  51.21608155740451 -0.5847911958268771
-  en  40954.35136202219 318383.3795246297
-  ll2 51.216081551241885 -0.5847911799426292
+  en  40952.88570419945 318383.7835960738
+  ll2 51.21608155740372 -0.5847911958264754
 EPSG:102834
   ll  51.665693038947886 -0.48300170607399506
-  en  17018.36860319467 368513.57091164915
-  ll2 51.66569303312635 -0.483001689905911
+  en  17016.89446859053 368513.0776806553
+  ll2 51.6656930389467 -0.4830017060734541
 EPSG:102835
   ll  51.78513592225532 -0.4248090452740523
-  en  20757.622114850135 381895.3376233909
-  ll2 51.78513591652653 -0.42480902901757833
+  en  20756.033763491287 381894.51383911254
+  ll2 51.785135922253836 -0.42480904527340974
 EPSG:102836
   ll  51.6247459982643 -0.19142331029289802
-  en  20295.4466646715 364400.45738025993
-  ll2 51.624745992416166 -0.1914232940217801
+  en  20293.698262748003 364400.08501923847
+  ll2 51.62474599826091 -0.19142331029160922
 EPSG:102837
   ll  51.88320866635656 -0.3556644291411773
-  en  8276.59319024028 392891.9282802632
-  ll2 51.883208660704476 -0.35566441280292954
+  en  8274.9464200777 392891.0453153364
+  ll2 51.88320866635463 -0.3556644291403917
 EPSG:102838
   ll  50.91696973197571 -0.08653425755008493
-  en  12604.02127163914 285848.11233737227
-  ll2 50.91696972561399 -0.08653424162844513
+  en  12602.1011543247 285848.6356622675
+  ll2 50.916969731970966 -0.08653425754824602
 EPSG:102839
   ll  51.39633660577374 0.15602285946314776
-  en  28093.411279781663 339638.22869462345
-  ll2 51.396336599760204 0.15602287574844773
+  en  28091.586240319273 339638.22084675136
+  ll2 51.39633660576405 0.1560228594662009
 EPSG:102840
   ll  51.76136253406086 0.3132127859954198
-  en  20739.919620969507 380536.07684910536
-  ll2 51.76136252831642 0.3132128025445098
+  en  20738.07941087635 380535.3215445396
+  ll2 51.76136253404607 0.3132127859993997
 EPSG:102841
   ll  51.3025816779902 0.16260154139611416
-  en  11854.540060302767 329203.7303632746
-  ll2 51.30258167190871 0.16260155763131579
+  en  11852.582196657633 329203.7870800234
+  ll2 51.30258167798033 0.16260154139924865
 EPSG:102842
   ll  51.87752545303829 0.4506150695527828
-  en  12785.086500764737 393743.90773420513
-  ll2 51.877525447377984 0.4506150862190251
+  en  12783.172166450007 393742.925161794
+  ll2 51.87752545301739 0.45061506955776953
 EPSG:102843
   ll  51.10733525652022 0.40914133464144486
-  en  12750.144967489701 308010.78042873763
-  ll2 51.10733525030132 0.40914135085661113
+  en  12748.144266608986 308010.96758118377
+  ll2 51.10733525650141 0.4091413346466732
 EPSG:102844
   ll  51.12383388216095 0.49303433696667043
-  en  9559.258496084076 310019.90647684515
-  ll2 51.123833875953196 0.4930343532213259
+  en  9557.17809383868 310020.02130195557
+  ll2 51.12383388213785 0.49303433697270477
 EPSG:102845
   ll  51.9073288130793 0.588009948517811
-  en  13123.077190663462 397378.2702586022
-  ll2 51.90732880743626 0.5880099652525717
+  en  13121.12185670127 397377.1257793663
+  ll2 51.907328813050334 0.5880099485239497
 EPSG:102846
   ll  51.52135794350929 0.7716943039311758
-  en  16385.817563186836 354899.8114842234
-  ll2 51.52135793757394 0.7716943205136728
+  en  16383.735491684929 354899.3057031752
+  ll2 51.521357943465645 0.7716943039395838
 EPSG:102847
   ll  50.88068310384791 0.694883612204638
-  en  13671.109000712342 283477.2558452962
-  ll2 50.88068309747002 0.6948836283852817
+  en  13668.949852612248 283477.5426762605
+  ll2 50.880683103811144 0.6948836122132175
 EPSG:102848
   ll  50.96298451042952 0.9274929003389261
-  en  19666.797391795495 293228.8690963742
-  ll2 50.9629845040965 0.9274929166441633
+  en  19664.220222532487 293228.81190150697
+  ll2 50.96298451036913 0.9274929003501321
 EPSG:102849
   ll  51.24507330436577 0.8896869441631072
-  en  15781.23239530847 324492.01066504186
-  ll2 51.24507329822797 0.8896869606242811
+  en  15779.118980905449 324491.7404608418
+  ll2 51.24507330430981 0.8896869441732503
 EPSG:102850
   ll  51.83272719733662 1.0110975188311242
-  en  11561.905555368052 390136.2421432284
-  ll2 51.83272719160615 1.0110975356740741
+  en  11559.870419574785 390134.98903920926
+  ll2 51.832727197264894 1.0110975188407498
 EPSG:102851
   ll  51.10284715282938 1.0998739826117878
-  en  21113.921377181687 309263.6915023011
-  ll2 51.10284714657535 1.0998739990545
+  en  21111.745221231016 309263.3234131101
+  ll2 51.102847152744246 1.0998739826242119
 EPSG:102852
   ll  51.97684648734741 1.1131231585181744
-  en  7904.214678758726 406432.80018672417
-  ll2 51.97684648170929 1.1131231754771167
+  en  7902.190764912113 406431.28968851606
+  ll2 51.9768464872598 1.113123158527642
 EPSG:102853
   ll  51.93683187799644 1.274510459654821
-  en  19184.266342132265 402481.7704365823
-  ll2 51.93683187230215 1.274510476641742
+  en  19182.24985652085 402480.16525017127
+  ll2 51.93683187787788 1.2745104596638375
 EPSG:102854
   ll  51.47657906251236 1.213067459556146
-  en  8217.224741968996 351104.34010762663
-  ll2 51.476579056500256 1.2130674762559805
+  en  8092.652124534536 351158.5823007472
+  ll2 51.47657906240698 1.2130674595674988
 EPSG:102855
   ll  51.16558757907934 1.4923845737673036
-  en  20251.554250831367 317412.13325690245
-  ll2 51.16558757279992 1.4923845903567092
+  en  20249.566341929312 317411.06997032085
+  ll2 51.165587578905445 1.4923845737777197
 EPSG:102856
   ll  52.47865811952386 -2.929818313793294
-  en  24955.50284868438 498336.82424223504
-  ll2 52.478658114366326 -2.9298182985571644
+  en  24955.261392186156 498335.14315829385
+  ll2 52.478658119523786 -2.9298183137933362
 EPSG:102857
   ll  53.833060706702845 -2.9979730067802906
-  en  22427.25766993851 649138.1111223431
-  ll2 53.83306070278282 -2.997972991059752
+  en  22426.861854210903 649136.4715526239
+  ll2 53.833060706702746 -2.997973006780342
 EPSG:102858
   ll  53.48162802423858 -2.9280785813589354
-  en  26519.007875639967 609977.6581624434
-  ll2 53.48162801998787 -2.9280785657228727
+  en  26518.91027767278 609975.8919648759
+  ll2 53.48162802423851 -2.928078581358973
 EPSG:102859
   ll  53.57467842578129 -1.8625380093926522
-  en  63225.865824396606 619938.6538526242
-  ll2 53.574678421576756 -1.8625379930453536
+  en  63225.82567113935 619936.9954524578
+  ll2 53.5746784257813 -1.8625380093926522
 EPSG:102860
   ll  53.766630464473266 -1.5847119538586272
-  en  81507.76202627874 641390.7915593322
-  ll2 53.766630460431294 -1.5847119372672376
+  en  81508.0147423151 641389.0365415497
+  ll2 53.766630464473266 -1.5847119538586265
 EPSG:102861
   ll  53.06106985650019 -2.392247699989534
-  en  27822.61899267043 562867.1310437283
-  ll2 53.06106985185003 -2.392247684176669
+  en  27822.634423975356 562865.3106972516
+  ll2 53.06106985650019 -2.3922476999895346
 EPSG:102862
   ll  52.507041895408044 -1.6492004742034434
-  en  77945.09070236995 501206.3674871215
-  ll2 52.50704189026155 -1.6492004581978918
+  en  77944.51904151656 501204.5255967847
+  ll2 52.50704189540804 -1.6492004742034432
 EPSG:102863
   ll  52.50791048902692 -1.026795832380662
-  en  42166.41400906059 501637.17431951454
-  ll2 52.507910483876394 -1.0267958160461526
+  en  42165.66965233867 501635.27641872026
+  ll2 52.50791048902683 -1.0267958323806083
 EPSG:102864
   ll  52.309458547232 -1.016485026868203
-  en  43167.858244123956 479576.5106578029
-  ll2 52.309458541917394 -1.0164850106241958
+  en  43166.86483797792 479574.7674838441
+  ll2 52.3094585472319 -1.016485026868145
 EPSG:102865
   ll  52.962980086501 -0.5978495533497636
-  en  36288.61468713514 552723.9959912644
-  ll2 52.96298008172612 -0.5978495365838378
+  en  36288.29303056064 552721.5342041646
+  ll2 52.962980086500245 -0.5978495533494477
 EPSG:102866
   ll  53.642393349759 -0.6625413377617
-  en  30527.95498292375 628260.81840842
-  ll2 53.64239334557008 -0.6625413207142969
+  en  30528.343703049395 628258.4707377766
+  ll2 53.64239334975843 -0.6625413377614692
 EPSG:102867
   ll  52.63457525245053 -0.5415263300826951
-  en  10803.270896413276 516230.5902415867
-  ll2 52.634575247400804 -0.5415263134482631
+  en  10802.536052030613 516228.547455142
+  ll2 52.63457525244959 -0.5415263300822963
 EPSG:102868
   ll  52.186071548602584 -0.01772209874599323
-  en  30620.64055714979 467159.58672981145
-  ll2 52.186071543187126 -0.017722082102939636
+  en  30618.809271175545 467158.1368332651
+  ll2 52.186071548596715 -0.01772209874413028
 EPSG:102869
   ll  52.39278824932805 0.04536006516682381
-  en  17279.361936899906 490247.33582534717
-  ll2 52.39278824407497 0.04536008194476242
+  en  17277.748029144 490245.45962108515
+  ll2 52.39278824932096 0.04536006516891901
 EPSG:102870
   ll  52.056074995689045 0.3038343517210558
-  en  19055.04411605603 453296.7011091473
-  ll2 52.056074990168 0.3038343684274733
+  en  19053.091102849256 453295.4013716434
+  ll2 52.0560749956746 0.3038343517247971
 EPSG:102871
   ll  52.188931980885805 0.448834479540614
-  en  11495.062642198958 468372.9269511897
-  ll2 52.18893197546246 0.448834496376353
+  en  11493.107262623555 468371.2323256841
+  ll2 52.18893198086499 0.4488344795453353
 EPSG:102872
   ll  52.24425396412188 0.6306653070020644
-  en  14698.75901280748 474940.6467611585
-  ll2 52.24425395873203 0.6306653239383068
+  en  14696.824708456988 474938.7867458366
+  ll2 52.24425396408991 0.6306653070081684
 EPSG:102873
   ll  52.40387042742864 0.7215367578024047
-  en  9233.366022616741 492895.3625660589
-  ll2 52.4038704221555 0.7215367748598662
+  en  9231.686187233427 492893.1680329559
+  ll2 52.40387042738946 0.7215367578089854
 EPSG:102874
   ll  52.17251422572299 0.9393123149436013
-  en  15088.605700093467 467728.35759223835
-  ll2 52.17251422025268 0.9393123319537208
+  en  15086.48311933616 467726.4894814991
+  ll2 52.17251422566088 0.9393123149519931
 EPSG:102875
   ll  52.73274910292386 1.0904623776908884
-  en  12755.148489089217 530420.643963062
-  ll2 52.73274909786292 1.0904623950611858
+  en  12753.767588483344 530417.7842406892
+  ll2 52.73274910284004 1.0904623776979196
 EPSG:102876
   ll  52.57687243705629 1.1998034378099414
-  en  10905.497247624648 513387.0852672942
-  ll2 52.576872431855364 1.1998034551328123
+  en  10904.100791461096 513384.3627916507
+  ll2 52.57687243695303 1.1998034378168714
 EPSG:102877
   ll  52.579933758795406 1.3870562764388368
-  en  14572.10950468303 514281.69401320536
-  ll2 52.57993375355596 1.3870562938225854
+  en  14570.555453704234 514278.8849421806
+  ll2 52.57993375865026 1.3870562764426584
 EPSG:102878
   ll  52.6444692813745 1.4483131394202278
-  en  9378.271020301414 521624.9705563567
-  ll2 52.64446927616826 1.4483131568576038
+  en  9376.838341664814 521622.0378851084
+  ll2 52.644469281212935 1.4483131394218278
 EPSG:102879
   ll  52.42768454157328 1.6123506231032163
-  en  12677.870868775353 498046.92776621174
-  ll2 52.42768453615275 1.6123506404633643
+  en  12676.112703090854 498044.1904764184
+  ll2 52.42768454135984 1.6123506230989064
 EPSG:102880
   ll  52.36944571247316 1.859962421030148
-  en  20847.519726171944 492418.2447459228
-  ll2 52.36944570690924 1.8599624384072153
+  en  20763.928031677526 492444.3995463953
+  ll2 52.369445740262606 1.8599623103887877
 EPSG:102881
   ll  54.54603373066612 -3.6625593628248847
-  en  20556.167671368967 744221.6463678901
-  ll2 54.54603372746185 -3.6625593473324907
+  en  20556.089187338497 744220.6816682365
+  ll2 54.5460337306641 -3.6625593628254705
 EPSG:102882
   ll  54.336340108087256 -3.380916260822547
-  en  21317.34484624739 720524.8237527941
-  ll2 54.33634010466496 -3.380916245193005
+  en  21317.42528293586 720523.8711576292
+  ll2 54.33634010808659 -3.380916260822792
 EPSG:102883
   ll  54.07189583106547 -3.4387715266626318
-  en  16955.425492408074 691187.0001424323
-  ll2 54.07189582739194 -3.438771511165084
+  en  16869.594188990668 691206.7932484276
+  ll2 54.0718958310646 -3.4387715266629435
 EPSG:102884
   ll  54.709997969757985 -3.1944164387032883
-  en  34154.718369776325 761929.649877739
-  ll2 54.70999796668631 -3.1944164228143257
+  en  34154.90784218267 761928.8333588353
+  ll2 54.709997969757715 -3.194416438703403
 EPSG:102885
   ll  54.037160327508374 -3.263159448179252
-  en  28382.49724464635 687135.9534740484
-  ll2 54.0371603237935 -3.2631594325690485
+  en  28382.150931533804 687134.9146762454
+  ll2 54.03716032750798 -3.263159448179416
 EPSG:102886
   ll  54.23250951729269 -2.921246285346073
-  en  28056.755862812468 708517.9550346944
-  ll2 54.232509513746756 -2.9212462694285275
+  en  28056.716909869727 708516.8797023727
+  ll2 54.232509517292634 -2.9212462853461063
 EPSG:102887
   ll  54.83417643920537 -3.024407115670464
-  en  22306.11632786083 775600.7528174457
-  ll2 54.83417643624319 -3.0244070996185366
+  en  22306.367851135874 775600.0073637564
+  ll2 54.83417643920525 -3.0244071156705163
 EPSG:102888
   ll  55.0305267388469 -2.8894444481398103
-  en  31256.891905137265 797359.9569207337
-  ll2 55.03052673606582 -2.8894444319271155
+  en  31257.09795140082 797359.3718459526
+  ll2 55.03052673884685 -2.8894444481398356
 EPSG:102889
   ll  54.75430216083617 -2.914984523116001
-  en  29222.573715475155 766650.3848278592
-  ll2 54.7543021577897 -2.914984507013227
+  en  29222.870368706062 766649.581766892
+  ll2 54.754302160836104 -2.9149845231160314
 EPSG:102890
   ll  54.41810153659692 -2.7969628461843317
-  en  36398.07987431678 729149.9422206756
-  ll2 54.418101533220884 -2.796962830115533
+  en  36398.25268967104 729148.9882213201
+  ll2 54.4181015365969 -2.796962846184347
 EPSG:102891
   ll  55.80457596519628 -2.3088675395133564
-  en  34751.634901095356 883216.5445349707
-  ll2 55.804575963119504 -2.308867522644488
+  en  34752.07610454634 883216.8936035434
+  ll2 55.80457596519627 -2.3088675395133564
 EPSG:102892
   ll  55.60912963253865 -2.3496309389435184
-  en  32086.39888193906 861489.199337961
-  ll2 55.6091296302763 -2.349630922164773
+  en  32086.77495253293 861489.3357533852
+  ll2 55.60912963253864 -2.349630938943519
 EPSG:102893
   ll  55.46129986349555 -2.2006151854947467
-  en  41431.55562569675 845013.648553994
-  ll2 55.46129986107834 -2.2006151686620212
+  en  41432.04257809339 845013.5449490619
+  ll2 55.46129986349554 -2.2006151854947467
 EPSG:102894
   ll  55.06783127656132 -2.529744251411253
-  en  20277.31868605272 801335.5459664086
-  ll2 55.067831273790695 -2.5297442349345856
+  en  20277.738683554926 801335.0317832811
+  ll2 55.067831276561314 -2.529744251411255
 EPSG:102895
   ll  54.996442079212805 -1.011776683490322
-  en  39334.60341395586 793621.3459319614
-  ll2 54.99644207626539 -1.0117766660727288
+  en  39228.50785785798 793629.6233691999
+  ll2 54.99644207921271 -1.011776683490279
 EPSG:102896
   ll  54.177833315753574 -1.412136448823649
-  en  14474.279291720468 702226.852188891
-  ll2 54.17783331207737 -1.4121364319626926
+  en  14474.779936479787 702225.3267262124
+  ll2 54.177833315753574 -1.4121364488236452
 EPSG:102897
   ll  54.004593011529316 -0.786606655019757
-  en  21633.88633597728 683411.8898497326
-  ll2 54.0045930076658 -0.7866066378788645
+  en  21634.522743111855 683409.8687619593
+  ll2 54.004593011528996 -0.7866066550196201
 EPSG:102898
   ll  54.35942585319454 -0.9115740503929217
-  en  12832.88658007751 722788.7337237797
-  ll2 54.35942584965669 -0.9115740331711741
+  en  12833.797105179721 722787.2121081225
+  ll2 54.35942585319437 -0.9115740503928456
 EPSG:102899
   ll  54.3036275027988 -0.3044827736090664
-  en  22432.114890930097 717301.2085489938
-  ll2 54.303627499175725 -0.3044827560855991
+  en  22433.19431034733 717299.3613774899
+  ll2 54.3036275027965 -0.3044827736083956
 EPSG:102900
   ll  54.222993827114145 -0.36967010723585636
-  en  18397.293039531854 708245.6054691486
-  ll2 54.222993823423266 -0.3696700897808583
+  en  18398.36544506345 708243.5739391358
+  ll2 54.222993827112326 -0.3696701072352929
 EPSG:102974
   ll  45.26034264738201 -87.16779963992064
@@ -3883 +3883 @@
 EPSG:104258
   ll  47.76156742427446 -9.619373402073204
-  en  -9.619373402073206 47.761567424274524
-  ll2 47.761567424274595 -9.619373402073208
+  en  -9.619373402073206 47.76156742427446
+  ll2 47.76156742427446 -9.619373402073206
 EPSG:104259
   ll  -15.915776078601471 -0.3465008180043583
@@ -4699 +4699 @@
 EPSG:2046
   ll  71.2215016445048 8.154621872671813
-  en  -245578.46297040972 7919172.453135018
-  ll2 71.22150164120224 8.154621900609051
+  en  -245578.46297041554 7919172.453134966
+  ll2 71.2215016412013 8.154621900609055
 EPSG:2047
   ll  -64.72294369591879 23.267125779936965
-  en  298334.7022610554 -7195224.087221241
-  ll2 -64.72294369216254 23.267125768862144
+  en  298334.70226105937 -7195224.087221198
+  ll2 -64.72294369216178 23.267125768862137
 EPSG:2048
   ll  50.903604038639145 11.027596300079997
-  en  -560429.1015794897 5671710.062430273
-  ll2 50.90360401567573 11.027596358246425
+  en  -560429.1015794907 5671710.062430261
+  ll2 50.90360401567553 11.027596358246432
 EPSG:2049
   ll  -51.300564671595765 27.46607154554075
-  en  450754.52947193035 -5705411.877411299
-  ll2 -51.30056466477215 27.46607153738255
+  en  450754.52947193116 -5705411.877411286
+  ll2 -51.300564664771926 27.466071537382543
 EPSG:20499
   ll  43.683766504381 52.120446713801066
@@ -4719 +4719 @@
 EPSG:2050
   ll  -19.454404804791636 22.19554176912138
-  en  -84472.62357006426 -2152165.887200093
-  ll2 -19.45440480479159 22.1955417691214
+  en  -84472.62357006424 -2152165.887200095
+  ll2 -19.45440480479163 22.195541769121398
 EPSG:2051
   ll  5.794099591114943 27.78912175650718
-  en  309028.315715376 641460.0466514268
-  ll2 5.794099591112938 27.789121756444207
+  en  309028.315715376 641460.046651426
+  ll2 5.794099591112924 27.789121756444214
 EPSG:2052
   ll  2.8005188723632557 25.188403506195407
-  en  -201460.39294390468 309823.472260436
+  en  -201460.39294390508 309823.472260436
   ll2 2.8005188723631855 25.18840350620263
 EPSG:2053
   ll  -80.79525405647907 36.69998984828272
-  en  137170.37973796317 -8983052.87474482
-  ll2 -80.79525405585034 36.699989757176624
+  en  137170.37973796861 -8983052.874744778
+  ll2 -80.79525405584961 36.699989757176624
 EPSG:20538
   ll  0.5135537806914812 39.548158413771915
@@ -4743 +4743 @@
 EPSG:2054
   ll  -42.30154932749861 26.34420119277835
-  en  -383950.14357446897 -4695643.140024151
-  ll2 -42.301549326724505 26.3442011925398
+  en  -383950.14357446873 -4695643.140024149
+  ll2 -42.30154932672446 26.344201192539803
 EPSG:2055
   ll  59.65082113842806 25.06098600890632
-  en  -446952.9495322506 6641957.799683639
-  ll2 59.650821118919104 25.060986091199002
+  en  -446952.94953225437 6641957.79968361
+  ll2 59.65082111891858 25.06098609119899
 EPSG:2056
   ll  3.512498244537653 71.1550276706904
@@ -4883 +4883 @@
 EPSG:2089
   ll  70.8985490828787 40.42119106736584
-  en  332907.41560555086 7872395.127719314
-  ll2 70.89854908255236 40.42119106810232
+  en  332907.4156055468 7872395.127719259
+  ll2 70.89854908255138 40.42119106810232
 EPSG:2090
   ll  28.396661645040112 57.02421802442275
-  en  1090732.9929220486 3155948.217407855
-  ll2 28.39666164367102 57.02421802665559
+  en  1090732.9929220467 3155948.2174079022
+  ll2 28.396661643671873 57.024218026655596
 EPSG:2093
   ll  29.24428306620075 110.44957916897627
@@ -5475 +5475 @@
 EPSG:22181
   ll  -40.3714515312531 -68.97435972056786
-  en  1756985.1070630406 5526794.014522409
-  ll2 -40.371451531199796 -68.97435972052313
+  en  1756985.107063042 5526794.014522411
+  ll2 -40.37145153119976 -68.97435972052313
 EPSG:22182
   ll  -36.007496584441604 -62.61822733645461
-  en  3075719.085443755 5996696.392904252
-  ll2 -36.007496580959256 -62.61822733500353
+  en  3075719.0854437547 5996696.392904252
+  ll2 -36.007496580959256 -62.618227335003546
 EPSG:22183
   ll  -2.849373506004426 -67.08308838212794
@@ -5487 +5487 @@
 EPSG:22184
   ll  -78.26201922491194 -62.01399652989265
-  en  4522400.4415764045 1310689.2320827772
-  ll2 -78.2620192249128 -62.013996529892694
+  en  4522400.441576406 1310689.2320828254
+  ll2 -78.26201922491194 -62.013996529892644
 EPSG:22185
   ll  -79.4825727450578 -55.45009976197324
-  en  5592662.041744593 1170981.4398659652
-  ll2 -79.48257274499348 -55.45009976274516
+  en  5592662.041744596 1170981.4398660117
+  ll2 -79.48257274499264 -55.450099762745154
 EPSG:22186
   ll  1.5499200723704263 -58.90264745244629
   en  6288236.09753939 1.0173442567609692E7
-  ll2 1.5499200723703725 -58.90264745243681
+  ll2 1.5499200723703728 -58.90264745243682
 EPSG:22187
   ll  -57.7318005704219 -56.389849767483845
-  en  7357644.018188183 3598042.904086068
-  ll2 -57.73180057040568 -56.389849767484876
+  en  7357644.018188183 3598042.9040860934
+  ll2 -57.73180057040522 -56.38984976748487
 EPSG:2219
   ll  -29.60443563616426 -71.57821511451661
@@ -6287 +6287 @@
 EPSG:23830
   ll  -60.965863141757 88.11293764769741
-  en  -145544.31293755682 -5277878.734141028
-  ll2 -60.96586313652661 88.11293765954402
+  en  -145544.31293756003 -5277878.734140995
+  ll2 -60.96586313652601 88.11293765954402
 EPSG:23831
   ll  -74.1305008932288 92.36598521685463
-  en  43428.419191329216 -6735818.971444969
-  ll2 -74.13050089282139 92.36598521902027
+  en  43428.419191324996 -6735818.971444916
+  ll2 -74.13050089282045 92.36598521902027
 EPSG:23832
   ll  -84.98190912174354 103.94752010004802
-  en  233657.69609377757 -7941554.534665605
-  ll2 -84.98190912174262 103.94752009998247
+  en  233657.6960937791 -7941554.534665579
+  ll2 -84.98190912174213 103.94752009998247
 EPSG:23833
   ll  8.203999848624619 104.53880434491424
-  en  314458.1623907535 2407270.701139569
-  ll2 8.203999848624752 104.5388043449139
+  en  314458.162390752 2407270.701139561
+  ll2 8.203999848624612 104.53880434491388
 EPSG:23834
   ll  74.0695939771586 97.7395332246742
-  en  -67582.24357463815 9741984.31221794
-  ll2 74.0695939694458 97.7395334979227
+  en  -67582.24357464578 9741984.312217887
+  ll2 74.06959396944487 97.73953349792268
 EPSG:23835
   ll  -89.45178829317967 107.66970628667012
-  en  198044.5253905648 -8439770.962351605
-  ll2 -89.4517882931721 107.6697062866703
+  en  198044.52539057838 -8439770.96235203
+  ll2 -89.45178829317969 107.66970628667029
 EPSG:23836
   ll  49.59305030694364 108.25123097417791
-  en  -107106.65664204449 7003712.3480205685
-  ll2 49.59305030638919 108.25123097420925
+  en  -107106.65664204495 7003712.34802056
+  ll2 49.593050306389024 108.25123097420925
 EPSG:23837
   ll  27.202264175298012 110.41150563676077
-  en  -304489.33084749716 4519999.551047776
-  ll2 27.20226417485173 110.41150563590386
+  en  -304489.33084749576 4519999.551047809
+  ll2 27.202264174852335 110.41150563590386
 EPSG:23838
   ll  -25.997214588932806 125.49195775108848
-  en  901043.3510391939 -1395049.6655132622
-  ll2 -25.997214586118616 125.49195775515923
+  en  901043.3510391925 -1395049.665513285
+  ll2 -25.99721458611903 125.49195775515923
 EPSG:23839
   ll  73.46145171829585 121.28605543351753
-  en  193200.21466692095 9654415.969132785
-  ll2 73.4614517182968 121.28605543351753
+  en  193200.21466692074 9654415.969132733
+  ll2 73.46145171829586 121.28605543351753
 EPSG:2384
   ll  60.00758717915562 110.67449361347896
@@ -6331 +6331 @@
 EPSG:23840
   ll  -60.28561651481987 127.38330687490905
-  en  359449.5234782468 -5188711.665091424
-  ll2 -60.28561651477338 127.38330687490406
+  en  359449.5234782482 -5188711.665091393
+  ll2 -60.28561651477282 127.38330687490406
 EPSG:23841
   ll  -13.751816634582838 124.88939761960387
-  en  -82392.86622608308 -22265.110005758703
+  en  -82392.86622608145 -22265.110005758936
   ll2 -13.751816634580114 124.889397619626
 EPSG:23842
   ll  36.91825125832975 139.17564964012755
-  en  973806.2227909719 5622375.401167309
-  ll2 36.918251236816495 139.17564961041123
+  en  973806.2227909695 5622375.401167308
+  ll2 36.91825123681648 139.1756496104112
 EPSG:23843
   ll  -76.97938369027464 127.94523980566629
-  en  60449.9285387306 -7053633.29058397
-  ll2 -76.97938368989608 127.9452398102293
+  en  60449.92853872577 -7053633.290583918
+  ll2 -76.97938368989516 127.94523981022931
 EPSG:23844
   ll  -71.74348756168993 144.9051784092153
-  en  493127.1482587708 -6483172.359034811
-  ll2 -71.74348755229043 144.9051782280139
+  en  493127.14825877827 -6483172.359034759
+  ll2 -71.74348755228948 144.9051782280139
 EPSG:23845
   ll  -45.38064732663123 138.49837076678378
-  en  121557.26169830226 -3527233.1510213083
-  ll2 -45.38064732663121 138.4983707667837
+  en  121557.26169829998 -3527233.1510213036
+  ll2 -45.380647326631134 138.49837076678367
 EPSG:23846
   ll  -9.602423912823724 83.98980814981387
@@ -6392 +6392 @@
   ll  -9.996802557510264 94.38792637019583
   en  652126.058918705 -1105378.870327627
-  ll2 -9.996802557510224 94.38792637019449
+  ll2 -9.996802557510222 94.38792637019449
 EPSG:23867
   ll  -6.128509517765622 99.03138353930579
-  en  503472.3766921898 -677410.4239096983
-  ll2 -6.12850951776564 99.03138353930579
+  en  503472.3766921898 -677410.4239096971
+  ll2 -6.128509517765622 99.03138353930579
 EPSG:23868
   ll  65.27914756782414 109.72198481467956
-  en  720184.3547698082 7247813.572290475
-  ll2 65.27914756714911 109.72198481381395
+  en  720184.3547698108 7247813.572290432
+  ll2 65.27914756714833 109.72198481381393
 EPSG:23869
   ll  -0.4521043343266058 102.89920867442146
-  en  -404425.716559147 -50478.20015504982
+  en  -404425.7165591484 -50478.200155049824
   ll2 -0.45210433412455747 102.89920871603424
 EPSG:2387
@@ -6411 +6411 @@
 EPSG:23870
   ll  -77.21969198728301 122.73058984391338
-  en  641299.7436311664 -8578186.77092324
-  ll2 -77.21969198685342 122.73058983785035
+  en  641299.7436311713 -8578186.770923192
+  ll2 -77.21969198685255 122.73058983785037
 EPSG:23871
   ll  78.27607445728682 123.52552687882638
-  en  511920.6650293174 8689233.473484652
-  ll2 78.27607445728768 123.52552687882638
+  en  511920.66502931784 8689233.473484604
+  ll2 78.27607445728682 123.52552687882638
 EPSG:23872
   ll  -52.1003711805071 127.10525358813489
-  en  370221.52569380717 -5773895.4199895235
-  ll2 -52.100371180502876 127.10525358813338
+  en  370221.52569380583 -5773895.41998951
+  ll2 -52.10037118050263 127.10525358813337
 EPSG:23877
   ll  63.573279497466075 106.59139105935844
-  en  876295.8118069076 1.707183434986811E7
-  ll2 63.57327948514298 106.59139099818563
+  en  876295.8118069121 1.7071834349868074E7
+  ll2 63.5732794851423 106.59139099818563
 EPSG:23878
   ll  38.1097442236881 111.93345236146229
-  en  1108185.0875077988 1.424076525834154E7
-  ll2 38.109744217189174 111.93345236044051
+  en  1108185.0875078002 1.424076525834154E7
+  ll2 38.109744217189174 111.93345236044054
 EPSG:23879
   ll  33.76050844471432 113.76264191207954
@@ -6439 +6439 @@
 EPSG:23880
   ll  -44.90011121085771 116.54618466976427
-  en  464170.31569171493 5028045.719216703
-  ll2 -44.900111210857794 116.54618466976429
+  en  464170.3156917138 5028045.719216708
+  ll2 -44.90011121085771 116.54618466976427
 EPSG:23881
   ll  -22.060532327272696 127.64803452260927
-  en  979950.6606828248 7553150.105765432
-  ll2 -22.060532327102646 127.64803452285241
+  en  979950.6606828247 7553150.1057654265
+  ll2 -22.060532327102745 127.64803452285241
 EPSG:23882
   ll  53.683631238867434 127.89063592163133
-  en  426732.8068223514 1.5948894811520675E7
-  ll2 53.68363123886755 127.89063592163126
+  en  426732.80682235025 1.5948894811520658E7
+  ll2 53.68363123886725 127.89063592163124
 EPSG:23883
   ll  -50.19362885016279 135.8207372874896
-  en  558582.9053160602 4439518.052915527
-  ll2 -50.19362885016293 135.82073728748964
+  en  558582.9053160603 4439518.052915537
+  ll2 -50.19362885016275 135.82073728748964
 EPSG:23884
   ll  -79.73373772056406 134.81338181637747
-  en  377132.9629337732 1141598.930292191
-  ll2 -79.73373772022055 134.81338182880143
+  en  377132.9629337685 1141598.9302922338
+  ll2 -79.73373772021975 134.81338182880143
 EPSG:23887
   ll  6.443297467447536 104.1913593235159
@@ -10475 +10475 @@
 EPSG:3036
   ll  41.91433993365871 33.792320014545986
-  en  565706.2186935929 1.4640569056416098E7
-  ll2 41.91433993365874 33.79232001454603
+  en  565706.2186935929 1.4640569056416096E7
+  ll2 41.914339933658695 33.79232001454603
 EPSG:3037
   ll  -66.07884568528519 35.14244280910481
-  en  325547.9568416369 2665930.6125213522
-  ll2 -66.07884568509589 35.14244280924584
+  en  325547.95684163406 2665930.612521398
+  ll2 -66.07884568509508 35.142442809245836
 EPSG:3040
   ll  34.114501979506784 -8.463671401911679
@@ -10587 +10587 @@
 EPSG:3064
   ll  61.837458715705935 10.021969384135332
-  en  553811.3518356715 6856496.2122603385
-  ll2 61.83745871570649 10.021969384135351
+  en  553811.3518356719 6856496.212260303
+  ll2 61.83745871570585 10.02196938413535
 EPSG:3065
   ll  59.84462866445179 13.601062228461913
-  en  421608.7625257697 6634935.594096522
-  ll2 59.84462866445168 13.601062228461801
+  en  421608.76252576907 6634935.594096492
+  ll2 59.844628664451164 13.601062228461801
 EPSG:3066
   ll  78.7585993856645 27.27174709206205
@@ -14119 +14119 @@
 EPSG:3449
   ll  -49.38159424967611 -72.90809076552473
-  en  1087026.6551094363 -5501439.992075356
-  ll2 -49.38159422507521 -72.90809082628938
+  en  1087026.6551094372 -5501439.992075347
+  ll2 -49.38159422507505 -72.90809082628937
 EPSG:3450
   ll  -89.6502018233969 -82.68336134769663
-  en  494778.47809590795 -9959260.84770352
-  ll2 -89.6502018234097 -82.6833612548353
+  en  494778.4780959442 -9959260.84770379
+  ll2 -89.65020182341459 -82.68336125483577
 EPSG:3451
   ll  -23.532726944184876 -12.15976750692596
@@ -15479 +15479 @@
 EPSG:3770
   ll  -75.23952199395359 -71.15885081687225
-  en  367992.4626319341 -1.1805380325080482E7
-  ll2 -75.2395219927417 -71.15885080058071
+  en  367992.46263192873 -1.180538032508043E7
+  ll2 -75.23952199274078 -71.1588508005807
 EPSG:3775
   ll  40.82851735775199 -107.64190575657177
@@ -15507 +15507 @@
 EPSG:3783
   ll  86.09534183120127 -125.23695054055392
-  en  51241.86280222836 1.2356567191537503E7
-  ll2 86.09534183119783 -125.2369505420576
+  en  51241.86280223004 1.2356567191537485E7
+  ll2 86.09534183119749 -125.23695054205758
 EPSG:3784
   ll  58.41793124961657 -126.92594811974351
@@ -16243 +16243 @@
 EPSG:4130
   ll  66.79747353183984 -61.98796529443487
-  en  -61.987965294434865 66.79747353184027
-  ll2 66.79747353184068 -61.987965294434865
+  en  -61.987965294434865 66.79747353183984
+  ll2 66.79747353183984 -61.987965294434865
 EPSG:4131
   ll  -60.70894450638639 -20.23899843416416
@@ -16315 +16315 @@
 EPSG:4148
   ll  70.07944198628243 40.98798679715384
-  en  40.98798679715384 70.0794419862829
-  ll2 70.07944198628336 40.98798679715384
+  en  40.98798679715384 70.07944198628243
+  ll2 70.07944198628243 40.98798679715384
 EPSG:4149
   ll  79.54974239412778 76.62131933244655
@@ -16375 +16375 @@
 EPSG:4163
   ll  -39.451518790330155 -74.04583396375052
-  en  -74.04583396375052 -39.45151879033018
-  ll2 -39.45151879033019 -74.04583396375052
+  en  -74.04583396375052 -39.451518790330155
+  ll2 -39.451518790330155 -74.04583396375052
 EPSG:4164
   ll  -79.36441273089866 -10.175009280576461
@@ -16387 +16387 @@
 EPSG:4166
   ll  62.91941964897515 -138.84154991307048
-  en  -138.84154991307048 62.919419648975506
-  ll2 62.91941964897585 -138.84154991307048
+  en  -138.84154991307048 62.91941964897516
+  ll2 62.91941964897516 -138.84154991307048
 EPSG:4167
   ll  -46.09881237579186 69.72608178471589
@@ -17683 +17683 @@
 EPSG:4640
   ll  71.99002840370818 139.6170138900817
-  en  139.6170138900817 71.99002840370865
-  ll2 71.99002840370912 139.6170138900817
+  en  139.6170138900817 71.99002840370818
+  ll2 71.99002840370818 139.6170138900817
 EPSG:4641
   ll  47.81643540559125 35.49257057923057
@@ -17775 +17775 @@
 EPSG:4667
   ll  -18.61218869191113 14.109155596517212
-  en  14.109155596517216 -18.61218869191112
-  ll2 -18.612188691911108 14.109155596517217
+  en  14.109155596517212 -18.61218869191113
+  ll2 -18.61218869191113 14.109155596517212
 EPSG:4668
   ll  -0.2575842428449846 -171.99190036519758
@@ -17787 +17787 @@
 EPSG:4670
   ll  74.70148199798555 -136.1264363794791
-  en  -136.1264363794791 74.70148199798602
-  ll2 74.70148199798649 -136.1264363794791
+  en  -136.1264363794791 74.70148199798555
+  ll2 74.70148199798555 -136.1264363794791
 EPSG:4671
   ll  1.710002127727222 93.20771507217523
@@ -17883 +17883 @@
 EPSG:4694
   ll  10.017634575357135 -120.45293638122666
-  en  -120.45293638122668 10.017634575357134
-  ll2 10.017634575357132 -120.45293638122668
+  en  -120.45293638122668 10.017634575357135
+  ll2 10.017634575357135 -120.45293638122668
 EPSG:4695
   ll  -74.10133080758368 -81.35308072326242
@@ -18127 +18127 @@
 EPSG:4755
   ll  -44.01845301265966 92.12261890649751
-  en  92.12261890649751 -44.0184530126597
-  ll2 -44.018453012659734 92.12261890649751
+  en  92.12261890649751 -44.01845301265966
+  ll2 -44.01845301265966 92.12261890649751
 EPSG:4756
   ll  -82.46387111180664 -79.9893200199258
@@ -18139 +18139 @@
 EPSG:4758
   ll  -45.51562768191982 15.6381536144672
-  en  15.638153614467198 -45.51562768191986
-  ll2 -45.5156276819199 15.638153614467194
+  en  15.6381536144672 -45.515627681919824
+  ll2 -45.515627681919824 15.638153614467202
 EPSG:4759
   ll  -74.03190409160084 -7.146029999549739
@@ -18155 +18155 @@
 EPSG:4762
   ll  23.165342385929947 114.57708259830684
-  en  114.57708259830686 23.16534238592987
-  ll2 23.16534238592979 114.57708259830687
+  en  114.57708259830686 23.165342385929947
+  ll2 23.165342385929947 114.57708259830686
 EPSG:4763
   ll  -0.2594246783853009 -113.38291420160589
-  en  -113.38291420160589 -0.25942467838530087
-  ll2 -0.2594246783853008 -113.38291420160589
+  en  -113.38291420160589 -0.2594246783853009
+  ll2 -0.2594246783853009 -113.38291420160589
 EPSG:4764
   ll  -5.211949202191278 -99.36210893074437
@@ -18971 +18971 @@
 EPSG:5365
   ll  79.56137632671894 62.07245410548765
-  en  62.07245410548765 79.56137632671934
-  ll2 79.56137632671975 62.072454105487644
+  en  62.07245410548765 79.56137632671894
+  ll2 79.56137632671894 62.07245410548765
 EPSG:5367
   ll  -50.01577478383219 -90.51606743413544
-  en  33201.49035636074 -5562426.066930041
-  ll2 -50.01577477676274 -90.51606742622049
+  en  33201.49035635975 -5562426.0669300305
+  ll2 -50.015774776762555 -90.51606742622049
 EPSG:5371
   ll  34.34232118777322 17.399958201671012
@@ -18991 +18991 @@
 EPSG:5382
   ll  55.15847159901966 -51.22486855196062
-  en  867752.3877568898 1.6127658943624686E7
-  ll2 55.158471595582824 -51.22486855558038
+  en  867752.3877568918 1.6127658943624668E7
+  ll2 55.15847159558247 -51.22486855558037
 EPSG:5383
   ll  55.965475530331474 -41.25535855365909
-  en  1107187.8672131617 1.6245195103993276E7
-  ll2 55.96547546309694 -41.2553590256545
+  en  1107187.8672131645 1.6245195103993258E7
+  ll2 55.96547546309659 -41.25535902565449
 EPSG:5387
   ll  -13.50748738737002 -78.94673582411342
@@ -19247 +19247 @@
 EPSG:5629
   ll  41.5623572825109 39.069716227755755
-  en  5410.906453705102 1.4618200628106236E7
-  ll2 41.56235727936262 39.06971622795616
+  en  5410.906453704345 1.4618200628106235E7
+  ll2 41.56235727936259 39.06971622795615
 EPSG:5631
   ll  46.76000720794471 13.88906544930015
@@ -19467 +19467 @@
 EPSG:5836
   ll  -42.16210793601977 32.47447537777537
-  en  -39170.118393348064 -4688431.486667711
-  ll2 -42.162107930331935 32.47447538013121
+  en  -39170.1183933483 -4688431.4866677085
+  ll2 -42.16210793033188 32.47447538013121
 EPSG:5837
   ll  -57.68542305930945 64.12100023631032
-  en  924131.5220752668 -6416008.075552026
-  ll2 -57.68542304815098 64.12100020784182
+  en  924131.5220752696 -6416008.075552001
+  ll2 -57.68542304815054 64.12100020784182
 EPSG:5839
   ll  81.7155938648105 -85.8536349275606

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

@@ -454 +454 @@
      */
     public Datum parseDatum(Map<String, String> parameters, Ellipsoid ellps) throws ProjectionConfigurationException {
+        Datum result = null;
         String datumId = parameters.get(Param.datum.key);
         if (datumId != null) {
-            return Optional.ofNullable(Projections.getDatum(datumId)).orElseThrow(
+            result = Optional.ofNullable(Projections.getDatum(datumId)).orElseThrow(
                     () -> new ProjectionConfigurationException(tr("Unknown datum identifier: ''{0}''", datumId)));
         }
         if (ellps == null) {
-            if (parameters.containsKey(Param.no_defs.key))
+            if (result == null && parameters.containsKey(Param.no_defs.key))
                 throw new ProjectionConfigurationException(tr("Ellipsoid required (+ellps=* or +a=*, +b=*)"));
             // nothing specified, use WGS84 as default
-            ellps = Ellipsoid.WGS84;
+            ellps = result != null ? result.getEllipsoid() : Ellipsoid.WGS84;
         }
 
@@ -479 +480 @@
 
         String towgs84 = parameters.get(Param.towgs84.key);
-        if (towgs84 != null)
-            return parseToWGS84(towgs84, ellps);
-
-        return new NullDatum(null, ellps);
+        if (towgs84 != null) {
+            Datum towgs84Datum = parseToWGS84(towgs84, ellps);
+            if (result == null || towgs84Datum instanceof ThreeParameterDatum || towgs84Datum instanceof SevenParameterDatum) {
+                // +datum has priority over +towgs84=0,0,0[,0,0,0,0]
+                return towgs84Datum;
+            }
+        }
+
+        return result != null ? result : new NullDatum(null, ellps);
     }
 
@@ -513 +519 @@
         }
         if (isCentric)
-            return new CentricDatum(null, null, ellps);
+            return Ellipsoid.WGS84.equals(ellps) ? WGS84Datum.INSTANCE : new CentricDatum(null, null, ellps);
         boolean is3Param = true;
         for (int i = 3; i < towgs84Param.size(); i++) {