Changeset 5232 in josm

Timestamp:

May 11, 2012 11:27:54 PM (12 months ago)

Author:

bastiK

Message:

change UTM datum to WGS84. This is correct according to Wikipedia and EPSG, also there is no big difference.

Location:

trunk

Files:

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

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

@@ -11 +11 @@
 EPSG:32601
   ll  35.30468974675124 -181.75048187801644
-  en  67958.20646119962 3917197.8124532704
+  en  67958.20646357589 3917197.812559492
   ll2 35.304689746452496 -181.75048187860767
 EPSG:32701
   ll  -29.00158099669585 -176.06257492764095
-  en  591305.9239693269 6791477.063002806
-  ll2 -29.00158099669775 -176.06257492764087
+  en  591305.9239689747 6791477.062909814
+  ll2 -29.001580996697747 -176.06257492764087
 EPSG:325801
   ll  34.015203682036415 -174.10932266644403
-  en  3766942.916354276 3767610.668975631
+  en  3766942.9163529025 3767610.6690794528
   ll2 34.01520368202457 -174.10932266640262
 EPSG:325901
   ll  -42.67913028411371 -177.38213711327558
-  en  3468691.03003378 5274745.459798486
+  en  3468691.0300340164 5274745.459681193
   ll2 -42.67913028411191 -177.38213711327558
 EPSG:32602
   ll  -0.35895685791257925 -175.75420623162898
-  en  -29625.972570106504 -39813.425706580696
+  en  -29625.972570086014 -39813.425707889146
   ll2 -0.3589568579093727 -175.75420623022703
 EPSG:32702
   ll  -83.61115414945169 -167.84722307361665
-  en  539148.6502871878 714244.7351826783
-  ll2 -83.61115414944906 -167.84722307364663
+  en  539148.6502865502 714244.7350888532
+  ll2 -83.61115414944909 -167.84722307364663
 EPSG:325802
   ll  2.6279660285514383 -169.71220572390703
-  en  3643161.6457097307 290545.0278534355
-  ll2 2.6279660285505946 -169.7122057239083
+  en  3643161.6457097256 290545.02786300523
+  ll2 2.6279660285505937 -169.7122057239083
 EPSG:325902
   ll  -28.96646509876222 -171.82985672429754
-  en  3419144.4239390944 6795446.163479919
-  ll2 -28.96646509876412 -171.8298567242976
+  en  3419144.423939406 6795446.163387009
+  ll2 -28.96646509876411 -171.8298567242976
 EPSG:32603
   ll  69.06942592353653 -164.25619547568132
-  en  529653.4230751682 7662283.255524441
+  en  529653.423074742 7662283.255640146
   ll2 69.06942592353752 -164.2561954756813
 EPSG:32703
   ll  -59.67977504854512 -165.75611289241155
-  en  457419.4744482368 3384008.125243295
-  ll2 -59.679775048546745 -165.75611289241158
+  en  457419.4744487591 3384008.1251201406
+  ll2 -59.67977504854674 -165.75611289241158
 EPSG:325803
   ll  28.858993819881626 -162.7838300413958
-  en  3716176.1007957025 3194382.0292447736
+  en  3716176.1007948755 3194382.0293374225
   ll2 28.858993819882425 -162.7838300413879
 EPSG:325903
   ll  -35.88579209756221 -163.3314276698056
-  en  3650607.709485902 6027433.062796038
-  ll2 -35.88579209756188 -163.33142766980347
+  en  3650607.709485052 6027433.062688716
+  ll2 -35.885792097561875 -163.33142766980347
 EPSG:32604
   ll  68.49291330851102 -162.96491579603722
-  en  337874.4125191887 7603043.066310625
-  ll2 68.49291330842263 -162.96491579584514
+  en  337874.41252150084 7603043.066426898
+  ll2 68.49291330842262 -162.96491579584512
 EPSG:32704
   ll  -44.74896637041389 -154.13571225132324
-  en  885055.0000368692 5033414.625307778
-  ll2 -44.74896636985852 -154.13571225126154
+  en  885055.000033729 5033414.625188409
+  ll2 -44.74896636985849 -154.13571225126154
 EPSG:325804
   ll  19.1602869192667 -157.27161512731934
-  en  3681759.207167466 2119462.977039635
-  ll2 19.160286919267307 -157.27161512732005
+  en  3681759.2071671444 2119462.9771057065
+  ll2 19.1602869192673 -157.27161512732008
 EPSG:325904
   ll  -5.554243793843327 -162.73688821077442
-  en  3085827.031990898 9384761.239808826
-  ll2 -5.554243793834865 -162.73688821046227
+  en  3085827.0319909714 9384761.239788674
+  ll2 -5.554243793834859 -162.73688821046227
 EPSG:32605
   ll  70.45567827510386 -154.8711613318192
-  en  430146.78517398844 7817765.523571888
-  ll2 70.45567827510362 -154.87116133181905
+  en  430146.7851750106 7817765.523685955
+  ll2 70.45567827510365 -154.87116133181905
 EPSG:32705
   ll  -4.570782032538887 -155.6804518141318
-  en  202567.2406829322 9494225.759791898
-  ll2 -4.570782032537404 -155.68045181407837
+  en  202567.24068296672 9494225.759775288
+  ll2 -4.570782032537401 -155.68045181407837
 EPSG:325805
   ll  47.558680099626386 -152.91349009536611
-  en  3506508.0942535857 5267254.870684492
-  ll2 47.55868009962459 -152.91349009536611
+  en  3506508.0942535275 5267254.870806244
+  ll2 47.558680099624596 -152.91349009536611
 EPSG:325905
   ll  -67.03448585424093 -149.10915557769007
-  en  3669319.3499093484 2559479.4428590117
-  ll2 -67.03448585415077 -149.10915557784642
+  en  3669319.349906984 2559479.4427412134
+  ll2 -67.03448585415079 -149.10915557784642
 EPSG:32606
   ll  45.0472445968384 -147.48643385071935
-  en  461693.09169658035 4988313.77684164
-  ll2 45.0472445968364 -147.48643385071935
+  en  461693.09169689566 4988313.776961381
+  ll2 45.04724459683641 -147.48643385071935
 EPSG:32706
   ll  -55.61672629832347 -144.3508810047789
-  en  666829.6103004229 3833392.5733688306
-  ll2 -55.616726298307896 -144.35088100477645
+  en  666829.6102985529 3833392.573244692
+  ll2 -55.61672629830789 -144.35088100477645
 EPSG:325806
   ll  23.646357967189935 -146.93885809543016
-  en  3506235.685318117 2615075.6779000983
-  ll2 23.646357967191562 -146.93885809543016
+  en  3506235.6853181007 2615075.677979285
+  ll2 23.64635796719157 -146.93885809543016
 EPSG:325906
   ll  -23.95563872144256 -148.58426057256983
-  en  3338794.1024049437 7349779.778237117
-  ll2 -23.95563872144436 -148.58426057257037
+  en  3338794.1024053795 7349779.778157079
+  ll2 -23.955638721444366 -148.58426057257037
 EPSG:32607
   ll  17.160888392541953 -136.88735017825638
-  en  937701.094417824 1901994.1782452706
-  ll2 17.160888392505495 -136.88735017834057
+  en  937701.0944171889 1901994.1783050983
+  ll2 17.1608883925055 -136.88735017834057
 EPSG:32707
   ll  -0.22277876804946573 -136.6505910806773
-  en  984445.3083007026 9975304.651946427
-  ll2 -0.22277876804841795 -136.65059108151155
+  en  984445.3083006871 9975304.651945615
+  ll2 -0.22277876804841829 -136.65059108151155
 EPSG:325807
   ll  25.601252661823878 -143.02480961724422
-  en  3296655.8731586495 2833079.3110586395
+  en  3296655.873159273 2833079.31114311
   ll2 25.601252661825626 -143.02480961724746
 EPSG:325907
   ll  -59.282020025193475 -144.22706620376516
-  en  3316162.4281931287 3424091.6680851756
-  ll2 -59.282020025147276 -144.22706620374979
+  en  3316162.4281953657 3424091.6679619113
+  ll2 -59.28202002514724 -144.22706620374979
 EPSG:32608
   ll  17.082700048931713 -138.83952009347482
-  en  91233.83062257856 1892731.3619947187
-  ll2 17.082700048910112 -138.8395200934112
+  en  91233.83062316518 1892731.362054299
+  ll2 17.082700048910105 -138.8395200934112
 EPSG:32708
   ll  -2.768962687806777 -135.91033889187207
