Changeset 5067 in josm

Timestamp:

Mar 10, 2012 6:51:51 PM (15 months ago)

Author:

bastiK

Message:

extend options for ellipsoid, use formal definition instead of computed values

Location:

trunk

Files:

• data_nodist/projection-regression-test-data.csv (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/Ellipsoid.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/projection/Lambert.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java (modified) (1 diff)

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

@@ -11 +11 @@
 EPSG:32601
   ll  35.30468974675124 -181.75048187801644
-  en  67958.20646028483 3917197.8124123747
-  ll2 35.30468974645248 -181.75048187860767
+  en  67958.20646119962 3917197.8124532704
+  ll2 35.304689746452496 -181.75048187860767
 EPSG:32701
   ll  -29.00158099669585 -176.06257492764095
-  en  591305.9239694625 6791477.063038608
-  ll2 -29.001580996697747 -176.06257492764087
+  en  591305.9239693269 6791477.063002806
+  ll2 -29.00158099669775 -176.06257492764087
 EPSG:325801
   ll  34.015203682036415 -174.10932266644403
-  en  3766942.9163548043 3767610.66893566
-  ll2 34.015203682024556 -174.10932266640262
+  en  3766942.916354276 3767610.668975631
+  ll2 34.01520368202457 -174.10932266640262
 EPSG:325901
   ll  -42.67913028411371 -177.38213711327558
-  en  3468691.0300336885 5274745.459843643
-  ll2 -42.679130284111906 -177.38213711327558
+  en  3468691.03003378 5274745.459798486
+  ll2 -42.67913028411191 -177.38213711327558
 EPSG:32602
   ll  -0.35895685791257925 -175.75420623162898
-  en  -29625.97257011442 -39813.425706076945
+  en  -29625.972570106504 -39813.425706580696
   ll2 -0.3589568579093727 -175.75420623022703
 EPSG:32702
   ll  -83.61115414945169 -167.84722307361665
-  en  539148.6502874332 714244.7352187969
-  ll2 -83.61115414944909 -167.8472230736466
+  en  539148.6502871878 714244.7351826783
+  ll2 -83.61115414944906 -167.84722307364663
 EPSG:325802
   ll  2.6279660285514383 -169.71220572390703
-  en  3643161.6457097325 290545.0278497511
-  ll2 2.6279660285505932 -169.7122057239083
+  en  3643161.6457097307 290545.0278534355
+  ll2 2.6279660285505946 -169.7122057239083
 EPSG:325902
   ll  -28.96646509876222 -171.82985672429754
-  en  3419144.4239389747 6795446.163515689
+  en  3419144.4239390944 6795446.163479919
   ll2 -28.96646509876412 -171.8298567242976
 EPSG:32603
   ll  69.06942592353653 -164.25619547568132
-  en  529653.4230753322 7662283.255479894
+  en  529653.4230751682 7662283.255524441
   ll2 69.06942592353752 -164.2561954756813
 EPSG:32703
   ll  -59.67977504854512 -165.75611289241155
-  en  457419.4744480357 3384008.1252907095
-  ll2 -59.67977504854674 -165.75611289241158
+  en  457419.4744482368 3384008.125243295
+  ll2 -59.679775048546745 -165.75611289241158
 EPSG:325803
   ll  28.858993819881626 -162.7838300413958
-  en  3716176.100796021 3194382.029209105
+  en  3716176.1007957025 3194382.0292447736
   ll2 28.858993819882425 -162.7838300413879
 EPSG:325903
   ll  -35.88579209756221 -163.3314276698056
-  en  3650607.7094862293 6027433.062837357
-  ll2 -35.88579209756187 -163.33142766980347
+  en  3650607.709485902 6027433.062796038
+  ll2 -35.88579209756188 -163.33142766980347
 EPSG:32604
   ll  68.49291330851102 -162.96491579603722
-  en  337874.4125182986 7603043.066265858
-  ll2 68.49291330842264 -162.96491579584514
+  en  337874.4125191887 7603043.066310625
+  ll2 68.49291330842263 -162.96491579584514
 EPSG:32704
   ll  -44.74896637041389 -154.13571225132324
-  en  885055.000038078 5033414.625353734
-  ll2 -44.74896636985851 -154.13571225126154
+  en  885055.0000368692 5033414.625307778
+  ll2 -44.74896636985852 -154.13571225126154
 EPSG:325804
   ll  19.1602869192667 -157.27161512731934
-  en  3681759.20716759 2119462.9770141984
+  en  3681759.207167466 2119462.977039635
   ll2 19.160286919267307 -157.27161512732005
 EPSG:325904
   ll  -5.554243793843327 -162.73688821077442
-  en  3085827.03199087 9384761.239816586
-  ll2 -5.554243793834856 -162.73688821046227
+  en  3085827.031990898 9384761.239808826
+  ll2 -5.554243793834865 -162.73688821046227
 EPSG:32605
   ll  70.45567827510386 -154.8711613318192
-  en  430146.78517359484 7817765.523527973
+  en  430146.78517398844 7817765.523571888
   ll2 70.45567827510362 -154.87116133181905
 EPSG:32705
   ll  -4.570782032538887 -155.6804518141318
-  en  202567.24068291904 9494225.759798292
-  ll2 -4.570782032537406 -155.68045181407837
+  en  202567.2406829322 9494225.759791898
+  ll2 -4.570782032537404 -155.68045181407837
 EPSG:325805
   ll  47.558680099626386 -152.91349009536611
-  en  3506508.094253608 5267254.870637617
+  en  3506508.0942535857 5267254.870684492
   ll2 47.55868009962459 -152.91349009536611
 EPSG:325905
   ll  -67.03448585424093 -149.10915557769007
-  en  3669319.349910259 2559479.4429043625
-  ll2 -67.03448585415079 -149.10915557784642
+  en  3669319.3499093484 2559479.4428590117
+  ll2 -67.03448585415077 -149.10915557784642
 EPSG:32606
   ll  45.0472445968384 -147.48643385071935
-  en  461693.0916964589 4988313.77679554
-  ll2 45.04724459683641 -147.48643385071935
+  en  461693.09169658035 4988313.77684164
+  ll2 45.0472445968364 -147.48643385071935
 EPSG:32706
   ll  -55.61672629832347 -144.3508810047789
-  en  666829.6103011427 3833392.5734166233
-  ll2 -55.61672629830788 -144.35088100477645
+  en  666829.6103004229 3833392.5733688306
+  ll2 -55.616726298307896 -144.35088100477645
 EPSG:325806
   ll  23.646357967189935 -146.93885809543016
-  en  3506235.685318123 2615075.677869612
+  en  3506235.685318117 2615075.6779000983
   ll2 23.646357967191562 -146.93885809543016
 EPSG:325906
   ll  -23.95563872144256 -148.58426057256983
-  en  3338794.1024047756 7349779.778267931
-  ll2 -23.955638721444366 -148.58426057257037
+  en  3338794.1024049437 7349779.778237117
+  ll2 -23.95563872144436 -148.58426057257037
 EPSG:32607
   ll  17.160888392541953 -136.88735017825638
-  en  937701.0944180684 1901994.1782222379
-  ll2 17.1608883925055 -136.88735017834057
+  en  937701.094417824 1901994.1782452706
+  ll2 17.160888392505495 -136.88735017834057
 EPSG:32707
   ll  -0.22277876804946573 -136.6505910806773
-  en  984445.3083007087 9975304.65194674
-  ll2 -0.22277876804841545 -136.65059108151155
+  en  984445.3083007026 9975304.651946427
+  ll2 -0.22277876804841795 -136.65059108151155
 EPSG:325807
   ll  25.601252661823878 -143.02480961724422
-  en  3296655.8731584093 2833079.3110261187
-  ll2 25.601252661825622 -143.02480961724746
+  en  3296655.8731586495 2833079.3110586395
+  ll2 25.601252661825626 -143.02480961724746
 EPSG:325907
   ll  -59.282020025193475 -144.22706620376516
-  en  3316162.4281922677 3424091.668132633
-  ll2 -59.28202002514725 -144.22706620374979
+  en  3316162.4281931287 3424091.6680851756
+  ll2 -59.282020025147276 -144.22706620374979
 EPSG:32608
   ll  17.082700048931713 -138.83952009347482
-  en  91233.83062235266 1892731.3619717807
+  en  91233.83062257856 1892731.3619947187
   ll2 17.082700048910112 -138.8395200934112
 EPSG:32708
   ll  -2.768962687806777 -135.91033889187207
-  en  398815.28724407416 9693905.200381283
-  ll2 -2.768962687805869 -135.91033889187185
+  en  398815.28724407573 9693905.200377401
+  ll2 -2.7689626878058715 -135.91033889187185
 EPSG:325808
   ll  55.46393358936174 -136.5310213256191
-  en  3403200.1922508716 6147484.959289448
-  ll2 55.463933589361616 -136.53102132561946
+  en  3403200.192251288 6147484.959337253
+  ll2 55.46393358936161 -136.53102132561946
 EPSG:325908
   ll  -24.378151080790772 -130.28090785994982
-  en  3978930.3653087756 7295752.519636724
-  ll2 -24.37815108065391 -130.280907859527
+  en  3978930.365308256 7295752.519605472
+  ll2 -24.37815108065391 -130.28090785952696
 EPSG:32609
   ll  32.88791124498886 -124.7743273825516
-  en  895391.2108993782 3646786.7629169645
-  ll2 32.887911244866466 -124.7743273822095
+  en  895391.2108986392 3646786.76295606
+  ll2 32.88791124486647 -124.7743273822095
 EPSG:32709
   ll  -32.79190171964473 -131.727811570545
-  en  244542.49842545122 6368487.503829207
+  en  244542.4984259253 6368487.503790178
   ll2 -32.79190171963808 -131.7278115705747
 EPSG:325809
   ll  66.39751696914044 -132.53678032719117
-  en  3342048.4023815417 7368688.671628759
-  ll2 66.3975169690873 -132.53678032712693
+  en  3342048.402382383 7368688.671674355
+  ll2 66.39751696908732 -132.53678032712693
 EPSG:325909
   ll  -57.01846507460095 -131.70959025726978
-  en  3335504.6392919775 3677294.885881518
-  ll2 -57.018465074583986 -131.70959025727063
+  en  3335504.639292711 3677294.8858338
+  ll2 -57.01846507458397 -131.70959025727063
 EPSG:32610
   ll  15.621043862710906 -127.89205445312605
-  en  -24932.886805517366 1733063.1625654523
-  ll2 15.621043862587436 -127.89205445274152
+  en  -24932.886805270216 1733063.1625865793
+  ll2 15.621043862587435 -127.89205445274152
 EPSG:32710
   ll  1.5712020890239131 -124.21146729170505
-  en  365234.2722858847 1.0173704546353409E7
-  ll2 1.5712020890233913 -124.21146729170411
+  en  365234.27228588547 1.0173704546355614E7
+  ll2 1.5712020890234017 -124.21146729170411
 EPSG:325810
   ll  54.157170253882065 -120.70356806888559
-  en  3649949.876263723 6003445.228041808
-  ll2 54.15717025387514 -120.70356806888299
+  en  3649949.876263099 6003445.228089606
+  ll2 54.15717025387513 -120.70356806888299
 EPSG:325910
   ll  -30.490160906382584 -127.43018201881836
-  en  3074627.604332676 6618544.243659688
-  ll2 -30.490160906245404 -127.43018201925888
+  en  3074627.604333371 6618544.243622576
+  ll2 -30.49016090624539 -127.43018201925888
 EPSG:32611
   ll  10.73641510533119 -112.16478744764923
-  en  1029269.7699250624 1191002.7126841017
-  ll2 10.73641510524071 -112.16478744856084
+  en  1029269.769924939 1191002.712698909
+  ll2 10.736415105240711 -112.16478744856084
 EPSG:32711
   ll  -41.091261924884776 -120.17689123197003
-  en  233168.61639770068 5446247.135382872
-  ll2 -41.091261924846464 -120.17689123202507
+  en  233168.61639843025 5446247.135338474
+  ll2 -41.091261924846485 -120.17689123202507
 EPSG:325811
   ll  27.495781449917963 -118.48664637570047
-  en  3353144.933334178 3042229.2738940394
+  en  3353144.9333343757 3042229.273928431
   ll2 27.49578144991998 -118.48664637570127
 EPSG:325911
   ll  -83.43763157076992 -113.13504259887196
-  en  3549277.517097334 733034.8190821595
-  ll2 -83.43763157076518 -113.1350425990554
+  en  3549277.517097025 733034.8190459218
+  ll2 -83.4376315707652 -113.13504259905538
 EPSG:32612
   ll  61.77560053459669 -114.5125390548194
-  en  314735.1980792148 6854188.165833773
-  ll2 61.77560053452745 -114.51253905477127
+  en  314735.1980801266 6854188.165880746
+  ll2 61.775600534527385 -114.51253905477125
 EPSG:32712
   ll  -79.76744100986106 -115.94410343190378
-  en  402063.9138519092 1140210.1030740347
+  en  402063.9138525112 1140210.103035383
   ll2 -79.76744100981378 -115.94410343026465
 EPSG:325812
   ll  54.732336878937645 -111.71907573020027
-  en  3453696.485042087 6065244.033290725
+  en  3453696.4850422824 6065244.03333854
   ll2 54.73233687893784 -111.71907573020029
 EPSG:325912
   ll  -47.5968969661014 -107.10151995235918
-  en  3793046.94167908 4721134.191607426
-  ll2 -47.596896965940005 -107.10151995231443
+  en  3793046.941678068 4721134.191560568
+  ll2 -47.59689696593998 -107.10151995231445
 EPSG:32613
   ll  4.7583779488046805 -107.92602632992818
-  en  175381.12258358882 526643.9141885705
-  ll2 4.758377948802734 -107.92602632984342
+  en  175381.12258360465 526643.9141952256
+  ll2 4.758377948802733 -107.92602632984342
 EPSG:32713
   ll  -10.850887170003276 -108.88425627320359
-  en  75152.58517287992 8797793.856477404
-  ll2 -10.85088716998492 -108.88425627294212
+  en  75152.58517297846 8797793.856462443
+  ll2 -10.850887169984928 -108.88425627294212
 EPSG:325813
   ll  66.20959551417033 -109.09161210111962
-  en  3315926.7644537073 7349289.909896275
-  ll2 66.2095955140395 -109.09161210087801
+  en  3315926.7644546847 7349289.909941929
+  ll2 66.20959551403949 -109.09161210087801
 EPSG:325913
   ll  -68.06851091663657 -109.88775790882875
-  en  3296450.809503036 2441437.2410361636
-  ll2 -68.06851091631609 -109.88775790756797
+  en  3296450.8095041467 2441437.2409912376
+  ll2 -68.0685109163161 -109.88775790756799
 EPSG:32614
   ll  14.263757165950743 -100.80954124472483
-  en  304782.4591080374 1577656.5829378215
+  en  304782.4591081125 1577656.5829572342
   ll2 14.263757165949812 -100.80954124472157
 EPSG:32714
   ll  -56.89459290929925 -97.364159691813
-  en  599649.1533369429 3693155.667650017
-  ll2 -56.894592909299305 -97.36415969181257
+  en  599649.1533364999 3693155.6676022783
+  ll2 -56.89459290929931 -97.36415969181257
 EPSG:325814
   ll  14.867593373898092 -94.551911603902
-  en  3978916.3793500355 1648458.2510422773
-  ll2 14.867593373838211 -94.5519116041845
+  en  3978916.379349831 1648458.2510624563
+  ll2 14.867593373838208 -94.55191160418451
 EPSG:325914
   ll  -8.277332733762591 -96.31304814961656
-  en  3796001.0760478075 9084042.618146053
-  ll2 -8.277332733760488 -96.3130481496617
+  en  3796001.0760477674 9084042.618134554
+  ll2 -8.277332733760499 -96.3130481496617
 EPSG:32615
   ll  84.67761930424092 -95.31735150114109
-  en  476007.3905249191 9404225.272763122
-  ll2 84.67761930423924 -95.31735150113857
+  en  476007.3905250701 9404225.272798516
+  ll2 84.67761930423927 -95.31735150113857
 EPSG:32715
   ll  -15.188620247220271 -96.23707027363224
-  en  152136.94772546168 8318235.034985177
-  ll2 -15.188620247214825 -96.23707027358184
+  en  152136.94772561447 8318235.034964591
+  ll2 -15.188620247214832 -96.23707027358184
 EPSG:325815
   ll  29.659566775760396 -89.14648624583667
-  en  3873068.9777468843 3287277.6743779047
-  ll2 29.659566775708537 -89.14648624564234
+  en  3873068.977746305 3287277.6744142915
+  ll2 29.65956677570854 -89.14648624564235
 EPSG:325915
   ll  -69.26764450162177 -95.62116552395997
-  en  3396471.339212113 2313578.5752869593
-  ll2 -69.26764450161573 -95.62116552395555
+  en  3396471.3392126877 2313578.57524251
+  ll2 -69.26764450161576 -95.62116552395555
 EPSG:32616
   ll  72.583548496096 -84.95707014904738
-  en  568238.7416451611 8055185.317340905
+  en  568238.7416447669 8055185.31738377
   ll2 72.58354849609476 -84.95707014904791
 EPSG:32716
   ll  -4.559807376181936 -82.52818257741919
-  en  996538.1905095157 9494450.775045805
-  ll2 -4.559807376156731 -82.52818257832048
+  en  996538.1905094895 9494450.775039427
+  ll2 -4.559807376156718 -82.52818257832048
 EPSG:325816
   ll  39.03683531082378 -91.32884532853011
-  en  3125277.8354135156 4329789.181572939
-  ll2 39.03683531060884 -91.32884532882264
+  en  3125277.835414457 4329789.181616223
+  ll2 39.036835310608836 -91.32884532882264
 EPSG:325916
   ll  -80.48202922319493 -83.22512570057863
-  en  3569637.61037893 1062348.303416377
-  ll2 -80.48202922318505 -83.22512570072386
+  en  3569637.6103784996 1062348.3033781778
+  ll2 -80.48202922318502 -83.2251257007239
 EPSG:32617
   ll  58.773416508274885 -79.23342848764487
-  en  602152.126427551 6516169.077113513
-  ll2 58.77341650827499 -79.23342848764443
+  en  602152.1264270776 6516169.077161058
+  ll2 58.77341650827501 -79.23342848764443
 EPSG:32717
   ll  -66.29192836668584 -83.46326129024452
-  en  389503.5113193028 2645374.949660916
-  ll2 -66.29192836668118 -83.46326129024257
+  en  389503.5113198902 2645374.9496152718
+  ll2 -66.2919283666812 -83.46326129024257
 EPSG:325817
   ll  74.22922998811548 -82.2572616625563
-  en  3461860.385314859 8238014.811408436
-  ll2 74.22922998811472 -82.25726166255625
+  en  3461860.385315083 8238014.811450425
+  ll2 74.22922998811468 -82.25726166255625
 EPSG:325917
   ll  -26.672436697539396 -84.93179949462775
-  en  3108597.2051335373 7043809.946014062
-  ll2 -26.672436697493467 -84.93179949481045
+  en  3108597.205134038 7043809.945980476
+  ll2 -26.672436697493477 -84.93179949481045
 EPSG:32618
   ll  0.8542824171250176 -70.60589399441409
-  en  989382.9848639236 94704.1521852999
-  ll2 0.854282417120703 -70.60589399529678
+  en  989382.9848639166 94704.15218649869
+  ll2 0.854282417120703 -70.6058939952968
 EPSG:32718
   ll  -2.5647882790401297 -76.48884831326323
-  en  334474.6299803895 9716415.678219076
-  ll2 -2.5647882790393166 -76.48884831326058
+  en  334474.62998039176 9716415.67821548
+  ll2 -2.5647882790393246 -76.48884831326058
 EPSG:325818
   ll  54.54759466810166 -70.10559888065576
-  en  3816474.403827199 6055472.389915395
-  ll2 54.54759466746183 -70.10559888135492
+  en  3816474.403825868 6055472.389963165
+  ll2 54.54759466746184 -70.10559888135492
 EPSG:325918
   ll  -33.09191328447166 -72.04482413314155
-  en  3775823.385118008 6334637.71211057
-  ll2 -33.09191328445936 -72.04482413309498
+  en  3775823.3851174875 6334637.712071307
+  ll2 -33.09191328445934 -72.04482413309498
 EPSG:32619
   ll  9.928164458825613 -66.53356619660251
-  en  770448.3262750129 1098474.2069324083
-  ll2 9.928164458823826 -66.533566196628
+  en  770448.326274961 1098474.2069461367
+  ll2 9.92816445882383 -66.53356619662802
 EPSG:32719
   ll  -3.3106740144730935 -68.43248658691562
-  en  563046.3761068054 9634048.929642053
-  ll2 -3.3106740144720237 -68.43248658691563
+  en  563046.3761068041 9634048.929637415
+  ll2 -3.310674014472018 -68.43248658691563
 EPSG:325819
   ll  39.434976410660475 -64.91063669464722
-  en  3851985.018684343 4373034.511265502
+  en  3851985.018683444 4373034.511309015
   ll2 39.4349764105042 -64.91063669443021
 EPSG:325919
   ll  -78.61538957033292 -73.24424795954134
-  en  3406552.558590187 1269556.4362797644
-  ll2 -78.61538957030486 -73.24424795913167
+  en  3406552.558590757 1269556.436240377
+  ll2 -78.61538957030486 -73.24424795913168
 EPSG:32620
   ll  -2.6787491025025547 -66.88079230367741
-  en  68302.71810567938 -296768.502579237
-  ll2 -2.6787491024969947 -66.88079230325388
+  en  68302.71810568956 -296768.5025829923
+  ll2 -2.678749102496994 -66.88079230325388
 EPSG:32720
   ll  -69.88660504305992 -58.451395274860495
-  en  674428.974183253 2240266.527619357
-  ll2 -69.8866050428864 -58.451395275542424
+  en  674428.9741822772 2240266.5275752097
+  ll2 -69.88660504288637 -58.45139527554243
 EPSG:325820
   ll  64.49300134007495 -62.979335076288066
-  en  3500992.919768446 7151952.692570168
-  ll2 64.49300134007687 -62.979335076288066
+  en  3500992.919768441 7151952.692616433
+  ll2 64.49300134007689 -62.979335076288066
 EPSG:325920
   ll  -43.937990691739216 -66.64134489151819
-  en  3207746.9962192755 5128565.9597275695
-  ll2 -43.93799069164205 -66.64134489159909
+  en  3207746.9962201663 5128565.959681904
+  ll2 -43.93799069164207 -66.64134489159909
 EPSG:32621
   ll  69.83911306601517 -54.4569378254068
-  en  597795.3401822961 7749969.356219076
-  ll2 69.83911306601043 -54.4569378254102
+  en  597795.3401817495 7749969.3562632715
+  ll2 69.83911306601044 -54.4569378254102
 EPSG:32721
   ll  -1.460807694037996 -56.918034017934815
-  en  509117.82030811225 9838536.340693863
-  ll2 -1.4608076940375032 -56.918034017934815
+  en  509117.8203081122 9838536.340691814
+  ll2 -1.4608076940374979 -56.918034017934815
 EPSG:325821
   ll  51.21005902867042 -57.379470258439625
-  en  3473493.1777377734 5673253.086049996
+  en  3473493.1777378754 5673253.086097582
   ll2 51.210059028669455 -57.37947025843962
 EPSG:325921
   ll  -49.499296188014874 -52.907039081672345
-  en  3796326.3219704586 4508982.9242921015
-  ll2 -49.499296187793 -52.90703908167633
+  en  3796326.3219693736 4508982.924244817
+  ll2 -49.49929618779303 -52.907039081676324
 EPSG:32622
   ll  14.524484069634685 -53.96374810803576
-  en  180556.34691500437 1607806.3026215218
-  ll2 14.524484069631836 -53.96374810799876
+  en  180556.34691513283 1607806.3026412665
+  ll2 14.524484069631837 -53.96374810799876
 EPSG:32722
   ll  -67.51187256863244 -49.8909954222962
-  en  547334.5777228241 2511132.6496498464
+  en  547334.5777225678 2511132.649604654
   ll2 -67.5118725686338 -49.89099542229613
 EPSG:325822
   ll  32.61781547095043 -48.537082717209415
-  en  3731092.318099377 3611597.5390706607
-  ll2 32.617815470947676 -48.537082717192604
+  en  3731092.3180989525 3611597.5391095537
+  ll2 32.61781547094768 -48.537082717192604
 EPSG:325922
   ll  -25.281994693195657 -47.87237423257416
-  en  3814983.707943758 7200152.773780305
-  ll2 -25.281994693188874 -47.872374232534604
+  en  3814983.707943394 7200152.773748113
+  ll2 -25.28199469318887 -47.872374232534604
 EPSG:32623
   ll  16.394157590092313 -42.12374249522621
-  en  807234.0075208137 1814713.56288207
+  en  807234.0075206581 1814713.5629041612
   ll2 16.39415759009029 -42.123742495247065
 EPSG:32723
   ll  -37.33901138489274 -46.319661481385886
-  en  383102.3012515522 5866702.312025944
-  ll2 -37.33901138489223 -46.3196614813865
+  en  383102.30125182413 5866702.311983665
+  ll2 -37.33901138489222 -46.3196614813865
 EPSG:325823
   ll  59.60264479279566 -46.46417576837352
-  en  3417358.7008529557 6608070.849672022
-  ll2 59.602644792796895 -46.46417576837374
+  en  3417358.7008533455 6608070.849719444
+  ll2 59.60264479279688 -46.464175768373735
 EPSG:325923
   ll  -42.13335698553909 -40.4994655569372
-  en  3871982.9802165497 5325605.57506567
-  ll2 -42.13335698522215 -40.499465556709254
+  en  3871982.9802154894 5325605.575020785
+  ll2 -42.13335698522217 -40.49946555670925
 EPSG:32624
   ll  5.131580338571972 -39.26307503457069
-  en  470842.78426742496 567215.0037199045
-  ll2 5.131580338570435 -39.26307503457069
+  en  470842.7842674264 567215.0037270777
+  ll2 5.131580338570434 -39.26307503457069
 EPSG:32724
   ll  -64.98185873306474 -42.631062127293355
-  en  328728.8037982457 2788647.117256688
+  en  328728.8037991375 2788647.117210606
   ll2 -64.98185873299518 -42.631062127215536
 EPSG:325824
   ll  75.09851921359484 -43.6400984567463
-  en  3366931.9030094724 8339809.290781471
-  ll2 75.09851921350092 -43.64009845586569
+  en  3366931.903010261 8339809.290822947
+  ll2 75.0985192135009 -43.64009845586568
 EPSG:325924
   ll  -31.757981422607287 -39.62137531657344
-  en  3441153.617764649 6486221.773928229
+  en  3441153.617764752 6486221.77389003
   ll2 -31.757981422608655 -39.62137531657346
 EPSG:32625
   ll  -0.7883094164596285 -30.122300530621676
-  en  820321.3553729993 -87242.67464161805
+  en  820321.3553729971 -87242.67464272428
   ll2 -0.7883094164592921 -30.12230053070564
 EPSG:32725
   ll  -65.44826790805924 -36.847373771828195
-  en  321704.47542034916 2736137.6102236286
-  ll2 -65.44826790796355 -36.847373771693476
+  en  321704.47542128456 2736137.610177705
+  ll2 -65.44826790796357 -36.847373771693476
 EPSG:325825
   ll  65.887938688693 -35.070053830491894
-  en  3405648.956705071 7308975.39334911
-  ll2 65.88793868869246 -35.07005383049174
+  en  3405648.9567055693 7308975.393394905
+  ll2 65.88793868869247 -35.070053830491744
 EPSG:325925
   ll  -20.030238632621646 -30.349344491897128
-  en  3777295.6626095376 7782974.408104785
+  en  3777295.6626093313 7782974.4080783315
   ll2 -20.030238632621362 -30.349344491898044
 EPSG:32626
   ll  58.43458636013028 -29.168484112078048
-  en  373392.93024488434 6479137.4191867355
-  ll2 58.4345863601271 -29.168484112078875
+  en  373392.93024546676 6479137.41923432
+  ll2 58.43458636012713 -29.16848411207888
 EPSG:32726
   ll  -45.64851344048113 -31.882495362328466
-  en  119560.58074700518 4933398.923899207
+  en  119560.58074823738 4933398.923852939
   ll2 -45.648513439897464 -31.88249536231209
 EPSG:325826
   ll  14.237460537145964 -29.544168588724947
-  en  3225457.865044627 1575488.3511570692
-  ll2 14.237460537144731 -29.544168588706945
+  en  3225457.8650447326 1575488.3511764484
+  ll2 14.237460537144733 -29.54416858870695
 EPSG:325926
   ll  4.225147273652084 -28.545819653002344
-  en  3328432.6156485914 1.0467184762315333E7
-  ll2 4.2251472736508395 -28.545819652999242
+  en  3328432.6156485975 1.0467184762321247E7
+  ll2 4.22514727365084 -28.545819652999242
 EPSG:32627
   ll  8.344532201175449 -23.182089463285656
-  en  259685.6891658042 923051.0955829168
-  ll2 8.344532201173756 -23.182089463270486
+  en  259685.68916583678 923051.0955945052
+  ll2 8.344532201173758 -23.182089463270486
 EPSG:32727
   ll  -50.934366256586614 -25.166137353819305
-  en  207304.56798059645 4349205.01843467
+  en  207304.56798171415 4349205.018387153
   ll2 -50.93436625633737 -25.166137353769805
 EPSG:325827
   ll  4.094370919583472 -23.62056064954077
-  en  3209035.37023525 453034.07663118036
-  ll2 4.094370919582173 -23.620560649492674
+  en  3209035.3702352606 453034.076636912
+  ll2 4.0943709195821745 -23.620560649492674
 EPSG:325927
   ll  -44.664066687330894 -19.261717046318168
-  en  3637801.7645431445 5052896.781377966
-  ll2 -44.66406668732781 -19.26171704631626
+  en  3637801.7645427133 5052896.781332008
+  ll2 -44.664066687327825 -19.261717046316264
 EPSG:32628
   ll  22.510955722354655 -11.39208694243174
-  en  871237.6024492646 2493863.4478630307
-  ll2 22.51095572233715 -11.392086942377524
+  en  871237.6024489189 2493863.447892283
+  ll2 22.51095572233715 -11.392086942377526
 EPSG:32728
   ll  -75.6414574413936 -19.243865220370584
-  en  382615.27326908964 1600607.7107349653
-  ll2 -75.64145744134245 -19.243865219973987
+  en  382615.2732697887 1600607.7106937915
+  ll2 -75.64145744134242 -19.243865219973983
 EPSG:325828
   ll  49.071084622707566 -17.35584546969967
-  en  3327939.683999906 5438031.203006637
-  ll2 49.0710846226981 -17.35584546970578
+  en  3327939.6840005275 5438031.203053855
+  ll2 49.0710846226981 -17.355845469705784
 EPSG:325928
   ll  -5.379819146453798 -12.53635261155926
-  en  3773025.942903334 9404800.220284652
-  ll2 -5.379819146452325 -12.536352611592488
+  en  3773025.942903318 9404800.220277136
+  ll2 -5.379819146452313 -12.536352611592484
 EPSG:32629
   ll  21.147897974547682 -10.932715320979701
-  en  299305.3797179873 2339737.583503649
-  ll2 21.147897974548886 -10.932715320979794
+  en  299305.3797181526 2339737.5835313834
+  ll2 21.147897974548883 -10.932715320979792
 EPSG:32729
   ll  -83.5333650193571 -5.501531193633692
-  en  543962.8350561801 722665.3615850732
-  ll2 -83.53336501935372 -5.501531193708961
+  en  543962.8350559046 722665.3615488987
+  ll2 -83.53336501935372 -5.5015311937089555
 EPSG:325829
   ll  41.94383312013957 -8.306514012321347
-  en  3557483.490353439 4643772.639907064
-  ll2 41.94383312013787 -8.306514012321346
+  en  3557483.4903532765 4643772.639951887
+  ll2 41.943833120137896 -8.306514012321347
 EPSG:325929
   ll  -42.689366117043875 -7.458484785853329
-  en  3626278.7090864433 5272527.702533314
-  ll2 -42.68936611704162 -7.458484785852189
+  en  3626278.709086076 5272527.702488156
+  ll2 -42.689366117041615 -7.4584847858521925
 EPSG:32630
   ll  7.0485574964722595 -2.895336653090574
-  en  511558.98133625207 779118.0296524181
+  en  511558.98133625096 779118.0296622365
   ll2 7.0485574964704 -2.8953366530905744
 EPSG:32730
   ll  -81.54589940598518 -0.6625327966681755
-  en  538355.0358700963 945086.560876118
-  ll2 -81.5458994059829 -0.6625327966706571
+  en  538355.0358698581 945086.5608386025
+  ll2 -81.5458994059829 -0.6625327966706558
 EPSG:325830
   ll  67.8921918268731 -7.824623864366158
-  en  3297541.2105327477 7538748.087510731
-  ll2 67.89219182657125 -7.8246238632490295
+  en  3297541.21053385 7538748.087555732
+  ll2 67.89219182657128 -7.824623863249039
 EPSG:325930
   ll  0.4171935875446735 -2.886899629327141
-  en  3512584.9163963683 1.0046112525092406E7
-  ll2 0.41719358754453867 -2.8868996293271394
+  en  3512584.9163963683 1.0046112525092991E7
+  ll2 0.41719358754453323 -2.8868996293271394
 EPSG:32631
   ll  62.31144897764639 -1.7488227034434083
-  en  253972.611393009 6917912.226800853
-  ll2 62.31144897723163 -1.7488227026127445
+  en  253972.61139423194 6917912.226847682
+  ll2 62.31144897723161 -1.7488227026127454
 EPSG:32731
   ll  -77.7299649478657 6.793662551026102
-  en  589941.1445331064 1368855.44592157
-  ll2 -77.72996494784718 6.793662550878122
+  en  589941.1445325612 1368855.445881633
+  ll2 -77.72996494784715 6.7936625508781106
 EPSG:325831
   ll  -3.7939968357153786 -1.1712382629044498
-  en  3036447.257758164 -420474.82059443305
-  ll2 -3.7939968357025062 -1.171238262284568
+  en  3036447.2577581815 -420474.820599746
+  ll2 -3.793996835702508 -1.1712382622845716
 EPSG:325931
   ll  -48.12092219412692 -0.7289826703408846
-  en  3222506.495967786 4663531.741963033
-  ll2 -48.12092219400162 -0.7289826703783926
+  en  3222506.49596876 4663531.741916042
+  ll2 -48.1209221940016 -0.7289826703783926
 EPSG:32632
   ll  11.834748738967427 11.598093592769366
-  en  783086.6736355794 1309597.5819868166
+  en  783086.673635503 1309597.5820030784
   ll2 11.834748738965645 11.598093592741604
 EPSG:32732
   ll  -1.791491309390267 5.643292386980017
-  en  126449.06323078932 9801643.353379363
-  ll2 -1.7914913093887692 5.643292387171929
+  en  126449.06323079445 9801643.35337685
+  ll2 -1.791491309388767 5.6432923871719325
 EPSG:325832
   ll  77.68629530327402 9.528947032671267
-  en  3512592.5520969722 8623417.16220485
-  ll2 77.68629530327236 9.52894703267119
+  en  3512592.5520968963 8623417.162244834
+  ll2 77.68629530327239 9.528947032671208
 EPSG:325932
   ll  -6.14179270149279 4.8242912817139105
-  en  3037594.6533932704 9319316.128980326
-  ll2 -6.1417927014726725 4.824291282280721
+  en  3037594.6533933086 9319316.128971754
+  ll2 -6.141792701472686 4.8242912822807185
 EPSG:32633
   ll  42.05539689126687 15.319058068358773
-  en  526400.7140051838 4655976.147119219
-  ll2 42.05539689126517 15.319058068358766
+  en  526400.7140051088 4655976.147164094
+  ll2 42.05539689126517 15.319058068358764
 EPSG:32733
   ll  -4.126836934079179 14.21193297521501
-  en  412530.9764488442 9543809.318936573
-  ll2 -4.126836934077888 14.211932975215113
+  en  412530.9764488471 9543809.318930797
+  ll2 -4.126836934077882 14.211932975215115
 EPSG:325833
   ll  67.46670291106749 12.96835463601909
-  en  3413129.304415828 7484831.15327876
-  ll2 67.46670291106712 12.968354636019287
+  en  3413129.3044162984 7484831.153323963
+  ll2 67.4667029110671 12.968354636019296
 EPSG:325933
   ll  -64.4745973056098 11.208508565566216
-  en  3317785.4845893867 2844655.216676887
-  ll2 -64.47459730551594 11.208508565679988
+  en  3317785.4845903274 2844655.216630646
+  ll2 -64.47459730551593 11.208508565679987
 EPSG:32634
   ll  75.90951295643045 25.503495199048984
-  en  622276.0812551372 8429752.166133095
-  ll2 75.909512956362 25.503495198369777
+  en  622276.0812544073 8429752.166174108
+  ll2 75.909512956362 25.50349519836978
 EPSG:32734
   ll  3.2478852471029853 16.30155670183659
-  en  -22571.10663488024 1.0360208764078753E7
-  ll2 3.2478852470768307 16.30155670309071
+  en  -22571.10663486237 1.0360208764083304E7
+  ll2 3.2478852470768276 16.301556703090707
 EPSG:325834
   ll  -4.517988102520578 22.94921284404035
-  en  3716270.5802507172 -499673.68407470325
+  en  3716270.5802507084 -499673.68408102426
   ll2 -4.517988102519325 22.949212844030242
 EPSG:325934
   ll  -66.80908136058187 16.14267050331656
-  en  3286725.430758457 2581586.3374314755
-  ll2 -66.80908136023545 16.142670504476662
+  en  3286725.4307596 2581586.337386054
+  ll2 -66.80908136023545 16.14267050447666
 EPSG:32635
   ll  47.49067536542698 25.527726208112252
-  en  389099.42345362616 5260743.8956464715
-  ll2 47.49067536542475 25.527726208111613
+  en  389099.42345400766 5260743.895693323
+  ll2 47.49067536542474 25.527726208111613
 EPSG:32735
   ll  -67.02488461225471 23.602574863927025
-  en  352075.73641798395 2561806.49766777
-  ll2 -67.02488461221533 23.602574863972347
+  en  352075.73641877924 2561806.497622406
+  ll2 -67.02488461221536 23.602574863972347
 EPSG:325835
   ll  59.310337838927126 27.764745794983764
-  en  3543539.78736154 6574859.024116623
-  ll2 59.310337838928696 27.76474579498381
+  en  3543539.7873613355 6574859.024164094
+  ll2 59.310337838928696 27.764745794983803
 EPSG:325935
   ll  -41.869069478688395 25.134315184294067
-  en  3345169.0500144064 5363077.880311551
-  ll2 -41.869069478685255 25.134315184290813
+  en  3345169.050014843 5363077.880266767
+  ll2 -41.869069478685255 25.13431518429081
 EPSG:32636
   ll  2.3826611804187845 35.69036984079036
-  en  799224.0520455817 263649.3963101671
+  en  799224.0520455772 263649.3963135081
   ll2 2.382661180417945 35.69036984073283
 EPSG:32736
   ll  -42.55662303150512 29.942428252202173
-  en  248987.61723185022 5283887.580755011
-  ll2 -42.55662303147199 29.942428252161324
+  en  248987.617232577 5283887.58070992
+  ll2 -42.55662303147202 29.942428252161328
 EPSG:325836
   ll  16.615535265561583 35.64542638829472
-  en  3782240.02796368 1838888.532729371
-  ll2 16.615535265560666 35.64542638828159
+  en  3782240.027963533 1838888.532751736
+  ll2 16.615535265560656 35.645426388281585
 EPSG:325936
   ll  -75.03852317262636 34.434468051988944
-  en  3541334.7248576935 1671595.0858056266
-  ll2 -75.0385231726253 34.43446805198884
+  en  3541334.7248574486 1671595.0857640896
+  ll2 -75.03852317262528 34.43446805198882
 EPSG:32637
   ll  52.14316359823634 35.33858849767755
-  en  249486.75996483312 5783285.072192587
-  ll2 52.14316359812049 35.33858849768191
+  en  249486.75996582233 5783285.072240253
+  ll2 52.143163598120495 35.33858849768192
 EPSG:32737
   ll  -63.21444761968792 35.222287816138596
-  en  310135.9849130677 2984926.8572165733
-  ll2 -63.2144476195883 35.22228781624288
+  en  310135.9849140271 2984926.8571699606
+  ll2 -63.214447619588334 35.22228781624288
 EPSG:325837
   ll  6.9163924168089235 39.74685370543559
-  en  3582507.6382259848 764571.112230426
-  ll2 6.9163924168070885 39.74685370543552
+  en  3582507.638225977 764571.112240063
+  ll2 6.916392416807089 39.74685370543551
 EPSG:325937
   ll  -14.08852279690737 38.543983228864015
-  en  3450772.841747192 8442435.789017707
+  en  3450772.8417472104 8442435.788998518
   ll2 -14.088522796906116 38.54398322886402
 EPSG:32638
   ll  53.91509364067411 42.2117397712837
-  en  316881.19957470614 5977677.047319392
-  ll2 53.91509364065171 42.21173977127907
+  en  316881.19957546366 5977677.047367179
+  ll2 53.9150936406517 42.21173977127907
 EPSG:32738
   ll  -33.61049536194267 49.3934280355533
-  en  907721.7528893696 6272366.91972786
-  ll2 -33.61049536177813 49.39342803597181
+  en  907721.7528885778 6272366.919688205
+  ll2 -33.61049536177814 49.39342803597181
 EPSG:325838
   ll  74.9091597003715 48.6558222215854
-  en  3606180.5414840663 8316743.386915103
-  ll2 74.9091597003469 48.65582222148265
+  en  3606180.541483438 8316743.386956698
+  ll2 74.9091597003469 48.655822221482644
 EPSG:325938
   ll  -21.15366469684895 43.8728399352876
-  en  3382970.2876779484 7660430.264394118
-  ll2 -21.153664696850008 43.872839935287615
+  en  3382970.2876780448 7660430.264366376
+  ll2 -21.15366469685002 43.872839935287615
 EPSG:32639
   ll  78.6419869416514 46.228999725737076
-  en  395220.30454908486 8734297.004569301
+  en  395220.3045497241 8734297.004608665
   ll2 78.64198694159874 46.22899972691322
 EPSG:32739
   ll  -36.97742607037574 49.32483640492937
-  en  350900.55360361876 5906320.5682326965
-  ll2 -36.97742607037497 49.324836404927225
+  en  350900.55360395985 5906320.568190651
+  ll2 -36.97742607037495 49.324836404927225
 EPSG:325839
   ll  10.069996634834698 50.89113881049788
-  en  3488071.858012909 1113153.5633555888
+  en  3488071.8580129114 1113153.563369507
   ll2 10.069996634832751 50.89113881049788
 EPSG:325939
   ll  -80.60626087327603 52.65395467079264
-  en  3530133.6675762306 1050315.8630765658
+  en  3530133.6675760443 1050315.8630384337
   ll2 -80.606260873274 52.6539546707922
 EPSG:32640
   ll  53.864121366142705 57.44751774032813
-  en  529429.9386813396 5968496.735254104
+  en  529429.9386812181 5968496.735301904
   ll2 53.864121366142605 57.44751774032813
 EPSG:32740
   ll  -78.828450880352 53.91362023885953
-  en  433274.5310177722 1247408.5977880042
-  ll2 -78.82845088034632 53.91362023888326
+  en  433274.5310181798 1247408.5977487396
+  ll2 -78.82845088034635 53.913620238883254
 EPSG:325840
   ll  59.76387277043521 54.37575445989696
-  en  3352609.243368669 6628031.663603889
-  ll2 59.76387277042331 54.3757544598978
+  en  3352609.2433693665 6628031.663651275
+  ll2 59.76387277042328 54.375754459897806
 EPSG:325940
   ll  -59.976831400819776 53.71307388643351
-  en  3316584.9510720787 3346612.022944576
+  en  3316584.9510729504 3346612.0228972314
   ll2 -59.976831400769555 53.71307388645429
 EPSG:32641
   ll  49.571868382578565 60.41766515903435
-  en  313303.34798787755 5494234.471041123
-  ll2 49.57186838256324 60.41766515902558
+  en  313303.34798856254 5494234.471088438
+  ll2 49.57186838256323 60.41766515902558
 EPSG:32741
   ll  -26.30036312196733 65.289773385337
-  en  728606.515567082 7089027.454801407
-  ll2 -26.300363121968445 65.28977338534429
+  en  728606.5155667982 7089027.454768185
+  ll2 -26.300363121968438 65.28977338534429
 EPSG:325841
   ll  35.58653083746617 64.35677273465917
-  en  3622921.5587340104 3938937.2973574684
+  en  3622921.5587337473 3938937.297398581
   ll2 35.586530837466285 64.3567727346599
 EPSG:325941
   ll  -8.569269531855056 59.196306698858095
-  en  3081142.0210831566 9050693.679437377
-  ll2 -8.569269531841547 59.196306699145694
+  en  3081142.021083219 9050693.679425484
+  ll2 -8.569269531841538 59.196306699145694
 EPSG:32642
   ll  -1.9071382046033127 69.6619425586165
-  en  573618.7511049985 -210811.008310292
-  ll2 -1.9071382046026715 69.66194255861646
+  en  573618.7511049979 -210811.00831296702
+  ll2 -1.9071382046026712 69.66194255861646
 EPSG:32742
   ll  -46.57798418816586 66.46686755703854
-  en  305909.4478588273 4838613.998636958
-  ll2 -46.5779841881523 66.46686755702721
+  en  305909.4478594754 4838613.998590369
+  ll2 -46.57798418815231 66.46686755702721
 EPSG:325842
   ll  25.166004030978193 65.74989542315689
-  en  3172361.9823458116 2787283.797651091
-  ll2 25.166004030968768 65.74989542310783
+  en  3172361.9823461873 2787283.7976831654
+  ll2 25.16600403096878 65.74989542310783
 EPSG:325942
   ll  4.080834969902384 68.85686170431453
-  en  3484112.3880951367 1.0451063940918066E7
-  ll2 4.080834969901091 68.85686170431453
+  en  3484112.388095137 1.0451063940923778E7
+  ll2 4.08083496990109 68.85686170431453
 EPSG:32643
   ll  1.4895490042363466 73.50410601478126
-  en  333581.314803635 164696.77434499215
-  ll2 1.4895490042358654 73.50410601478401
+  en  333581.31480363605 164696.77434708193
+  ll2 1.4895490042358661 73.50410601478401
 EPSG:32743
   ll  -25.298456802256545 78.290225577417
-  en  831325.5755870896 7197935.587161519
+  en  831325.5755867062 7197935.58712931
   ll2 -25.298456802245937 78.29022557747085
 EPSG:325843
   ll  4.150327197207609 78.3848695646801
-  en  3875887.968786747 459548.1926785113
-  ll2 4.150327197204123 78.3848695644895
+  en  3875887.9687867323 459548.19268432085
+  ll2 4.150327197204124 78.3848695644895
 EPSG:325943
   ll  -29.743707910694475 76.0025527331224
-  en  3596943.9161189785 6709192.520296935
-  ll2 -29.74370791069626 76.00255273312254
+  en  3596943.916118828 6709192.520260464
+  ll2 -29.743707910696255 76.00255273312254
 EPSG:32644
   ll  62.44367553939567 85.9750751673437
-  en  756598.9549096783 6933493.141553194
-  ll2 62.44367553885306 85.97507516606653
+  en  756598.9549083995 6933493.141599985
+  ll2 62.44367553885303 85.97507516606653
 EPSG:32744
   ll  -23.333853962130412 81.03414728671824
-  en  503490.80075499346 7419521.505733106
-  ll2 -23.333853962131972 81.03414728671824
+  en  503490.80075498996 7419521.505702956
+  ll2 -23.33385396213197 81.03414728671824
 EPSG:325844
   ll  75.60794388867498 76.12849875200254
-  en  3364981.549432554 8397002.700911963
-  ll2 75.6079438885618 76.1284987533766
+  en  3364981.5494333575 8397002.700953145
+  ll2 75.60794388856178 76.1284987533766
 EPSG:325944
   ll  -30.531583699528298 81.70562992872959
-  en  3567691.56716824 6622096.716360167
+  en  3567691.5671681296 6622096.716323003
   ll2 -30.531583699529946 81.70562992872962
 EPSG:32645
   ll  77.10426871059683 89.0221872636809
-  en  550370.2039687558 8559275.344337067
-  ll2 77.10426871059487 89.02218726368017
+  en  550370.203968452 8559275.344377397
+  ll2 77.1042687105949 89.02218726368017
 EPSG:32745
   ll  -27.850501765768136 88.49974130692067
-  en  647670.926899408 6918455.121005422
+  en  647670.9268992043 6918455.1209706925
   ll2 -27.85050176577014 88.49974130692154
 EPSG:325845
   ll  26.567408149697318 83.36177880919017
-  en  3137515.090756707 2943675.0078001725
-  ll2 26.567408149671067 83.36177880907614
+  en  3137515.0907571665 2943675.0078336555
+  ll2 26.567408149671074 83.36177880907614
 EPSG:325945
   ll  2.578648544548429 86.376506281797
-  en  3430689.1714494345 1.0285037041581308E7
+  en  3430689.1714494354 1.0285037041584924E7
   ll2 2.5786485445475704 86.37650628179703
 EPSG:32646
   ll  50.87569190579864 89.74835752271836
-  en  271249.3586745439 5641039.535469045
-  ll2 50.87569190574127 89.74835752270417
+  en  271249.3586754158 5641039.535516567
+  ll2 50.87569190574126 89.74835752270417
 EPSG:32746
   ll  -21.043491771413862 94.96493214411353
-  en  704183.7578685277 7671781.457148481
+  en  704183.7578683612 7671781.457120865
   ll2 -21.043491771415024 94.96493214411359
 EPSG:325846
   ll  63.92292390294496 94.7877236444445
-  en  3587673.4974419507 7089654.089460648
-  ll2 63.92292390294584 94.78772364444467
+  en  3587673.4974415023 7089654.089507077
+  ll2 63.92292390294582 94.78772364444467
 EPSG:325946
   ll  -27.516680128901726 90.30293533287998
-  en  3233587.2607836546 6953437.221822483
-  ll2 -27.516680128899832 90.30293533285852
+  en  3233587.2607840146 6953437.221788075
+  ll2 -27.516680128899836 90.30293533285852
 EPSG:32647
   ll  70.62231324887725 99.90770843411856
-  en  533612.0813873503 7835525.490584764
+  en  533612.0813871606 7835525.490628606
   ll2 70.62231324887775 99.90770843411859
 EPSG:32747
   ll  -17.444781767557416 97.838202011294
-  en  376622.89142719447 8070864.873859759
-  ll2 -17.444781767557277 97.8382020112942
+  en  376622.89142726455 8070864.873836377
+  ll2 -17.444781767557284 97.8382020112942
 EPSG:325847
   ll  24.432295988352866 97.04644115456145
-  en  3301945.3911856916 2703485.9937162865
-  ll2 24.43229598835464 97.04644115455939
+  en  3301945.391185906 2703485.993747602
+  ll2 24.432295988354635 97.04644115455939
 EPSG:325947
   ll  -8.286948582210371 97.25620711941067
-  en  3307943.592790002 9083557.980623243
-  ll2 -8.286948582208607 97.25620711941549
+  en  3307943.5927900276 9083557.980611732
+  ll2 -8.286948582208613 97.25620711941549
 EPSG:32648
   ll  39.26637557561634 107.38423392284906
-  en  705690.5819350425 4349046.82992238
-  ll2 39.2663755756096 107.38423392286235
+  en  705690.5819345212 4349046.829965812
+  ll2 39.26637557560962 107.38423392286235
 EPSG:32748
   ll  -58.2033639588618 101.36763036809408
-  en  286575.74435058946 3542895.4237497468
-  ll2 -58.203363958762644 101.36763036814246
+  en  286575.74435156654 3542895.4237021524
+  ll2 -58.20336395876264 101.36763036814246
 EPSG:325848
   ll  46.03384980661478 103.1140223730946
-  en  3354054.3806325076 5099537.604606972
-  ll2 46.033849806610924 103.11402237309194
+  en  3354054.3806329863 5099537.604653398
+  ll2 46.03384980661091 103.11402237309196
 EPSG:325948
   ll  -40.2015653990426 107.76592292342754
-  en  3735418.10738167 5546201.21837961
-  ll2 -40.20156539902623 107.76592292345568
+  en  3735418.107381049 5546201.2183356695
+  ll2 -40.20156539902622 107.76592292345568
 EPSG:32649
   ll  11.255609425170523 111.88005555487531
-  en  596060.3794569031 1244386.5305939126
-  ll2 11.255609425168712 111.88005555487518
+  en  596060.37945688 1244386.5306094105
+  ll2 11.255609425168716 111.88005555487518
 EPSG:32749
   ll  -38.23589206710369 109.25679480724837
-  en  347437.227383393 5766575.122242819
+  en  347437.2273837626 5766575.122199986
   ll2 -38.23589206710224 109.25679480724578
 EPSG:325849
   ll  40.20888356028617 112.96180753860006
-  en  3666953.4268422923 4452787.276647645
-  ll2 40.20888356028306 112.96180753860462
+  en  3666953.4268418523 4452787.276691595
+  ll2 40.208883560283056 112.96180753860462
 EPSG:325949
   ll  -14.246538618712663 111.16491045683226
-  en  3517789.6808880353 8425001.167436097
-  ll2 -14.246538618711451 111.16491045683226
+  en  3517789.6808880283 8425001.167416707
+  ll2 -14.246538618711439 111.16491045683226
 EPSG:32650
   ll  9.877161924846341 119.53983649063838
-  en  778545.0254095691 1092890.6707316192
-  ll2 9.877161924844469 119.53983649060855
+  en  778545.0254095162 1092890.6707452787
+  ll2 9.87716192484447 119.53983649060855
 EPSG:32750
   ll  -29.646256411547412 116.5390917394596
-  en  455389.40541206754 6720322.495409962
-  ll2 -29.646256411549228 116.53909173945958
+  en  455389.4054121365 6720322.495373578
+  ll2 -29.646256411549217 116.53909173945958
 EPSG:325850
   ll  7.616210715276484 116.45258981636005
-  en  3439619.8795211804 841907.9687996974
-  ll2 7.616210715274571 116.45258981636006
+  en  3439619.8795211874 841907.9688102931
+  ll2 7.61621071527457 116.45258981636006
 EPSG:325950
   ll  -76.47164414673738 118.0058453305328
-  en  3526264.360075048 1511961.8656020649
-  ll2 -76.47164414673598 118.0058453305327
+  en  3526264.360074891 1511961.865561353
+  ll2 -76.471644146736 118.0058453305327
 EPSG:32651
   ll  29.894404052484198 123.73791699307937
-  en  571246.6122433494 3307313.232890112
-  ll2 29.894404052485946 123.73791699307941
+  en  571246.6122432377 3307313.232926717
+  ll2 29.894404052485942 123.73791699307941
 EPSG:32751
   ll  -32.31249913837224 123.5620478825476
-  en  552907.9443419812 6424786.563242314
-  ll2 -32.31249913837346 123.56204788254762
+  en  552907.9443418857 6424786.563203663
+  ll2 -32.312499138373454 123.56204788254762
 EPSG:325851
   ll  21.725369416249812 126.95031997743322
-  en  3908772.515333825 2407651.5548884026
+  en  3908772.515333468 2407651.5549167832
   ll2 21.725369416216537 126.95031997750917
 EPSG:325951
   ll  0.7833031741643595 126.9511372405029
-  en  3939972.9174714866 1.0086786231602393E7
-  ll2 0.7833031741624964 126.95113724002216
+  en  3939972.9174714815 1.0086786231603492E7
+  ll2 0.7833031741624945 126.95113724002216
 EPSG:32652
   ll  51.483168367165725 131.7547299698076
-  en  691267.2942619019 5707156.079186594
+  en  691267.2942611603 5707156.0792342
   ll2 51.483168367143975 131.75472996981594
 EPSG:32752
   ll  -40.03951775988635 127.43317318342925
-  en  366330.3564916805 5566680.743082273
+  en  366330.35649203043 5566680.743038411
   ll2 -40.039517759884674 127.43317318342785
 EPSG:325852
   ll  77.67504105601225 126.61987537613251
-  en  3443299.89876606 8623255.149539987
-  ll2 77.67504105600955 126.61987537613504
+  en  3443299.8987664036 8623255.149579968
+  ll2 77.67504105600956 126.61987537613504
 EPSG:325952
   ll  -46.165327233467806 132.73764589755302
-  en  3788543.241547002 4880789.6398782395
+  en  3788543.2415460516 4880789.639831789
   ll2 -46.16532723334611 132.73764589761515
 EPSG:32653
   ll  3.9439937741275237 139.56906177178473
-  en  1007763.0974048767 437331.5026782652
-  ll2 3.9439937741018114 139.5690617707412
+  en  1007763.097404855 437331.5026837871
+  ll2 3.9439937741018096 139.5690617707412
 EPSG:32753
   ll  -28.176037015492348 138.7789296805875
-  en  871098.4449474914 6877512.944509432
-  ll2 -28.17603701545257 138.77892968074894
+  en  871098.4449469668 6877512.944474403
+  ll2 -28.17603701545256 138.77892968074894
 EPSG:325853
   ll  26.083256744062194 136.89345436910952
-  en  3689380.0190074127 2886280.2270284994
-  ll2 26.083256744064073 136.89345436911194
+  en  3689380.0190071813 2886280.227061506
+  ll2 26.08325674406407 136.89345436911194
 EPSG:325953
   ll  -45.87471253428649 134.3177889336392
-  en  3447055.754047501 4919646.390284151
+  en  3447055.754047673 4919646.390237771
   ll2 -45.87471253428452 134.3177889336392
 EPSG:32654
   ll  0.16694081399375094 139.49272157099904
-  en  332258.8768147526 18458.406170670485
-  ll2 0.16694081399369642 139.49272157100194
+  en  332258.8768147528 18458.40617090477
+  ll2 0.1669408139936965 139.49272157100194
 EPSG:32754
   ll  -76.09420937279235 144.16836879822267
-  en  584959.5966815285 1552021.5297055654
-  ll2 -76.09420937278287 144.16836879819374
+  en  584959.5966810205 1552021.529664645
+  ll2 -76.09420937278288 144.16836879819374
 EPSG:325854
   ll  14.035950638187842 140.08015854857118
-  en  3400677.277176571 1551895.6508071357
+  en  3400677.277176608 1551895.6508262574
   ll2 14.035950638186595 140.0801585485713
 EPSG:325954
   ll  -25.929690605130276 144.77860345874333
-  en  3878549.2739416715 7126639.0082158
-  ll2 -25.92969060509769 144.77860345887737
+  en  3878549.273941212 7126639.008182952
+  ll2 -25.929690605097683 144.77860345887737
 EPSG:32655
   ll  15.325514479625792 147.8741788025552
-  en  593840.2220570977 1694519.0742468603
+  en  593840.2220570564 1694519.0742676193
   ll2 15.325514479624902 147.87417880255512
 EPSG:32755
   ll  -5.430354355649115 147.0530080779711
-  en  505872.1762453691 9399764.410425376
-  ll2 -5.4303543556475145 147.0530080779711
+  en  505872.1762453687 9399764.41041779
+  ll2 -5.4303543556475065 147.0530080779711
 EPSG:325855
   ll  77.98041139164597 150.59532728556897
-  en  3583530.963803517 8658747.741974797
-  ll2 77.98041139163261 150.59532728547734
+  en  3583530.96380301 8658747.742014583
+  ll2 77.98041139163263 150.59532728547734
 EPSG:325955
   ll  -67.36971313700667 147.14032372466914
-  en  3506025.407677955 2527397.536064663
-  ll2 -67.36971313700816 147.14032372466914
+  en  3506025.4076779224 2527397.5360194147
+  ll2 -67.36971313700812 147.14032372466914
 EPSG:32656
   ll  5.776293589970747 152.597733111241
-  en  455463.17900960357 638491.4093577674
+  en  455463.1790096064 638491.4093658334
   ll2 5.7762935899690815 152.597733111241
 EPSG:32756
   ll  -52.48522451023355 152.57450200005235
-  en  471106.27600193914 4184906.403091411
-  ll2 -52.485224510233 152.57450200005235
+  en  471106.2760020543 4184906.403043689
+  ll2 -52.48522451023301 152.57450200005235
 EPSG:325856
   ll  75.75021549023971 156.78618479521796
-  en  3603965.8052291954 8410644.654282555
-  ll2 75.75021549021349 156.7861847950757
+  en  3603965.805228576 8410644.65432367
+  ll2 75.75021549021349 156.78618479507574
 EPSG:325956
   ll  -76.53705419120314 152.6360393265017
-  en  3490541.0647842125 1504857.830609316
-  ll2 -76.53705419120172 152.63603932650176
+  en  3490541.0647842693 1504857.8305686433
+  ll2 -76.53705419120173 152.63603932650176
 EPSG:32657
   ll  46.64079768923685 162.60478038581513
-  en  775876.5142954804 5171562.3541363785
-  ll2 46.64079768913733 162.60478038586604
+  en  775876.5142945569 5171562.354182974
+  ll2 46.64079768913732 162.60478038586604
 EPSG:32757
   ll  -20.68227265660569 154.09167529202733
-  en  -11660.993970737094 7705261.802396575
+  en  -11660.993970328185 7705261.802369376
   ll2 -20.682272656454817 154.09167529182264
 EPSG:325857
   ll  -2.5518216908727664 156.83036399626832
-  en  3258753.8207376907 -282258.2813178281
-  ll2 -2.5518216908720084 156.8303639962868
+  en  3258753.8207376944 -282258.2813214059
+  ll2 -2.5518216908720093 156.8303639962868
 EPSG:325957
   ll  -58.994723879002095 160.57399408839512
-  en  3590438.094553198 3459470.6390705984
-  ll2 -58.994723879002954 160.5739940883954
+  en  3590438.0945527772 3459470.639023086
+  ll2 -58.99472387900292 160.5739940883954
 EPSG:32658
   ll  -0.9538168752974308 164.16373403116563
-  en  406954.01883056527 -105436.82507170015
+  en  406954.0188305655 -105436.82507303856
   ll2 -0.9538168752971062 164.16373403116577
 EPSG:32758
   ll  -6.482322318456696 161.77847911397538
-  en  143617.7405418142 9282345.981199916
-  ll2 -6.482322318452886 161.77847911410754
+  en  143617.7405418452 9282345.981190877
+  ll2 -6.4823223184528835 161.77847911410754
 EPSG:325858
   ll  -2.586076572514262 164.68386700435784
-  en  3464857.7205824726 -285845.48557758867
-  ll2 -2.5860765725134036 164.68386700435784
+  en  3464857.720582473 -285845.48558121437
+  ll2 -2.586076572513404 164.68386700435784
 EPSG:325958
   ll  -17.66251906484051 161.38408849981434
-  en  3116279.3397856224 8043474.1537269335
+  en  3116279.339785848 8043474.153703289
   ll2 -17.662519064826686 161.38408849985055
 EPSG:32659
   ll  40.50129189541295 171.1151678182983
-  en  509758.42722014955 4483404.501491217
-  ll2 40.5012918954116 171.1151678182983
+  en  509758.4272201235 4483404.501535325
+  ll2 40.50129189541159 171.1151678182983
 EPSG:32759
   ll  -9.653111284693267 166.1444317382442
-  en  -33309.99683990399 8929144.290530233
-  ll2 -9.653111284606686 166.1444317392922
+  en  -33309.996839801664 8929144.290516876
+  ll2 -9.653111284606682 166.1444317392922
 EPSG:325859
   ll  52.00257317380204 174.55502943709467
-  en  3744002.8755539446 5767293.0956975175
-  ll2 52.00257317370481 174.55502943709706
+  en  3744002.875552985 5767293.0957451705
+  ll2 52.0025731737048 174.55502943709706
 EPSG:325959
   ll  -14.819657409628974 166.9501496486915
-  en  3063930.2734063175 8357673.865288307
+  en  3063930.273406502 8357673.8652681885
   ll2 -14.819657409599175 166.95014964886468
 EPSG:32660
   ll  84.38466705329412 178.8187390897748
-  en  519865.4438073318 9371350.999696868
-  ll2 84.38466705329246 178.81873908977406
+  en  519865.4438072069 9371350.999732465
+  ll2 84.38466705329247 178.81873908977406
 EPSG:32760
   ll  -36.29211488935783 181.82910716731914
-  en  933779.9449722095 5972815.905785862
-  ll2 -36.29211488900613 181.82910716792168
+  en  933779.9449712461 5972815.905744288
+  ll2 -36.292114889006136 181.82910716792168
 EPSG:325860
   ll  70.40119916139271 174.88104576259516
-  en  3420687.695948791 7811996.652124123
-  ll2 70.40119916139157 174.88104576259576
+  en  3420687.695949238 7811996.6521680625
+  ll2 70.4011991613916 174.88104576259576
 EPSG:325960
   ll  -15.122420619100339 174.82953069805916
-  en  3266743.1016437085 8326980.665472434
-  ll2 -15.122420619099692 174.82953069806615
+  en  3266743.101643809 8326980.665451931
+  ll2 -15.122420619099696 174.82953069806615
 EPSG:31466
   ll  7.0210401440287065 6.5142293675331056
-  en  2556811.4867490134 776341.9609306954
-  ll2 7.02104014402688 6.514229367533091
+  en  2556811.486749014 776341.9609297712
+  ll2 7.021040144026878 6.5142293675330905
 EPSG:31467
   ll  49.4988750014639 7.261117510799364
-  en  3374117.1277635554 5486123.24397088
-  ll2 49.498875001461215 7.261117510798089
+  en  3374117.1277635116 5486123.243966412
+  ll2 49.498875001461215 7.261117510798085
 EPSG:31468
   ll  48.209523046432196 13.141810876019548
-  en  4584969.35019622 5341912.8445891375
-  ll2 48.20952304643041 13.141810876019694
+  en  4584969.350196248 5341912.844584694
+  ll2 48.20952304643043 13.14181087601969
 EPSG:31469
   ll  75.71474879775388 16.230800026412393
-  en  5533907.888998098 8406162.27195649
-  ll2 75.71474879775266 16.230800026412272
+  en  5533907.888998117 8406162.271952605
+  ll2 75.7147487977527 16.230800026412293
 EPSG:31370
   ll  49.91513996934379 3.0892264075922404
-  en  58108.251968110315 67871.94607539475
-  ll2 49.91513997291576 3.08922640542773
+  en  58108.251968638695 67871.94610605389
+  ll2 49.91513997291573 3.0892264054277314
 EPSG:3812
   ll  50.76787953358437 3.4513353977071453
-  en  585284.6677647613 662323.5758590336
+  en  585284.6677650046 662323.5758590293
   ll2 50.76787953358439 3.4513353977071453
 EPSG:3301
   ll  59.493759099912154 27.525338967200614
-  en  699626.8833699154 6600366.426437224
-  ll2 59.49375909991211 27.525338967200614
+  en  699626.8833689764 6600366.426436952
+  ll2 59.49375909991213 27.525338967200614
 EPSG:27561
   ll  48.687023294540744 9.13470536591202
@@ -1015 +1015 @@
 EPSG:2154
   ll  50.02689509732728 -4.49984483215602
-  en  162883.9772730763 7017576.164755409
-  ll2 50.02689509732727 -4.499844832156021
+  en  162883.97727507062 7017576.164756147
+  ll2 50.0268950973273 -4.499844832156021
 EPSG:3942
   ll  42.50224953559769 -0.5066786018577263
-  en  1411858.9854810848 1261685.995759348
-  ll2 42.50224953559774 -0.5066786018577276
+  en  1411858.985481917 1261685.9957595589
+  ll2 42.50224953559774 -0.5066786018577272
 EPSG:3943
   ll  43.90555462555216 9.09689182480521
-  en  2189372.913288325 2318369.8170035826
-  ll2 43.90555462555218 9.09689182480521
+  en  2189372.9132868364 2318369.8170038997
+  ll2 43.9055546255522 9.096891824805208
 EPSG:3944
   ll  43.19615820273569 -2.2408194587228754
-  en  1274301.6555926844 3124223.738855683
+  en  1274301.655593946 3124223.7388553144
   ll2 43.19615820273572 -2.240819458722875
 EPSG:3945
   ll  42.57364172140781 -4.367440068101999
-  en  1095466.1808765102 3957858.43069471
-  ll2 42.57364172140786 -4.367440068101999
+  en  1095466.1808782574 3957858.4306936576
+  ll2 42.57364172140783 -4.367440068101998
 EPSG:3946
   ll  46.450766039756 -1.5829952343218343
-  en  1348093.5108608257 5260228.682927705
+  en  1348093.5108619956 5260228.6829278115
   ll2 46.450766039756004 -1.5829952343218343
 EPSG:3947
   ll  45.274573855216566 8.148993756717044
-  en  2103893.81355221 6021477.631197159
-  ll2 45.27457385521657 8.148993756717047
+  en  2103893.8135509207 6021477.631196574
+  ll2 45.27457385521657 8.148993756717044
 EPSG:3948
   ll  47.57690494420086 8.633366759947714
-  en  2123416.1310860123 7168437.373687114
-  ll2 47.576904944200855 8.633366759947716
+  en  2123416.1310845516 7168437.373686953
+  ll2 47.576904944200855 8.633366759947712
 EPSG:3949
   ll  47.36655471156381 -1.410864163556286
-  en  1366910.6256532879 8028041.335254529
-  ll2 47.366554711563836 -1.410864163556286
+  en  1366910.6256544283 8028041.335254104
+  ll2 47.36655471156381 -1.410864163556286
 EPSG:3950
   ll  48.0634969752751 -5.238953399372484
-  en  1086868.3138795379 9018423.494771458
-  ll2 48.06349697527513 -5.238953399372484
+  en  1086868.313881684 9018423.494770935
+  ll2 48.06349697527511 -5.23895339937248
 EPSG:2969
   ll  18.09195682909748 -62.90557198327498
-  en  509756.8708481902 2000799.1723759603
-  ll2 18.09195680430761 -62.90557196864033
+  en  509756.870848181 2000799.1724028364
+  ll2 18.0919568043076 -62.90557196864032
 EPSG:2970
   ll  16.041843969107557 -61.20853416213802
-  en  692080.8032093428 1774695.523838184
-  ll2 16.041843952489803 -61.20853418759283
+  en  692080.8032091985 1774695.5238623084
+  ll2 16.0418439524898 -61.20853418759283
 EPSG:2973
   ll  14.407542336386097 -60.935843452421075
-  en  722168.2113896341 1593628.3259849115
-  ll2 14.407542351752149 -60.9358434333617
+  en  722168.211389498 1593628.3260067657
+  ll2 14.407542351752163 -60.93584343336168
 EPSG:2975
   ll  -16.18983230787581 40.123852994258414
-  en  -1326413.3757498197 8133460.39249723
-  ll2 -16.1898317437789 40.123861163806986
+  en  -1326413.3757486297 8133460.392475484
+  ll2 -16.189831743778907 40.12386116380699
 EPSG:2972
   ll  8.207268629853019 -50.21680809669106
-  en  586265.5532873815 907296.005708784
-  ll2 8.207268629851075 -50.216808096691146
+  en  586265.5532873704 907296.005720186
+  ll2 8.207268629851077 -50.216808096691146
 EPSG:3059
   ll  49.23525189671949 -54.40128360306443
-  en  -4263130.03445353 2917092.551841937
-  ll2 50178.76820182032 246510.8241427903
+  en  -4263130.034442673 2917092.5518719126
+  ll2 50178.76820064746 246510.82413604847
 EPSG:2180
   ll  49.52724731520737 18.27654136015328
-  en  447661.13055618113 184674.9454229679
-  ll2 49.52724731520596 18.276541360153285
+  en  447661.13055637287 184674.94547026977
+  ll2 49.527247315205926 18.276541360153285
 EPSG:2176
   ll  49.64490220491846 16.279713636209475
-  en  5592415.690627924 5501713.997352062
-  ll2 49.64490220491687 16.27971363620972
+  en  5592415.690627584 5501713.997399415
+  ll2 49.64490220491687 16.279713636209717
 EPSG:2177
   ll  53.90237086111341 17.70353103400919
-  en  6480514.884489967 5974630.160020132
-  ll2 53.90237086111333 17.70353103400919
+  en  6480514.884490048 5974630.160067949
+  ll2 53.90237086111333 17.703531034009195
 EPSG:2178
   ll  51.28025609515727 21.516295219859636
-  en  7536021.072707804 5682953.495812382
-  ll2 51.280256095156325 21.516295219859625
+  en  7536021.072707665 5682953.495859991
+  ll2 51.28025609515634 21.51629521985963
 EPSG:2179
   ll  51.812974050704796 24.579389794413864
-  en  8539953.71577554 5742250.607374487
-  ll2 51.81297405070403 24.579389794413864
+  en  8539953.715775384 5742250.607422158
+  ll2 51.812974050704014 24.57938979441386
 EPSG:3008
   ll  61.864054488897295 13.084399903079879
-  en  128126.42078848666 6861850.502077561
-  ll2 61.86405448889924 13.084399903079852
+  en  128126.42078859449 6861850.502124558
+  ll2 61.86405448889923 13.084399903079852
 EPSG:21781
   ll  46.582471410091934 8.159223152110604
-  en  655231.0208783296 159275.39179139063
-  ll2 46.582471420059235 8.159223160343664
+  en  655231.0208778976 159275.39184032555
+  ll2 46.58247142005926 8.159223160343661

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
@@ -15 +17 @@
 public class Ellipsoid {
     /**
-     * Clarke's ellipsoid (NTF system)
-     */
-    public static final Ellipsoid clarke = new Ellipsoid(6378249.2, 6356515.0);
+     * Clarke 1880 IGN (French national geographic institute)
+     */
+    public static final Ellipsoid clarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
     /**
      * Hayford's ellipsoid 1909 (ED50 system)
      * Proj.4 code: intl
      */
-    public static final Ellipsoid hayford =
-        new Ellipsoid(6378388.0, 6356911.9461);
+    public static final Ellipsoid hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
     /**
      * GRS80 ellipsoid
      */
-    public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.3141);
+    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
 
     /**
      * WGS84 ellipsoid
      */
-    public static final Ellipsoid WGS84 = new Ellipsoid(6378137.0, 6356752.3142);
+    public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
 
     /**
      * Bessel 1841 ellipsoid
      */
-    public static final Ellipsoid Bessel1841 = new Ellipsoid(6377397.155, 6356078.962822);
+    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
 
     /**
@@ -62 +63 @@
 
     /**
-     * create a new ellipsoid and precompute its parameters
-     *
-     * @param a ellipsoid long axis (in meters)
-     * @param b ellipsoid short axis (in meters)
-     */
-    public Ellipsoid(double a, double b) {
+     * private constructur - use one of the create_* methods
+     *
+     * @param a semimajor radius of the ellipsoid axis
+     * @param b semiminor radius of the ellipsoid axis
+     * @param e first eccentricity of the ellipsoid ( = sqrt((a*a - b*b)/(a*a)))
+     * @param e2 first eccentricity squared
+     * @param eb2 square of the second eccentricity
+     */
+    private Ellipsoid(double a, double b, double e, double e2, double eb2) {
         this.a = a;
         this.b = b;
-        e2 = (a*a - b*b) / (a*a);
-        e = Math.sqrt(e2);
-        eb2 = e2 / (1.0 - e2);
+        this.e = e;
+        this.e2 = e2;
+        this.eb2 = eb2;
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param b semiminor radius of the ellipsoid axis (in meters)
+     */
+    public static Ellipsoid create_a_b(double a, double b) {
+        double e2 = (a*a - b*b) / (a*a);
+        double e = Math.sqrt(e2);
+        double eb2 = e2 / (1.0 - e2);
+        return new Ellipsoid(a, b, e, e2, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param es first eccentricity squared
+     */
+    public static Ellipsoid create_a_es(double a, double es) {
+        double b = a * Math.sqrt(1.0 - es);
+        double e = Math.sqrt(es);
+        double eb2 = es / (1.0 - es);
+        return new Ellipsoid(a, b, e, es, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param f flattening ( = (a - b) / a)
+     */
+    public static Ellipsoid create_a_f(double a, double f) {
+        double b = a * (1.0 - f);
+        double e2 = f * (2 - f);
+        double e = Math.sqrt(e2);
+        double eb2 = e2 / (1.0 - e2);
+        return new Ellipsoid(a, b, e, e2, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param rf inverse flattening
+     */
+    public static Ellipsoid create_a_rf(double a, double rf) {
+        return create_a_f(a, 1.0 / rf);
     }
 

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

@@ -100 +100 @@
     private void updateParameters(final int layoutZone) {
         this.layoutZone = layoutZone;
-        ellps = Ellipsoid.clarke;
+        ellps = Ellipsoid.clarkeIGN;
         datum = null; // no datum needed, we have a shift file
         nadgrids = ntf_rgf93Grid;

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

@@ -24 +24 @@
 /**
  * This class implements all projections for French departements in the Caribbean Sea and
- * Indian Ocean using the UTM transvers Mercator projection and specific geodesic settings (7 parameters transformation algorithm).
+ * Indian Ocean using the UTM transvers Mercator projection and specific geodesic settings.
  *
  */