-  en  398815.28724407573 9693905.200377401
-  ll2 -2.7689626878058715 -135.91033889187185
+  en  398815.28724407975 9693905.200367318
+  ll2 -2.768962687805876 -135.91033889187185
 EPSG:325808
   ll  55.46393358936174 -136.5310213256191
-  en  3403200.192251288 6147484.959337253
+  en  3403200.1922523687 6147484.959461425
   ll2 55.46393358936161 -136.53102132561946
 EPSG:325908
   ll  -24.378151080790772 -130.28090785994982
-  en  3978930.365308256 7295752.519605472
-  ll2 -24.37815108065391 -130.28090785952696
+  en  3978930.3653069055 7295752.519524297
+  ll2 -24.37815108065392 -130.28090785952696
 EPSG:32609
   ll  32.88791124498886 -124.7743273825516
-  en  895391.2108986392 3646786.76295606
-  ll2 32.88791124486647 -124.7743273822095
+  en  895391.2108967202 3646786.763057612
+  ll2 32.88791124486649 -124.7743273822095
 EPSG:32709
   ll  -32.79190171964473 -131.727811570545
-  en  244542.4984259253 6368487.503790178
+  en  244542.49842715668 6368487.503688801
   ll2 -32.79190171963808 -131.7278115705747
 EPSG:325809
   ll  66.39751696914044 -132.53678032719117
-  en  3342048.402382383 7368688.671674355
-  ll2 66.39751696908732 -132.53678032712693
+  en  3342048.4023845675 7368688.671792787
+  ll2 66.39751696908735 -132.53678032712693
 EPSG:325909
   ll  -57.01846507460095 -131.70959025726978
-  en  3335504.639292711 3677294.8858338
-  ll2 -57.01846507458397 -131.70959025727063
+  en  3335504.639294616 3677294.885709851
+  ll2 -57.018465074583965 -131.70959025727063
 EPSG:32610
   ll  15.621043862710906 -127.89205445312605
-  en  -24932.886805270216 1733063.1625865793
-  ll2 15.621043862587435 -127.89205445274152
+  en  -24932.886804628302 1733063.1626414557
+  ll2 15.621043862587436 -127.89205445274152
 EPSG:32710
   ll  1.5712020890239131 -124.21146729170505
-  en  365234.27228588547 1.0173704546355614E7
-  ll2 1.5712020890234017 -124.21146729170411
+  en  365234.2722858875 1.0173704546361338E7
+  ll2 1.5712020890233884 -124.21146729170411
 EPSG:325810
   ll  54.157170253882065 -120.70356806888559
-  en  3649949.876263099 6003445.228089606
-  ll2 54.15717025387513 -120.70356806888299
+  en  3649949.8762614774 6003445.228213763
+  ll2 54.15717025387514 -120.70356806888299
 EPSG:325910
   ll  -30.490160906382584 -127.43018201881836
-  en  3074627.604333371 6618544.243622576
-  ll2 -30.49016090624539 -127.43018201925888
+  en  3074627.6043351754 6618544.243526176
+  ll2 -30.490160906245404 -127.43018201925888
 EPSG:32611
   ll  10.73641510533119 -112.16478744764923
-  en  1029269.769924939 1191002.712698909
-  ll2 10.736415105240711 -112.16478744856084
+  en  1029269.7699246185 1191002.7127373696
+  ll2 10.73641510524071 -112.16478744856084
 EPSG:32711
   ll  -41.091261924884776 -120.17689123197003
-  en  233168.61639843025 5446247.135338474
-  ll2 -41.091261924846485 -120.17689123202507
+  en  233168.6164003252 5446247.135223156
+  ll2 -41.09126192484649 -120.17689123202507
 EPSG:325811
   ll  27.495781449917963 -118.48664637570047
-  en  3353144.9333343757 3042229.273928431
+  en  3353144.9333348894 3042229.27401776
   ll2 27.49578144991998 -118.48664637570127
 EPSG:325911
   ll  -83.43763157076992 -113.13504259887196
-  en  3549277.517097025 733034.8190459218
+  en  3549277.5170962233 733034.8189518023
   ll2 -83.4376315707652 -113.13504259905538
 EPSG:32612
   ll  61.77560053459669 -114.5125390548194
-  en  314735.1980801266 6854188.165880746
-  ll2 61.775600534527385 -114.51253905477125
+  en  314735.1980824949 6854188.166002769
+  ll2 61.77560053452742 -114.51253905477127
 EPSG:32712
   ll  -79.76744100986106 -115.94410343190378
-  en  402063.9138525112 1140210.103035383
+  en  402063.9138540749 1140210.1029349882
   ll2 -79.76744100981378 -115.94410343026465
 EPSG:325812
   ll  54.732336878937645 -111.71907573020027
-  en  3453696.4850422824 6065244.03333854
+  en  3453696.4850427904 6065244.0334627405
   ll2 54.73233687893784 -111.71907573020029
 EPSG:325912
   ll  -47.5968969661014 -107.10151995235918
-  en  3793046.941678068 4721134.191560568
-  ll2 -47.59689696593998 -107.10151995231445
+  en  3793046.9416754395 4721134.191438857
+  ll2 -47.596896965940005 -107.10151995231445
 EPSG:32613
   ll  4.7583779488046805 -107.92602632992818
-  en  175381.12258360465 526643.9141952256
+  en  175381.12258364592 526643.9142125123
   ll2 4.758377948802733 -107.92602632984342
 EPSG:32713
   ll  -10.850887170003276 -108.88425627320359
-  en  75152.58517297846 8797793.856462443
-  ll2 -10.850887169984928 -108.88425627294212
+  en  75152.58517323522 8797793.856423587
+  ll2 -10.85088716998492 -108.88425627294212
 EPSG:325813
   ll  66.20959551417033 -109.09161210111962
-  en  3315926.7644546847 7349289.909941929
+  en  3315926.7644572235 7349289.910060517
   ll2 66.20959551403949 -109.09161210087801
 EPSG:325913
   ll  -68.06851091663657 -109.88775790882875
-  en  3296450.8095041467 2441437.2409912376
-  ll2 -68.0685109163161 -109.88775790756799
+  en  3296450.809507033 2441437.240874543
+  ll2 -68.0685109163161 -109.88775790756797
 EPSG:32614
   ll  14.263757165950743 -100.80954124472483
-  en  304782.4591081125 1577656.5829572342
-  ll2 14.263757165949812 -100.80954124472157
+  en  304782.4591083076 1577656.5830076581
+  ll2 14.26375716594981 -100.80954124472157
 EPSG:32714
   ll  -56.89459290929925 -97.364159691813
-  en  599649.1533364999 3693155.6676022783
-  ll2 -56.89459290929931 -97.36415969181257
+  en  599649.1533353492 3693155.667478282
+  ll2 -56.89459290929932 -97.36415969181257
 EPSG:325814
   ll  14.867593373898092 -94.551911603902
-  en  3978916.379349831 1648458.2510624563
-  ll2 14.867593373838208 -94.55191160418451
+  en  3978916.3793493 1648458.2511148695
+  ll2 14.867593373838202 -94.55191160418451
 EPSG:325914
   ll  -8.277332733762591 -96.31304814961656
-  en  3796001.0760477674 9084042.618134554
+  en  3796001.0760476636 9084042.61810469
   ll2 -8.277332733760499 -96.3130481496617
 EPSG:32615
   ll  84.67761930424092 -95.31735150114109
-  en  476007.3905250701 9404225.272798516
+  en  476007.39052546234 9404225.272890447
   ll2 84.67761930423927 -95.31735150113857
 EPSG:32715
   ll  -15.188620247220271 -96.23707027363224
-  en  152136.94772561447 8318235.034964591
-  ll2 -15.188620247214832 -96.23707027358184
+  en  152136.94772601099 8318235.034911122
+  ll2 -15.188620247214823 -96.23707027358184
 EPSG:325815
   ll  29.659566775760396 -89.14648624583667
-  en  3873068.977746305 3287277.6744142915
-  ll2 29.65956677570854 -89.14648624564235
+  en  3873068.977744801 3287277.674508805
+  ll2 29.659566775708548 -89.14648624564234
 EPSG:325915
   ll  -69.26764450162177 -95.62116552395997
-  en  3396471.3392126877 2313578.57524251
-  ll2 -69.26764450161576 -95.62116552395555
+  en  3396471.3392141797 2313578.5751270596
+  ll2 -69.26764450161575 -95.62116552395555
 EPSG:32616
   ll  72.583548496096 -84.95707014904738
-  en  568238.7416447669 8055185.31738377
-  ll2 72.58354849609476 -84.95707014904791
+  en  568238.7416437431 8055185.317495109
+  ll2 72.58354849609479 -84.95707014904791
 EPSG:32716
   ll  -4.559807376181936 -82.52818257741919
-  en  996538.1905094895 9494450.775039427
-  ll2 -4.559807376156718 -82.52818257832048
+  en  996538.1905094216 9494450.775022857
+  ll2 -4.559807376156723 -82.52818257832048
 EPSG:325816
   ll  39.03683531082378 -91.32884532853011
-  en  3125277.835414457 4329789.181616223
-  ll2 39.036835310608836 -91.32884532882264
+  en  3125277.8354169023 4329789.181728653
+  ll2 39.03683531060886 -91.32884532882265
 EPSG:325916
   ll  -80.48202922319493 -83.22512570057863
-  en  3569637.6103784996 1062348.3033781778
+  en  3569637.610377383 1062348.303278951
   ll2 -80.48202922318502 -83.2251257007239
 EPSG:32617
   ll  58.773416508274885 -79.23342848764487
-  en  602152.1264270776 6516169.077161058
-  ll2 58.77341650827501 -79.23342848764443
+  en  602152.1264258481 6516169.07728455
+  ll2 58.77341650827502 -79.23342848764443
 EPSG:32717
   ll  -66.29192836668584 -83.46326129024452
-  en  389503.5113198902 2645374.9496152718
+  en  389503.5113214161 2645374.949496709
   ll2 -66.2919283666812 -83.46326129024257
 EPSG:325817
   ll  74.22922998811548 -82.2572616625563
-  en  3461860.385315083 8238014.811450425
-  ll2 74.22922998811468 -82.25726166255625
+  en  3461860.3853156655 8238014.811559495
+  ll2 74.22922998811474 -82.25726166255623
 EPSG:325917
   ll  -26.672436697539396 -84.93179949462775
-  en  3108597.205134038 7043809.945980476
-  ll2 -26.672436697493477 -84.93179949481045
+  en  3108597.205135338 7043809.945893241
+  ll2 -26.67243669749347 -84.93179949481045
 EPSG:32618
   ll  0.8542824171250176 -70.60589399441409
-  en  989382.9848639166 94704.15218649869
+  en  989382.9848638991 94704.1521896124
   ll2 0.854282417120703 -70.6058939952968
 EPSG:32718
   ll  -2.5647882790401297 -76.48884831326323
-  en  334474.62998039176 9716415.67821548
-  ll2 -2.5647882790393246 -76.48884831326058
+  en  334474.62998039776 9716415.67820614
+  ll2 -2.5647882790393166 -76.48884831326058
 EPSG:325818
   ll  54.54759466810166 -70.10559888065576
-  en  3816474.403825868 6055472.389963165
-  ll2 54.54759466746184 -70.10559888135492
+  en  3816474.4038224113 6055472.390087243
+  ll2 54.54759466746183 -70.10559888135492
 EPSG:325918
   ll  -33.09191328447166 -72.04482413314155
-  en  3775823.3851174875 6334637.712071307
-  ll2 -33.09191328445934 -72.04482413309498
+  en  3775823.385116136 6334637.71196932
+  ll2 -33.091913284459345 -72.04482413309498
 EPSG:32619
   ll  9.928164458825613 -66.53356619660251
-  en  770448.326274961 1098474.2069461367
-  ll2 9.92816445882383 -66.53356619662802
+  en  770448.3262748269 1098474.206981794
+  ll2 9.928164458823826 -66.533566196628
 EPSG:32719
   ll  -3.3106740144730935 -68.43248658691562
-  en  563046.3761068041 9634048.929637415
-  ll2 -3.310674014472018 -68.43248658691563
+  en  563046.3761068006 9634048.929625366
+  ll2 -3.3106740144720264 -68.43248658691563
 EPSG:325819
   ll  39.434976410660475 -64.91063669464722
-  en  3851985.018683444 4373034.511309015
+  en  3851985.0186811076 4373034.511422034
   ll2 39.4349764105042 -64.91063669443021
 EPSG:325919
   ll  -78.61538957033292 -73.24424795954134
-  en  3406552.558590757 1269556.436240377
-  ll2 -78.61538957030486 -73.24424795913168
+  en  3406552.5585922375 1269556.4361380748
+  ll2 -78.61538957030484 -73.24424795913168
 EPSG:32620
   ll  -2.6787491025025547 -66.88079230367741
-  en  68302.71810568956 -296768.5025829923
+  en  68302.71810571582 -296768.5025927464
   ll2 -2.678749102496994 -66.88079230325388
 EPSG:32720
   ll  -69.88660504305992 -58.451395274860495
-  en  674428.9741822772 2240266.5275752097
-  ll2 -69.88660504288637 -58.45139527554243
+  en  674428.974179743 2240266.5274605397
+  ll2 -69.88660504288639 -58.451395275542424
 EPSG:325820
   ll  64.49300134007495 -62.979335076288066
-  en  3500992.919768441 7151952.692616433
-  ll2 64.49300134007689 -62.979335076288066
+  en  3500992.919768428 7151952.6927366005
+  ll2 64.49300134007686 -62.97933507628806
 EPSG:325920
   ll  -43.937990691739216 -66.64134489151819
-  en  3207746.9962201663 5128565.959681904
+  en  3207746.99622248 5128565.9595632935
   ll2 -43.93799069164207 -66.64134489159909
 EPSG:32621
   ll  69.83911306601517 -54.4569378254068
-  en  597795.3401817495 7749969.3562632715
+  en  597795.3401803295 7749969.356378063
   ll2 69.83911306601044 -54.4569378254102
 EPSG:32721
   ll  -1.460807694037996 -56.918034017934815
-  en  509117.8203081122 9838536.340691814
-  ll2 -1.4608076940374979 -56.918034017934815
+  en  509117.82030811213 9838536.34068649
+  ll2 -1.460807694037499 -56.918034017934815
 EPSG:325821
   ll  51.21005902867042 -57.379470258439625
-  en  3473493.1777378754 5673253.086097582
-  ll2 51.210059028669455 -57.37947025843962
+  en  3473493.1777381403 5673253.086221185
+  ll2 51.21005902866946 -57.37947025843962
 EPSG:325921
   ll  -49.499296188014874 -52.907039081672345
-  en  3796326.3219693736 4508982.924244817
-  ll2 -49.49929618779303 -52.907039081676324
+  en  3796326.321966555 4508982.924122001
+  ll2 -49.49929618779302 -52.907039081676324
 EPSG:32622
   ll  14.524484069634685 -53.96374810803576
-  en  180556.34691513283 1607806.3026412665
-  ll2 14.524484069631837 -53.96374810799876
+  en  180556.3469154662 1607806.3026925516
+  ll2 14.52448406963183 -53.96374810799876
 EPSG:32722
   ll  -67.51187256863244 -49.8909954222962
-  en  547334.5777225678 2511132.649604654
+  en  547334.5777219022 2511132.649487271
   ll2 -67.5118725686338 -49.89099542229613
 EPSG:325822
   ll  32.61781547095043 -48.537082717209415
-  en  3731092.3180989525 3611597.5391095537
-  ll2 32.61781547094768 -48.537082717192604
+  en  3731092.3180978494 3611597.5392105747
+  ll2 32.617815470947676 -48.537082717192604
 EPSG:325922
   ll  -25.281994693195657 -47.87237423257416
-  en  3814983.707943394 7200152.773748113
-  ll2 -25.28199469318887 -47.872374232534604
+  en  3814983.707942448 7200152.773664493
+  ll2 -25.281994693188874 -47.872374232534604
 EPSG:32623
   ll  16.394157590092313 -42.12374249522621
-  en  807234.0075206581 1814713.5629041612
-  ll2 16.39415759009029 -42.123742495247065
+  en  807234.0075202532 1814713.5629615434
+  ll2 16.3941575900903 -42.123742495247065
 EPSG:32723
   ll  -37.33901138489274 -46.319661481385886
-  en  383102.30125182413 5866702.311983665
+  en  383102.3012525303 5866702.311873849
   ll2 -37.33901138489222 -46.3196614813865
 EPSG:325823
   ll  59.60264479279566 -46.46417576837352
-  en  3417358.7008533455 6608070.849719444
-  ll2 59.60264479279688 -46.464175768373735
+  en  3417358.700854358 6608070.849842624
+  ll2 59.60264479279691 -46.464175768373735
 EPSG:325923
   ll  -42.13335698553909 -40.4994655569372
-  en  3871982.9802154894 5325605.575020785
-  ll2 -42.13335698522217 -40.49946555670925
+  en  3871982.980212735 5325605.574904206
+  ll2 -42.133356985222164 -40.499465556709254
 EPSG:32624
   ll  5.131580338571972 -39.26307503457069
-  en  470842.7842674264 567215.0037270777
-  ll2 5.131580338570434 -39.26307503457069
+  en  470842.78426743025 567215.00374571
+  ll2 5.131580338570435 -39.26307503457069
 EPSG:32724
   ll  -64.98185873306474 -42.631062127293355
-  en  328728.8037991375 2788647.117210606
+  en  328728.8038014539 2788647.117090909
   ll2 -64.98185873299518 -42.631062127215536
 EPSG:325824
   ll  75.09851921359484 -43.6400984567463
-  en  3366931.903010261 8339809.290822947
-  ll2 75.0985192135009 -43.64009845586568
+  en  3366931.903012309 8339809.29093068
+  ll2 75.09851921350091 -43.64009845586568
 EPSG:325924
   ll  -31.757981422607287 -39.62137531657344
-  en  3441153.617764752 6486221.77389003
+  en  3441153.6177650196 6486221.773790808
   ll2 -31.757981422608655 -39.62137531657346
 EPSG:32625
   ll  -0.7883094164596285 -30.122300530621676
-  en  820321.3553729971 -87242.67464272428
+  en  820321.3553729916 -87242.6746455976
   ll2 -0.7883094164592921 -30.12230053070564
 EPSG:32725
   ll  -65.44826790805924 -36.847373771828195
-  en  321704.47542128456 2736137.610177705
+  en  321704.4754237144 2736137.6100584166
   ll2 -65.44826790796357 -36.847373771693476
 EPSG:325825
   ll  65.887938688693 -35.070053830491894
-  en  3405648.9567055693 7308975.393394905
-  ll2 65.88793868869247 -35.070053830491744
+  en  3405648.9567068643 7308975.393513848
+  ll2 65.88793868869246 -35.07005383049174
 EPSG:325925
   ll  -20.030238632621646 -30.349344491897128
-  en  3777295.6626093313 7782974.4080783315
-  ll2 -20.030238632621362 -30.349344491898044
+  en  3777295.662608796 7782974.408009621
+  ll2 -20.03023863262136 -30.34934449189804
 EPSG:32626
   ll  58.43458636013028 -29.168484112078048
-  en  373392.93024546676 6479137.41923432
-  ll2 58.43458636012713 -29.16848411207888
+  en  373392.93024697975 6479137.419357916
+  ll2 58.43458636012712 -29.168484112078875
 EPSG:32726
   ll  -45.64851344048113 -31.882495362328466
-  en  119560.58074823738 4933398.923852939
-  ll2 -45.648513439897464 -31.88249536231209
+  en  119560.58075143833 4933398.9237327585
+  ll2 -45.64851343989748 -31.88249536231209
 EPSG:325826
   ll  14.237460537145964 -29.544168588724947
-  en  3225457.8650447326 1575488.3511764484
-  ll2 14.237460537144733 -29.54416858870695
+  en  3225457.8650450073 1575488.3512267838
+  ll2 14.23746053714473 -29.54416858870695
 EPSG:325926
   ll  4.225147273652084 -28.545819653002344
-  en  3328432.6156485975 1.0467184762321247E7
-  ll2 4.22514727365084 -28.545819652999242
+  en  3328432.6156486133 1.0467184762336606E7
+  ll2 4.22514727365083 -28.545819652999242
 EPSG:32627
   ll  8.344532201175449 -23.182089463285656
-  en  259685.68916583678 923051.0955945052
-  ll2 8.344532201173758 -23.182089463270486
+  en  259685.6891659215 923051.0956246062
+  ll2 8.344532201173756 -23.182089463270486
 EPSG:32727
   ll  -50.934366256586614 -25.166137353819305
-  en  207304.56798171415 4349205.018387153
-  ll2 -50.93436625633737 -25.166137353769805
+  en  207304.56798461726 4349205.018263729
+  ll2 -50.93436625633735 -25.166137353769805
 EPSG:325827
   ll  4.094370919583472 -23.62056064954077
-  en  3209035.3702352606 453034.076636912
+  en  3209035.370235288 453034.07665179943
   ll2 4.0943709195821745 -23.620560649492674
 EPSG:325927
   ll  -44.664066687330894 -19.261717046318168
-  en  3637801.7645427133 5052896.781332008
-  ll2 -44.664066687327825 -19.261717046316264
+  en  3637801.7645415943 5052896.781212638
+  ll2 -44.664066687327804 -19.26171704631626
 EPSG:32628
   ll  22.510955722354655 -11.39208694243174
-  en  871237.6024489189 2493863.447892283
+  en  871237.6024480207 2493863.447968263
   ll2 22.51095572233715 -11.392086942377526
 EPSG:32728
   ll  -75.6414574413936 -19.243865220370584
-  en  382615.2732697887 1600607.7106937915
-  ll2 -75.64145744134242 -19.243865219973983
+  en  382615.2732716046 1600607.7105868515
+  ll2 -75.64145744134245 -19.24386521997399
 EPSG:325828
   ll  49.071084622707566 -17.35584546969967
-  en  3327939.6840005275 5438031.203053855
-  ll2 49.0710846226981 -17.355845469705784
+  en  3327939.684002143 5438031.203176502
+  ll2 49.07108462269811 -17.35584546970578
 EPSG:325928
   ll  -5.379819146453798 -12.53635261155926
-  en  3773025.942903318 9404800.220277136
-  ll2 -5.379819146452313 -12.536352611592484
+  en  3773025.9429032756 9404800.22025761
+  ll2 -5.3798191464523155 -12.536352611592488
 EPSG:32629
   ll  21.147897974547682 -10.932715320979701
-  en  299305.3797181526 2339737.5835313834
+  en  299305.3797185818 2339737.5836034226
   ll2 21.147897974548883 -10.932715320979792
 EPSG:32729
   ll  -83.5333650193571 -5.501531193633692
-  en  543962.8350559046 722665.3615488987
-  ll2 -83.53336501935372 -5.5015311937089555
+  en  543962.835055189 722665.361454945
+  ll2 -83.53336501935372 -5.501531193708958
 EPSG:325829
   ll  41.94383312013957 -8.306514012321347
-  en  3557483.4903532765 4643772.639951887
-  ll2 41.943833120137896 -8.306514012321347
+  en  3557483.4903528546 4643772.640068309
+  ll2 41.943833120137896 -8.306514012321346
 EPSG:325929
   ll  -42.689366117043875 -7.458484785853329
-  en  3626278.709086076 5272527.702488156
-  ll2 -42.689366117041615 -7.4584847858521925
+  en  3626278.7090851218 5272527.70237086
+  ll2 -42.689366117041615 -7.458484785852194
 EPSG:32630
   ll  7.0485574964722595 -2.895336653090574
-  en  511558.98133625096 779118.0296622365
-  ll2 7.0485574964704 -2.8953366530905744
+  en  511558.9813362481 779118.0296877392
+  ll2 7.048557496470399 -2.8953366530905744
 EPSG:32730
   ll  -81.54589940598518 -0.6625327966681755
-  en  538355.0358698581 945086.5608386025
+  en  538355.0358692394 945086.5607411675
   ll2 -81.5458994059829 -0.6625327966706558
 EPSG:325830
   ll  67.8921918268731 -7.824623864366158
-  en  3297541.21053385 7538748.087555732
-  ll2 67.89219182657128 -7.824623863249039
+  en  3297541.210536713 7538748.0876726145
+  ll2 67.89219182657125 -7.824623863249039
 EPSG:325930
   ll  0.4171935875446735 -2.886899629327141
-  en  3512584.9163963683 1.0046112525092991E7
-  ll2 0.41719358754453323 -2.8868996293271394
+  en  3512584.9163963683 1.0046112525094511E7
+  ll2 0.4171935875445257 -2.8868996293271394
 EPSG:32631
   ll  62.31144897764639 -1.7488227034434083
-  en  253972.61139423194 6917912.226847682
-  ll2 62.31144897723161 -1.7488227026127454
+  en  253972.6113974089 6917912.226969319
+  ll2 62.31144897723166 -1.7488227026127516
 EPSG:32731
   ll  -77.7299649478657 6.793662551026102
-  en  589941.1445325612 1368855.445881633
-  ll2 -77.72996494784715 6.7936625508781106
+  en  589941.1445311456 1368855.4457779005
+  ll2 -77.72996494784715 6.793662550878116
 EPSG:325831
   ll  -3.7939968357153786 -1.1712382629044498
-  en  3036447.2577581815 -420474.820599746
-  ll2 -3.793996835702508 -1.1712382622845716
+  en  3036447.2577582286 -420474.8206135461
+  ll2 -3.793996835702507 -1.171238262284568
 EPSG:325931
   ll  -48.12092219412692 -0.7289826703408846
-  en  3222506.49596876 4663531.741916042
-  ll2 -48.1209221940016 -0.7289826703783926
+  en  3222506.4959712904 4663531.741793984
+  ll2 -48.1209221940016 -0.7289826703783908
 EPSG:32632
   ll  11.834748738967427 11.598093592769366
-  en  783086.673635503 1309597.5820030784
+  en  783086.673635305 1309597.582045318
   ll2 11.834748738965645 11.598093592741604
 EPSG:32732
   ll  -1.791491309390267 5.643292386980017
-  en  126449.06323079445 9801643.35337685
-  ll2 -1.791491309388767 5.6432923871719325
+  en  126449.06323080737 9801643.353370322
+  ll2 -1.7914913093887788 5.643292387171931
 EPSG:325832
   ll  77.68629530327402 9.528947032671267
-  en  3512592.5520968963 8623417.162244834
-  ll2 77.68629530327239 9.528947032671208
+  en  3512592.552096698 8623417.16234868
+  ll2 77.68629530327236 9.528947032671198
 EPSG:325932
   ll  -6.14179270149279 4.8242912817139105
-  en  3037594.6533933086 9319316.128971754
-  ll2 -6.141792701472686 4.8242912822807185
+  en  3037594.6533934087 9319316.128949493
+  ll2 -6.141792701472677 4.82429128228072
 EPSG:32633
   ll  42.05539689126687 15.319058068358773
-  en  526400.7140051088 4655976.147164094
+  en  526400.7140049142 4655976.147280654
   ll2 42.05539689126517 15.319058068358764
 EPSG:32733
   ll  -4.126836934079179 14.21193297521501
-  en  412530.9764488471 9543809.318930797
-  ll2 -4.126836934077882 14.211932975215115
+  en  412530.97644885455 9543809.318915792
+  ll2 -4.126836934077884 14.211932975215113
 EPSG:325833
   ll  67.46670291106749 12.96835463601909
-  en  3413129.3044162984 7484831.153323963
-  ll2 67.4667029110671 12.968354636019296
+  en  3413129.3044175194 7484831.153441383
+  ll2 67.46670291106713 12.968354636019292
 EPSG:325933
   ll  -64.4745973056098 11.208508565566216
-  en  3317785.4845903274 2844655.216630646
-  ll2 -64.47459730551593 11.208508565679987
+  en  3317785.4845927716 2844655.216510535
+  ll2 -64.47459730551596 11.208508565679992
 EPSG:32634
   ll  75.90951295643045 25.503495199048984
-  en  622276.0812544073 8429752.166174108
-  ll2 75.909512956362 25.50349519836978
+  en  622276.0812525111 8429752.16628064
+  ll2 75.90951295636204 25.503495198369787
 EPSG:32734
   ll  3.2478852471029853 16.30155670183659
-  en  -22571.10663486237 1.0360208764083304E7
-  ll2 3.2478852470768276 16.301556703090707
+  en  -22571.106634815456 1.0360208764095124E7
+  ll2 3.247885247076826 16.301556703090707
 EPSG:325834
   ll  -4.517988102520578 22.94921284404035
-  en  3716270.5802507084 -499673.68408102426
-  ll2 -4.517988102519325 22.949212844030242
+  en  3716270.580250685 -499673.68409744324
+  ll2 -4.517988102519327 22.949212844030246
 EPSG:325934
   ll  -66.80908136058187 16.14267050331656
-  en  3286725.4307596 2581586.337386054
+  en  3286725.4307625685 2581586.337268074
   ll2 -66.80908136023545 16.14267050447666
 EPSG:32635
   ll  47.49067536542698 25.527726208112252
-  en  389099.42345400766 5260743.895693323
+  en  389099.4234549984 5260743.8958150195
   ll2 47.49067536542474 25.527726208111613
 EPSG:32735
   ll  -67.02488461225471 23.602574863927025
-  en  352075.73641877924 2561806.497622406
-  ll2 -67.02488461221536 23.602574863972347
+  en  352075.73642084474 2561806.4975045808
+  ll2 -67.02488461221535 23.602574863972343
 EPSG:325835
   ll  59.310337838927126 27.764745794983764
-  en  3543539.7873613355 6574859.024164094
-  ll2 59.310337838928696 27.764745794983803
+  en  3543539.7873608056 6574859.024287401
+  ll2 59.31033783892869 27.764745794983803
 EPSG:325935
   ll  -41.869069478688395 25.134315184294067
-  en  3345169.050014843 5363077.880266767
+  en  3345169.050015976 5363077.880150447
   ll2 -41.869069478685255 25.13431518429081
 EPSG:32636
   ll  2.3826611804187845 35.69036984079036
-  en  799224.0520455772 263649.3963135081
-  ll2 2.382661180417945 35.69036984073283
+  en  799224.052045565 263649.3963221862
+  ll2 2.3826611804179456 35.69036984073283
 EPSG:32736
   ll  -42.55662303150512 29.942428252202173
-  en  248987.617232577 5283887.58070992
-  ll2 -42.55662303147202 29.942428252161328
+  en  248987.61723446447 5283887.580592804
+  ll2 -42.55662303147199 29.942428252161324
 EPSG:325836
   ll  16.615535265561583 35.64542638829472
-  en  3782240.027963533 1838888.532751736
-  ll2 16.615535265560656 35.645426388281585
+  en  3782240.027963152 1838888.5328098293
+  ll2 16.615535265560666 35.645426388281585
 EPSG:325936
   ll  -75.03852317262636 34.434468051988944
-  en  3541334.7248574486 1671595.0857640896
-  ll2 -75.03852317262528 34.43446805198882
+  en  3541334.724856813 1671595.085656195
+  ll2 -75.0385231726253 34.43446805198884
 EPSG:32637
   ll  52.14316359823634 35.33858849767755
-  en  249486.75996582233 5783285.072240253
-  ll2 52.143163598120495 35.33858849768192
+  en  249486.75996839185 5783285.072364062
+  ll2 52.14316359812051 35.33858849768192
 EPSG:32737
   ll  -63.21444761968792 35.222287816138596
-  en  310135.9849140271 2984926.8571699606
+  en  310135.9849165189 2984926.8570488933
   ll2 -63.214447619588334 35.22228781624288
 EPSG:325837
   ll  6.9163924168089235 39.74685370543559
-  en  3582507.638225977 764571.112240063
-  ll2 6.916392416807089 39.74685370543551
+  en  3582507.6382259573 764571.1122650943
+  ll2 6.916392416807088 39.74685370543552
 EPSG:325937
   ll  -14.08852279690737 38.543983228864015
-  en  3450772.8417472104 8442435.788998518
-  ll2 -14.088522796906116 38.54398322886402
+  en  3450772.8417472583 8442435.788948676
+  ll2 -14.08852279690611 38.54398322886402
 EPSG:32638
   ll  53.91509364067411 42.2117397712837
-  en  316881.19957546366 5977677.047367179
-  ll2 53.9150936406517 42.21173977127907
+  en  316881.19957743154 5977677.047491307
+  ll2 53.915093640651726 42.21173977127907
 EPSG:32738
   ll  -33.61049536194267 49.3934280355533
-  en  907721.7528885778 6272366.919688205
-  ll2 -33.61049536177814 49.39342803597181
+  en  907721.7528865209 6272366.919585204
+  ll2 -33.61049536177813 49.39342803597181
 EPSG:325838
   ll  74.9091597003715 48.6558222215854
-  en  3606180.541483438 8316743.386956698
-  ll2 74.9091597003469 48.655822221482644
+  en  3606180.541481807 8316743.387064737
+  ll2 74.90915970034688 48.65582222148265
 EPSG:325938
   ll  -21.15366469684895 43.8728399352876
-  en  3382970.2876780448 7660430.264366376
-  ll2 -21.15366469685002 43.872839935287615
+  en  3382970.287678295 7660430.264294319
+  ll2 -21.153664696850008 43.872839935287615
 EPSG:32639
   ll  78.6419869416514 46.228999725737076
-  en  395220.3045497241 8734297.004608665
-  ll2 78.64198694159874 46.22899972691322
+  en  395220.30455138447 8734297.00471091
+  ll2 78.64198694159873 46.22899972691323
 EPSG:32739
   ll  -36.97742607037574 49.32483640492937
-  en  350900.55360395985 5906320.568190651
-  ll2 -36.97742607037495 49.324836404927225
+  en  350900.55360484595 5906320.568081439
+  ll2 -36.97742607037497 49.324836404927225
 EPSG:325839
   ll  10.069996634834698 50.89113881049788
-  en  3488071.8580129114 1113153.563369507
-  ll2 10.069996634832751 50.89113881049788
+  en  3488071.8580129175 1113153.5634056593
+  ll2 10.069996634832757 50.89113881049788
 EPSG:325939
   ll  -80.60626087327603 52.65395467079264
-  en  3530133.6675760443 1050315.8630384337
-  ll2 -80.606260873274 52.6539546707922
+  en  3530133.667575561 1050315.8629393857
+  ll2 -80.60626087327402 52.65395467079222
 EPSG:32640
   ll  53.864121366142705 57.44751774032813
-  en  529429.9386812181 5968496.735301904
-  ll2 53.864121366142605 57.44751774032813
+  en  529429.9386809022 5968496.735426065
+  ll2 53.86412136614262 57.44751774032813
 EPSG:32740
   ll  -78.828450880352 53.91362023885953
-  en  433274.5310181798 1247408.5977487396
-  ll2 -78.82845088034635 53.913620238883254
+  en  433274.5310192385 1247408.597646758
+  ll2 -78.82845088034634 53.913620238883254
 EPSG:325840
   ll  59.76387277043521 54.37575445989696
-  en  3352609.2433693665 6628031.663651275
-  ll2 59.76387277042328 54.375754459897806
+  en  3352609.2433711775 6628031.663774361
+  ll2 59.76387277042328 54.3757544598978
 EPSG:325940
   ll  -59.976831400819776 53.71307388643351
-  en  3316584.9510729504 3346612.0228972314
-  ll2 -59.976831400769555 53.71307388645429
+  en  3316584.951075214 3346612.0227742614
+  ll2 -59.97683140076955 53.71307388645429
 EPSG:32641
   ll  49.571868382578565 60.41766515903435
-  en  313303.34798856254 5494234.471088438
+  en  313303.34799034183 5494234.471211336
   ll2 49.57186838256323 60.41766515902558
 EPSG:32741
   ll  -26.30036312196733 65.289773385337
-  en  728606.5155667982 7089027.454768185
-  ll2 -26.300363121968438 65.28977338534429
+  en  728606.5155660608 7089027.454681892
+  ll2 -26.300363121968427 65.28977338534429
 EPSG:325841
   ll  35.58653083746617 64.35677273465917
-  en  3622921.5587337473 3938937.297398581
-  ll2 35.586530837466285 64.3567727346599
+  en  3622921.5587330637 3938937.297505369
+  ll2 35.58653083746628 64.3567727346599
 EPSG:325941
   ll  -8.569269531855056 59.196306698858095
-  en  3081142.021083219 9050693.679425484
-  ll2 -8.569269531841538 59.196306699145694
+  en  3081142.021083381 9050693.67939459
+  ll2 -8.569269531841547 59.196306699145694
 EPSG:32642
   ll  -1.9071382046033127 69.6619425586165
-  en  573618.7511049979 -210811.00831296702
-  ll2 -1.9071382046026712 69.66194255861646
+  en  573618.7511049965 -210811.0083199154
+  ll2 -1.9071382046026717 69.66194255861646
 EPSG:32742
   ll  -46.57798418816586 66.46686755703854
-  en  305909.4478594754 4838613.998590369
-  ll2 -46.57798418815231 66.46686755702721
+  en  305909.44786115893 4838613.998469358
+  ll2 -46.577984188152286 66.46686755702721
 EPSG:325842
   ll  25.166004030978193 65.74989542315689
-  en  3172361.9823461873 2787283.7976831654
-  ll2 25.16600403096878 65.74989542310783
+  en  3172361.982347163 2787283.797766475
+  ll2 25.166004030968768 65.74989542310783
 EPSG:325942
   ll  4.080834969902384 68.85686170431453
-  en  3484112.388095137 1.0451063940923778E7
-  ll2 4.08083496990109 68.85686170431453
+  en  3484112.3880951386 1.0451063940938618E7
+  ll2 4.0808349699011 68.85686170431453
 EPSG:32643
   ll  1.4895490042363466 73.50410601478126
-  en  333581.31480363605 164696.77434708193
-  ll2 1.4895490042358661 73.50410601478401
+  en  333581.31480363844 164696.77435250996
+  ll2 1.4895490042358657 73.50410601478401
 EPSG:32743
   ll  -25.298456802256545 78.290225577417
-  en  831325.5755867062 7197935.58712931
-  ll2 -25.298456802245937 78.29022557747085
+  en  831325.5755857098 7197935.587045648
+  ll2 -25.298456802245934 78.29022557747085
 EPSG:325843
   ll  4.150327197207609 78.3848695646801
-  en  3875887.9687867323 459548.19268432085
+  en  3875887.9687866927 459548.1926994108
   ll2 4.150327197204124 78.3848695644895
 EPSG:325943
   ll  -29.743707910694475 76.0025527331224
-  en  3596943.916118828 6709192.520260464
-  ll2 -29.743707910696255 76.00255273312254
+  en  3596943.9161184365 6709192.520165732
+  ll2 -29.743707910696273 76.00255273312254
 EPSG:32644
   ll  62.44367553939567 85.9750751673437
-  en  756598.9549083995 6933493.141599985
+  en  756598.954905078 6933493.141721524
   ll2 62.44367553885303 85.97507516606653
 EPSG:32744
   ll  -23.333853962130412 81.03414728671824
-  en  503490.80075498996 7419521.505702956
-  ll2 -23.33385396213197 81.03414728671824
+  en  503490.800754981 7419521.505624639
+  ll2 -23.33385396213198 81.03414728671824
 EPSG:325844
   ll  75.60794388867498 76.12849875200254
-  en  3364981.5494333575 8397002.700953145
-  ll2 75.60794388856178 76.1284987533766
+  en  3364981.5494354456 8397002.701060116
+  ll2 75.6079438885618 76.12849875337659
 EPSG:325944
   ll  -30.531583699528298 81.70562992872959
-  en  3567691.5671681296 6622096.716323003
+  en  3567691.5671678428 6622096.716226475
   ll2 -30.531583699529946 81.70562992872962
 EPSG:32645
   ll  77.10426871059683 89.0221872636809
-  en  550370.203968452 8559275.344377397
-  ll2 77.1042687105949 89.02218726368017
+  en  550370.2039676631 8559275.344482148
+  ll2 77.10426871059488 89.02218726368017
 EPSG:32745
   ll  -27.850501765768136 88.49974130692067
-  en  647670.9268992043 6918455.1209706925
+  en  647670.9268986753 6918455.120880485
   ll2 -27.85050176577014 88.49974130692154
 EPSG:325845
   ll  26.567408149697318 83.36177880919017
-  en  3137515.0907571665 2943675.0078336555
-  ll2 26.567408149671074 83.36177880907614
+  en  3137515.090758361 2943675.0079206247
+  ll2 26.567408149671067 83.36177880907614
 EPSG:325945
   ll  2.578648544548429 86.376506281797
-  en  3430689.1714494354 1.0285037041584924E7
-  ll2 2.5786485445475704 86.37650628179703
+  en  3430689.1714494377 1.0285037041594315E7
+  ll2 2.5786485445475793 86.37650628179703
 EPSG:32646
   ll  50.87569190579864 89.74835752271836
-  en  271249.3586754158 5641039.535516567
+  en  271249.3586776806 5641039.535640001
   ll2 50.87569190574126 89.74835752270417
 EPSG:32746
   ll  -21.043491771413862 94.96493214411353
-  en  704183.7578683612 7671781.457120865
-  ll2 -21.043491771415024 94.96493214411359
+  en  704183.7578679286 7671781.457049133
+  ll2 -21.04349177141502 94.96493214411359
 EPSG:325846
   ll  63.92292390294496 94.7877236444445
-  en  3587673.4974415023 7089654.089507077
-  ll2 63.92292390294582 94.78772364444467
+  en  3587673.4974403377 7089654.0896276785
+  ll2 63.92292390294584 94.78772364444468
 EPSG:325946
   ll  -27.516680128901726 90.30293533287998
-  en  3233587.2607840146 6953437.221788075
-  ll2 -27.516680128899836 90.30293533285852
+  en  3233587.260784949 6953437.221698701
+  ll2 -27.516680128899825 90.30293533285851
 EPSG:32647
   ll  70.62231324887725 99.90770843411856
-  en  533612.0813871606 7835525.490628606
-  ll2 70.62231324887775 99.90770843411859
+  en  533612.0813866678 7835525.490742478
+  ll2 70.62231324887772 99.90770843411859
 EPSG:32747
   ll  -17.444781767557416 97.838202011294
-  en  376622.89142726455 8070864.873836377
-  ll2 -17.444781767557284 97.8382020112942
+  en  376622.8914274465 8070864.873775644
+  ll2 -17.444781767557274 97.8382020112942
 EPSG:325847
   ll  24.432295988352866 97.04644115456145
-  en  3301945.391185906 2703485.993747602
-  ll2 24.432295988354635 97.04644115455939
+  en  3301945.3911864622 2703485.993828944
+  ll2 24.43229598835463 97.04644115455939
 EPSG:325947
   ll  -8.286948582210371 97.25620711941067
-  en  3307943.5927900276 9083557.980611732
+  en  3307943.5927900937 9083557.980581835
   ll2 -8.286948582208613 97.25620711941549
 EPSG:32648
   ll  39.26637557561634 107.38423392284906
-  en  705690.5819345212 4349046.829965812
-  ll2 39.26637557560962 107.38423392286235
+  en  705690.5819331672 4349046.83007862
+  ll2 39.26637557560961 107.38423392286235
 EPSG:32748
   ll  -58.2033639588618 101.36763036809408
-  en  286575.74435156654 3542895.4237021524
-  ll2 -58.20336395876264 101.36763036814246
+  en  286575.74435410445 3542895.423578527
+  ll2 -58.203363958762644 101.36763036814246
 EPSG:325848
   ll  46.03384980661478 103.1140223730946
-  en  3354054.3806329863 5099537.604653398
+  en  3354054.380634229 5099537.604773986
   ll2 46.03384980661091 103.11402237309196
 EPSG:325948
   ll  -40.2015653990426 107.76592292342754
-  en  3735418.107381049 5546201.2183356695
-  ll2 -40.20156539902622 107.76592292345568
+  en  3735418.107379437 5546201.218221534
+  ll2 -40.20156539902624 107.76592292345568
 EPSG:32649
   ll  11.255609425170523 111.88005555487531
-  en  596060.37945688 1244386.5306094105
+  en  596060.37945682 1244386.5306496648
   ll2 11.255609425168716 111.88005555487518
 EPSG:32749
   ll  -38.23589206710369 109.25679480724837
-  en  347437.2273837626 5766575.122199986
-  ll2 -38.23589206710224 109.25679480724578
+  en  347437.22738472256 5766575.122088731
+  ll2 -38.23589206710225 109.25679480724578
 EPSG:325849
   ll  40.20888356028617 112.96180753860006
-  en  3666953.4268418523 4452787.276691595
-  ll2 40.208883560283056 112.96180753860462
+  en  3666953.426840709 4452787.276805753
+  ll2 40.20888356028306 112.96180753860462
 EPSG:325949
   ll  -14.246538618712663 111.16491045683226
-  en  3517789.6808880283 8425001.167416707
-  ll2 -14.246538618711439 111.16491045683226
+  en  3517789.6808880107 8425001.167366339
+  ll2 -14.246538618711444 111.16491045683226
 EPSG:32650
   ll  9.877161924846341 119.53983649063838
-  en  778545.0254095162 1092890.6707452787
-  ll2 9.87716192484447 119.53983649060855
+  en  778545.0254093792 1092890.6707807586
+  ll2 9.877161924844472 119.53983649060855
 EPSG:32750
   ll  -29.646256411547412 116.5390917394596
-  en  455389.4054121365 6720322.495373578
-  ll2 -29.646256411549217 116.53909173945958
+  en  455389.40541231557 6720322.495279071
+  ll2 -29.64625641154921 116.53909173945958
 EPSG:325850
   ll  7.616210715276484 116.45258981636005
-  en  3439619.8795211874 841907.9688102931
+  en  3439619.8795212046 841907.9688378153
   ll2 7.61621071527457 116.45258981636006
 EPSG:325950
   ll  -76.47164414673738 118.0058453305328
-  en  3526264.360074891 1511961.865561353
-  ll2 -76.471644146736 118.0058453305327
+  en  3526264.3600744815 1511961.8654556144
+  ll2 -76.47164414673597 118.0058453305327
 EPSG:32651
   ll  29.894404052484198 123.73791699307937
-  en  571246.6122432377 3307313.232926717
-  ll2 29.894404052485942 123.73791699307941
+  en  571246.6122429472 3307313.233021797
+  ll2 29.894404052485946 123.73791699307941
 EPSG:32751
   ll  -32.31249913837224 123.5620478825476
-  en  552907.9443418857 6424786.563203663
-  ll2 -32.312499138373454 123.56204788254762
+  en  552907.9443416377 6424786.563103266
+  ll2 -32.31249913837346 123.56204788254762
 EPSG:325851
   ll  21.725369416249812 126.95031997743322
-  en  3908772.515333468 2407651.5549167832
-  ll2 21.725369416216537 126.95031997750917
+  en  3908772.515332542 2407651.5549905016
+  ll2 21.725369416216548 126.95031997750917
 EPSG:325951
   ll  0.7833031741643595 126.9511372405029
-  en  3939972.9174714815 1.0086786231603492E7
-  ll2 0.7833031741624945 126.95113724002216
+  en  3939972.9174714684 1.0086786231606347E7
+  ll2 0.7833031741624975 126.95113724002216
 EPSG:32652
   ll  51.483168367165725 131.7547299698076
-  en  691267.2942611603 5707156.0792342
-  ll2 51.483168367143975 131.75472996981594
+  en  691267.2942592341 5707156.079357853
+  ll2 51.48316836714398 131.75472996981594
 EPSG:32752
   ll  -40.03951775988635 127.43317318342925
-  en  366330.35649203043 5566680.743038411
-  ll2 -40.039517759884674 127.43317318342785
+  en  366330.3564929392 5566680.742924484
+  ll2 -40.03951775988467 127.43317318342785
 EPSG:325852
   ll  77.67504105601225 126.61987537613251
-  en  3443299.8987664036 8623255.149579968
-  ll2 77.67504105600956 126.61987537613504
+  en  3443299.8987672958 8623255.149683818
+  ll2 77.67504105600955 126.61987537613504
 EPSG:325952
   ll  -46.165327233467806 132.73764589755302
-  en  3788543.2415460516 4880789.639831789
-  ll2 -46.16532723334611 132.73764589761515
+  en  3788543.241543582 4880789.639711136
+  ll2 -46.16532723334612 132.73764589761515
 EPSG:32653
   ll  3.9439937741275237 139.56906177178473
-  en  1007763.097404855 437331.5026837871
-  ll2 3.9439937741018096 139.5690617707412
+  en  1007763.0974047978 437331.50269813027
+  ll2 3.9439937741018105 139.5690617707412
 EPSG:32753
   ll  -28.176037015492348 138.7789296805875
-  en  871098.4449469668 6877512.944474403
-  ll2 -28.17603701545256 138.77892968074894
+  en  871098.4449456041 6877512.944383415
+  ll2 -28.176037015452554 138.77892968074894
 EPSG:325853
   ll  26.083256744062194 136.89345436910952
-  en  3689380.0190071813 2886280.227061506
-  ll2 26.08325674406407 136.89345436911194
+  en  3689380.01900658 2886280.227147239
+  ll2 26.083256744064073 136.89345436911194
 EPSG:325953
   ll  -45.87471253428649 134.3177889336392
-  en  3447055.754047673 4919646.390237771
+  en  3447055.7540481216 4919646.390117302
   ll2 -45.87471253428452 134.3177889336392
 EPSG:32654
   ll  0.16694081399375094 139.49272157099904
-  en  332258.8768147528 18458.40617090477
-  ll2 0.1669408139936965 139.49272157100194
+  en  332258.8768147535 18458.406171513318
+  ll2 0.16694081399369648 139.49272157100194
 EPSG:32754
   ll  -76.09420937279235 144.16836879822267
-  en  584959.5966810205 1552021.529664645
-  ll2 -76.09420937278288 144.16836879819374
+  en  584959.5966797009 1552021.5295583569
+  ll2 -76.09420937278291 144.16836879819374
 EPSG:325854
   ll  14.035950638187842 140.08015854857118
-  en  3400677.277176608 1551895.6508262574
+  en  3400677.277176704 1551895.6508759246
   ll2 14.035950638186595 140.0801585485713
 EPSG:325954
   ll  -25.929690605130276 144.77860345874333
-  en  3878549.273941212 7126639.008182952
+  en  3878549.273940019 7126639.008097633
   ll2 -25.929690605097683 144.77860345887737
 EPSG:32655
   ll  15.325514479625792 147.8741788025552
-  en  593840.2220570564 1694519.0742676193
-  ll2 15.325514479624902 147.87417880255512
+  en  593840.2220569488 1694519.0743215398
+  ll2 15.325514479624909 147.87417880255512
 EPSG:32755
   ll  -5.430354355649115 147.0530080779711
-  en  505872.1762453687 9399764.41041779
-  ll2 -5.4303543556475065 147.0530080779711
+  en  505872.17624536785 9399764.410398081
+  ll2 -5.430354355647516 147.0530080779711
 EPSG:325855
   ll  77.98041139164597 150.59532728556897
-  en  3583530.96380301 8658747.742014583
-  ll2 77.98041139163263 150.59532728547734
+  en  3583530.9638016927 8658747.742117923
+  ll2 77.98041139163264 150.59532728547734
 EPSG:325955
   ll  -67.36971313700667 147.14032372466914
-  en  3506025.4076779224 2527397.5360194147
+  en  3506025.4076778376 2527397.535901879
   ll2 -67.36971313700812 147.14032372466914
 EPSG:32656
   ll  5.776293589970747 152.597733111241
-  en  455463.1790096064 638491.4093658334
-  ll2 5.7762935899690815 152.597733111241
+  en  455463.1790096139 638491.4093867843
+  ll2 5.776293589969082 152.597733111241
 EPSG:32756
   ll  -52.48522451023355 152.57450200005235
-  en  471106.2760020543 4184906.403043689
-  ll2 -52.48522451023301 152.57450200005235
+  en  471106.27600235335 4184906.4029197395
+  ll2 -52.48522451023299 152.57450200005235
 EPSG:325856
   ll  75.75021549023971 156.78618479521796
-  en  3603965.805228576 8410644.65432367
-  ll2 75.75021549021349 156.78618479507574
+  en  3603965.805226966 8410644.654430462
+  ll2 75.75021549021352 156.78618479507574
 EPSG:325956
   ll  -76.53705419120314 152.6360393265017
-  en  3490541.0647842693 1504857.8305686433
-  ll2 -76.53705419120173 152.63603932650176
+  en  3490541.0647844165 1504857.830462996
+  ll2 -76.53705419120176 152.63603932650173
 EPSG:32657
   ll  46.64079768923685 162.60478038581513
-  en  775876.5142945569 5171562.354182974
-  ll2 46.64079768913732 162.60478038586604
+  en  775876.5142921583 5171562.354304005
+  ll2 46.6407976891373 162.60478038586604
 EPSG:32757
   ll  -20.68227265660569 154.09167529202733
-  en  -11660.993970328185 7705261.802369376
-  ll2 -20.682272656454817 154.09167529182264
+  en  -11660.993969266012 7705261.8022987265
+  ll2 -20.682272656454828 154.09167529182264
 EPSG:325857
   ll  -2.5518216908727664 156.83036399626832
-  en  3258753.8207376944 -282258.2813214059
-  ll2 -2.5518216908720093 156.8303639962868
+  en  3258753.8207377037 -282258.28133069887
+  ll2 -2.5518216908720097 156.8303639962868
 EPSG:325957
   ll  -58.994723879002095 160.57399408839512
-  en  3590438.0945527772 3459470.639023086
+  en  3590438.0945516834 3459470.63889967
   ll2 -58.99472387900292 160.5739940883954
 EPSG:32658
   ll  -0.9538168752974308 164.16373403116563
-  en  406954.0188305655 -105436.82507303856
-  ll2 -0.9538168752971062 164.16373403116577
+  en  406954.01883056597 -105436.825076515
+  ll2 -0.9538168752971059 164.16373403116577
 EPSG:32758
   ll  -6.482322318456696 161.77847911397538
-  en  143617.7405418452 9282345.981190877
-  ll2 -6.4823223184528835 161.77847911410754
+  en  143617.7405419257 9282345.981167397
+  ll2 -6.48232231845288 161.77847911410754
 EPSG:325858
   ll  -2.586076572514262 164.68386700435784
-  en  3464857.720582473 -285845.48558121437
-  ll2 -2.586076572513404 164.68386700435784
+  en  3464857.720582474 -285845.48559063184
+  ll2 -2.5860765725134036 164.68386700435784
 EPSG:325958
   ll  -17.66251906484051 161.38408849981434
-  en  3116279.339785848 8043474.153703289
-  ll2 -17.662519064826686 161.38408849985055
+  en  3116279.3397864336 8043474.153641874
+  ll2 -17.662519064826693 161.38408849985055
 EPSG:32659
   ll  40.50129189541295 171.1151678182983
-  en  509758.4272201235 4483404.501535325
-  ll2 40.50129189541159 171.1151678182983
+  en  509758.4272200559 4483404.501649895
+  ll2 40.501291895411576 171.1151678182983
 EPSG:32759
   ll  -9.653111284693267 166.1444317382442
-  en  -33309.996839801664 8929144.290516876
-  ll2 -9.653111284606682 166.1444317392922
+  en  -33309.996839536005 8929144.290482178
+  ll2 -9.653111284606696 166.1444317392922
 EPSG:325859
   ll  52.00257317380204 174.55502943709467
-  en  3744002.875552985 5767293.0957451705
-  ll2 52.0025731737048 174.55502943709706
+  en  3744002.8755504917 5767293.095868946
+  ll2 52.00257317370479 174.55502943709706
 EPSG:325959
   ll  -14.819657409628974 166.9501496486915
-  en  3063930.273406502 8357673.8652681885
-  ll2 -14.819657409599175 166.95014964886468
+  en  3063930.2734069796 8357673.865215932
+  ll2 -14.819657409599168 166.95014964886468
 EPSG:32660
   ll  84.38466705329412 178.8187390897748
-  en  519865.4438072069 9371350.999732465
-  ll2 84.38466705329247 178.81873908977406
+  en  519865.4438068825 9371350.999824923
+  ll2 84.38466705329245 178.81873908977406
 EPSG:32760
   ll  -36.29211488935783 181.82910716731914
-  en  933779.9449712461 5972815.905744288
-  ll2 -36.292114889006136 181.82910716792168
+  en  933779.944968744 5972815.905636307
+  ll2 -36.29211488900613 181.82910716792168
 EPSG:325860
   ll  70.40119916139271 174.88104576259516
-  en  3420687.695949238 7811996.6521680625
-  ll2 70.4011991613916 174.88104576259576
+  en  3420687.6959503973 7811996.6522821905
+  ll2 70.40119916139157 174.88104576259576
 EPSG:325960
   ll  -15.122420619100339 174.82953069805916
-  en  3266743.101643809 8326980.665451931
-  ll2 -15.122420619099696 174.82953069806615
+  en  3266743.101644071 8326980.665398677
+  ll2 -15.12242061909968 174.82953069806615
 EPSG:31370
   ll  49.91513996934379 3.0892264075922404

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.datum.GRS80Datum;
+import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
 import org.openstreetmap.josm.tools.GBC;
@@ -48 +48 @@
 
     public UTM(int zone, Hemisphere hemisphere, boolean offset) {
-        ellps = Ellipsoid.GRS80;
+        ellps = Ellipsoid.WGS84;
         proj = new org.openstreetmap.josm.data.projection.proj.TransverseMercator();
         try {
@@ -55 +55 @@
             throw new RuntimeException(e);
         }
-        datum = GRS80Datum.INSTANCE;
+        datum = WGS84Datum.INSTANCE;
         updateParameters(zone, hemisphere, offset);
     }