Index: /trunk/data_nodist/projection/projection-regression-test-data =================================================================== --- /trunk/data_nodist/projection/projection-regression-test-data (revision 9534) +++ /trunk/data_nodist/projection/projection-regression-test-data (revision 9535) @@ -449,4 +449,8 @@ en 1.0254645160071291E7 -624490.2110000339 ll2 3.512498519373898 71.15502723883546 +EPSG:2057 + ll 27.60828909555638 52.41351751537352 + en 639610.8985708778 3055015.9360113344 + ll2 27.608289091312784 52.41351751576185 EPSG:2058 ll -58.898978048218936 42.608537972557706 @@ -3933,4 +3937,8 @@ en 29973.104249171214 -3817770.946092943 ll2 -4.484789920164784 -92.62977430839794 +EPSG:26931 + ll 56.71085527271815 -129.52906729684838 + en 1071929.1802393221 550528.6203638706 + ll2 56.710855272715165 -129.52906729684835 EPSG:26932 ll -33.8153843551209 -132.88429669967564 @@ -5785,4 +5793,8 @@ en 692080.8032091986 1774695.523862292 ll2 16.041843952489902 -61.20853418759284 +EPSG:29702 + ll -25.018943690192323 43.41957106835357 + en 95176.46385931317 119965.98671352584 + ll2 -25.018943690579924 43.419571068215575 EPSG:2971 ll 53.56316817165853 -43.38297738697324 @@ -5841,4 +5853,16 @@ en 143225.42952688428 -3742210.3025279203 ll2 -33.75876729118265 -60.848905547512366 +EPSG:29871 + ll 7.31035675748481 118.5748895002964 + en 983902.7261159647 811291.978523012 + ll2 7.310356768091936 118.5748894754716 +EPSG:29872 + ll 1.3854016435296481 112.8000830085585 + en 346167.12729685166 153358.78163377667 + ll2 1.3854016469686072 112.80008298784752 +EPSG:29873 + ll 5.69775184958883 110.80589303824146 + en 124505.16128144541 630428.973107241 + ll2 5.697751852494578 110.80589302651768 EPSG:2988 ll 89.28270100887204 -176.36677725595038 @@ -5901,4 +5925,8 @@ en 2807681.5235197735 5148186.206928445 ll2 46.42503928277661 18.74399103989143 +EPSG:3005 + ll -38.30941542902003 9.097453472284542 + en 1.3100360003855618E7 9876684.702734185 + ll2 -38.30941542902001 9.097453472284542 EPSG:3006 ll 29.734840136260985 22.944467857913462 @@ -6077,4 +6105,12 @@ en 388018.01843731524 -521275.0737965966 ll2 -4.643201641197295 12.585743232942303 +EPSG:3031 + ll -2.203568131709858 -146.83286534539934 + en -6512331.978323617 -9964356.342448773 + ll2 -2.2035681316804365 -146.83286534539934 +EPSG:3032 + ll 33.26301043285541 56.750872568026864 + en 770187.9196755216 2.821173402317224E7 + ll2 33.263010432855005 56.750872568026864 EPSG:3033 ll -53.85668026617815 77.57896596470384 @@ -6253,4 +6289,12 @@ en 494807.3976528088 -6202607.43973929 ll2 -13.18185846595113 -68.57820013417324 +EPSG:3078 + ll 41.60827677021571 -88.24888965973831 + en 312432.1549270693 119889.29315797798 + ll2 41.608276770215575 -88.24888965973831 +EPSG:3079 + ll 44.252524246297604 -83.22129775415792 + en 721651.7538175061 414986.47761983983 + ll2 44.25252424629757 -83.2212977541579 EPSG:30791 ll 3.963529113965137 -52.4199902971053 @@ -6269,8 +6313,24 @@ en 6416360.392792111 6392510.807723739 ll2 20.709012440068374 -51.972290569529164 +EPSG:3083 + ll 81.50927874811325 39.39146840700445 + en 7265001.362759071 1.61235875229174E7 + ll2 81.50927874811313 39.39146840700445 EPSG:3084 ll 1.7925690835507417 -53.90626250746932 en 7132143.5369957965 4275703.788932544 ll2 1.7925690835507768 -53.906262507469314 +EPSG:3085 + ll -15.326940585111373 -90.47611084543749 + en 2811978.189357174 2769938.273304244 + ll2 -15.326940585111382 -90.47611084543752 +EPSG:3086 + ll 86.51739400771302 35.64012776852934 + en 6453801.865683596 8400565.912698582 + ll2 86.51739400771285 35.640127768529325 +EPSG:3087 + ll 77.48347147768237 -133.15913997575345 + en -2548793.5410285657 5546550.178244245 + ll2 77.4834714776832 -133.15913997575342 EPSG:3088 ll -14.23564921832656 -148.67656184345333 @@ -6613,4 +6673,8 @@ en 291209.2094018892 -5654978.0136481505 ll2 -51.00873375033845 -11.972819692976977 +EPSG:3153 + ll 77.46241922427723 26.74623926269652 + en 2778974.772139853 6812372.203412658 + ll2 77.46241922427808 26.746239262696523 EPSG:3154 ll 18.45017833135401 -143.00518856983734 @@ -6669,4 +6733,12 @@ en 1282463.4258278126 316961.550419521 ll2 -18.93927390047548 178.61401192504601 +EPSG:3167 + ll 4.5894214535343885 103.88899311718082 + en -109847.7328498754 507444.28829134663 + ll2 4.5894214535340145 103.88899311718082 +EPSG:3168 + ll 2.72881173225682 101.96321994329483 + en 440721.71596626757 301943.0167295394 + ll2 2.7288117322220073 101.96321994329483 EPSG:3169 ll 55.533553364212736 165.80954638264419 @@ -6685,4 +6757,12 @@ en -28818.499059191672 5739180.91297041 ll2 -38.34017535774268 164.94894466271623 +EPSG:3174 + ll -60.899707566792884 -49.471315779466266 + en 7250661.136818542 -6179481.623148579 + ll2 -60.899707566792856 -49.47131577946626 +EPSG:3175 + ll 54.48901986889078 -31.455909339475028 + en 4167854.5415058676 3047009.6571801393 + ll2 54.489019868890736 -31.455909339475028 EPSG:3176 ll 69.19837213167696 102.7249402369923 @@ -8709,4 +8789,8 @@ en 519865.4438068824 9371350.999827776 ll2 84.38466705329408 178.8187390897746 +EPSG:32661 + ll -16.651775516373988 78.7484724711797 + en 1.861218950054125E7 -1304830.3544464665 + ll2 -16.651775516373068 78.7484724711797 EPSG:32664 ll -50.09455297160714 -98.97391526433553 @@ -8953,4 +9037,8 @@ en 347437.2273847225 5766575.122088502 ll2 -38.23589206710197 109.25679480724575 +EPSG:3275 + ll 1.7601214433069003 6.782875586981817 + en 1859839.0894781305 -1.2879121157179449E7 + ll2 1.7601214432833585 6.782875586981845 EPSG:32750 ll -29.646256411547412 116.5390917394596 @@ -8993,12 +9081,88 @@ en -33309.99683953577 8929144.290482225 ll2 -9.653111284583055 166.14443173929217 +EPSG:3276 + ll -8.194824487338636 -109.26770422318646 + en 4751779.115560255 9859241.999783775 + ll2 -8.194824487337963 -109.26770422318646 EPSG:32760 ll -36.29211488935783 181.82910716731914 en 933779.944968744 5972815.905636139 ll2 -36.29211488867873 181.82910716792168 +EPSG:32761 + ll -38.055794555690284 -128.52440162080111 + en -2836048.856133612 -1850130.8710403177 + ll2 -38.05579455569005 -128.52440162080111 EPSG:32766 ll 30.43213233394603 43.80892732210802 en 1251006.079125826 1.3392694484537875E7 ll2 30.432132326483174 43.8089273263015 +EPSG:3277 + ll -86.23600060084829 -35.32416339547672 + en 391523.59633843246 145016.7166123399 + ll2 -86.23600060084827 -35.32416339547672 +EPSG:3278 + ll -26.26721898678278 64.3740133100342 + en 5123821.711823587 -5972580.930969879 + ll2 -26.267218986782076 64.3740133100342 +EPSG:3279 + ll 42.462912837780635 -65.96900130730877 + en -1.0209892721113924E7 2.664075199301666E7 + ll2 42.462912837780515 -65.96900130730877 +EPSG:3280 + ll -29.12698753271465 -169.32653437460684 + en -3223347.230731451 -6705566.2155786315 + ll2 -29.12698753271407 -169.3265343746068 +EPSG:3281 + ll -20.143690831318054 -138.72173175047791 + en -3911311.2533829147 -7921499.708626818 + ll2 -20.143690831317166 -138.72173175047791 +EPSG:3282 + ll -87.6701522006823 -48.22027694753639 + en -257972.5673550888 -14514.489217880324 + ll2 -87.6701522006823 -48.22027694753639 +EPSG:3283 + ll -13.884227540076509 152.48738701899043 + en 9662415.267889481 2144337.609424833 + ll2 -13.884227540075612 152.48738701899043 +EPSG:3284 + ll -26.1588365437026 19.215273340008352 + en -7864449.4256969765 579636.8384742583 + ll2 -26.1588365437019 19.215273340008366 +EPSG:3285 + ll -11.119833387948105 116.33610318999047 + en -3326788.1921821907 9849003.589358458 + ll2 -11.119833387947276 116.33610318999047 +EPSG:3286 + ll 54.838269793009545 -2.1123262410021955 + en -8836118.23538975 -3.861869453702794E7 + ll2 54.838269793005054 -2.1123262410021937 +EPSG:3287 + ll -48.17524303305226 -74.54067798259788 + en 4691735.032954445 1216919.5854811515 + ll2 -48.17524303303699 -74.54067798259788 +EPSG:3288 + ll -3.9999750940881142 -47.03636985626031 + en 8025276.764679871 8617015.629759714 + ll2 -3.99997509408775 -47.03636985626031 +EPSG:3289 + ll 45.937795737057144 3.9887968424524445 + en 1.735281221109577E7 2.573745609006604E7 + ll2 45.937795737057066 3.9887968424524445 +EPSG:3290 + ll 50.120948094680614 -119.14390941469581 + en -1.7752541164785463E7 -2.9713988516197786E7 + ll2 50.120948094669565 -119.14390941469583 +EPSG:3291 + ll -64.60125291001827 -57.790730393799 + en -1525235.425737202 -2421163.9703149754 + ll2 -64.60125291001793 -57.79073039379901 +EPSG:3292 + ll -23.92677775484151 84.42446988982196 + en -7493786.04885471 3403191.868104349 + ll2 -23.92677775484074 84.42446988982198 +EPSG:3293 + ll -86.85422121361098 107.10503797677018 + en 333472.3652349566 -102621.59297712774 + ll2 -86.85422121361098 107.10503797677018 EPSG:3294 ll -30.47147734655283 172.2633184247099 @@ -9057,4 +9221,12 @@ en -2070542.6430060118 7170710.16329943 ll2 21.75387432517666 69.4599778267665 +EPSG:3310 + ll 56.2833291759967 -105.61981952640022 + en 955883.0211813878 2058964.4636019208 + ll2 56.28332917599671 -105.61981952640022 +EPSG:3311 + ll 16.73308162957028 -124.60019911752742 + en -515778.336005594 -2308972.9143328546 + ll2 16.73308162957027 -124.60019911752741 EPSG:3312 ll -68.21014682723902 -47.13731205896564 @@ -9153,4 +9325,8 @@ en 294095.5517305903 2347704.780978266 ll2 -7.988229046701753 51.26425808726149 +EPSG:3338 + ll -1.4358933712535276 -67.11964654531752 + en 9529553.967427237 2242670.8230798407 + ll2 -1.4358933712535458 -67.11964654531754 EPSG:3339 ll 50.74234943403934 10.661863508524672 @@ -9269,4 +9445,12 @@ en 683535.3177323692 -8880414.097937567 ll2 -79.85445744317988 0.37182904991931665 +EPSG:3375 + ll 5.040852922166723 103.30627974440675 + en 590171.4386504 557417.1541343457 + ll2 5.040852922166273 103.30627974440675 +EPSG:3376 + ll 4.747304314605861 118.84323425598721 + en 1016594.5161534745 528097.7829511302 + ll2 4.747304314605455 118.84323425598721 EPSG:3386 ll -89.59009830030605 15.366898838425108 @@ -9345,4 +9529,16 @@ en 1524538.5878959405 2066626.2181707374 ll2 18.441000009971695 120.66715161207838 +EPSG:3411 + ll 69.74806132169249 48.794738310977124 + en 2211233.0676107476 146665.97776669028 + ll2 69.74806132169243 48.794738310977124 +EPSG:3412 + ll 16.404693601449253 -96.84578170804078 + en -1.633569511661152E7 -1961153.470471942 + ll2 16.40469360144833 -96.84578170804079 +EPSG:3413 + ll -13.347765070074715 -0.641468759067152 + en 1.0888686383430652E7 -1.1135271231159024E7 + ll2 -13.347765070073843 -0.6414687590671448 EPSG:3414 ll 11.883716068132756 95.11990438231899 @@ -9553,4 +9749,12 @@ en 462168.4919695121 -9403109.811177606 ll2 -54.85879837545377 -89.64659644004809 +EPSG:3467 + ll -10.121502262444565 11.315779879774908 + en 6409499.807739797 1.3194985033850841E7 + ll2 -10.121502262444562 11.31577987977491 +EPSG:3468 + ll 56.778481667202094 -133.51413749442688 + en 828000.3747251807 550442.7429966275 + ll2 56.77848166719954 -133.51413749442682 EPSG:3469 ll -9.158927392744403 -150.57572849576874 @@ -9629,4 +9833,8 @@ en 1223684.9832617578 4042150.6641389183 ll2 63.370564421802975 -77.94690434926537 +EPSG:3488 + ll -67.62358718857561 -125.43072634415131 + en -950648.6768179178 -8265379.508935452 + ll2 -67.62358718857635 -125.43072634415128 EPSG:3489 ll 10.700536279365654 -145.98996824967776 @@ -9725,4 +9933,8 @@ en 13960.242934491398 -8917958.567013493 ll2 -56.12283469866259 -83.99193655457549 +EPSG:3513 + ll 23.496576570118393 15.45046219395772 + en 9497682.078746371 3825483.616906656 + ll2 23.496576570118187 15.45046219395772 EPSG:3514 ll -2.401856999262357 -140.78775765814552 @@ -9953,4 +10165,16 @@ en 3904167.5064407806 7650010.159560557 ll2 65.28507670710617 -42.087409865931924 +EPSG:3577 + ll 75.16436397991066 25.748997302526107 + en -1.5032076950837223E7 -1750668.8653987835 + ll2 75.16436397991168 25.748997302526107 +EPSG:3578 + ll 7.650476268304587 21.67246228608596 + en 6269532.981529447 1.086874016784783E7 + ll2 7.650476268304611 21.67246228608596 +EPSG:3579 + ll -61.84796774100545 -70.16195012379792 + en 1.1332301755889906E7 -3059701.6726515684 + ll2 -61.84796774100604 -70.16195012379794 EPSG:3580 ll 74.20254727493595 -140.2961482350721 @@ -9997,4 +10221,8 @@ en 1.416268419224168E7 1355845.0709252306 ll2 30.465837040949516 -15.88503950310573 +EPSG:3591 + ll 42.46233270434987 -86.7053522716931 + en 441880.19829270244 212613.54240777437 + ll2 42.462332704349784 -86.70535227169312 EPSG:3592 ll -12.534396778183787 -63.32235346680068 @@ -10289,4 +10517,8 @@ en -6313620.691507084 -1089505.3502780166 ll2 -15.985641151682188 -149.38843883246844 +EPSG:3665 + ll -36.9754083884165 75.45335470412351 + en 1.8404116946611833E7 1.8223347406181976E7 + ll2 -36.97540838841659 75.45335470412353 EPSG:3666 ll 51.0372842926152 -106.88933036684116 @@ -11069,4 +11301,8 @@ en -1165170.92007724 2182203.5152833266 ll2 54.42419666854405 -96.78338500410386 +EPSG:3976 + ll -61.485142666969146 135.3681857020244 + en 2214248.697965832 -2242890.906471596 + ll2 -61.485142666968244 135.3681857020244 EPSG:3978 ll 54.734228094373535 -58.59865067673286 @@ -11101,4 +11337,12 @@ en 4313912.928101179 3313513.266237703 ll2 41.9479651127952 -20.193469561386244 +EPSG:3995 + ll -58.51924034223759 170.25401704511552 + en 7385615.258124021 4.2999811593550265E7 + ll2 -58.51924034223564 170.25401704511552 +EPSG:3996 + ll 24.772353705533575 -34.19646314317066 + en -4506888.8362823045 -6632566.198773273 + ll2 24.77235370553283 -34.19646314317066 EPSG:3997 ll -27.792837420424938 58.19549642287275 @@ -13609,8 +13853,28 @@ en 77475.71081414587 -1.3412614853415545E7 ll2 -81.18066303230684 -3.608926605691833 +EPSG:5041 + ll -14.737323880014742 -31.27099107011827 + en -6494042.084627187 -1.1986192096024344E7 + ll2 -14.737323880013859 -31.270991070118267 +EPSG:5042 + ll -16.11598329054371 -97.87024441414485 + en -7430865.181745999 696351.01862513 + ll2 -16.115983290542786 -97.87024441414484 EPSG:5048 ll 7.556616585204793 19.78136408233872 en -298378.88700273994 841922.0159042499 ll2 7.556616583853502 19.781364097259114 +EPSG:5070 + ll 0.5619215891761371 -159.31180868353957 + en -7560971.360081381 310596.1577298755 + ll2 0.5619215891761462 -159.31180868353957 +EPSG:5071 + ll 42.35077243361198 -51.968703769753716 + en 3476540.8380818595 2970250.992728777 + ll2 42.35077243361206 -51.96870376975371 +EPSG:5072 + ll 87.76263275942475 -110.4207735959925 + en -613119.1321436728 5919529.292434434 + ll2 87.76263275942523 -110.42077359599251 EPSG:5105 ll -3.9749417560042133 3.141514911971208 @@ -13841,4 +14105,8 @@ en 57.49397691217844 -75.54081389890175 ll2 -75.54081389844679 57.49397691217843 +EPSG:5247 + ll 5.117971000931756 112.73944950832504 + en 339418.2022298416 566060.6133440748 + ll2 5.117971000931317 112.73944950832504 EPSG:5252 ll 35.00208021493492 160.11714946399684 @@ -14177,4 +14445,8 @@ en 2538781.9254125194 2517516.8768033534 ll2 -57.74340380926796 158.42198453732894 +EPSG:5482 + ll -84.67992269786018 38.63993839182492 + en 4630926.042841099 538329.4296840852 + ll2 -84.67992269786063 38.63993839182493 EPSG:5489 ll -25.37275649979 0.9280345717344858 @@ -14633,4 +14905,8 @@ en 2339674.3498655306 4370518.714316465 ll2 -5.645406413572549 -169.43928187071148 +EPSG:5890 + ll 66.04209911338945 -69.0757615108255 + en -940085.3433753065 2458718.609666341 + ll2 66.04209911338923 -69.07576151082549 EPSG:5921 ll 40.52892841240194 -154.16146545728856 @@ -14693,4 +14969,24 @@ en -6746718.35363274 -1927321.1293965797 ll2 20.544339385384543 117.3865226341916 +EPSG:5936 + ll -7.617997864501135 -73.39529156662769 + en 1.6034763632097548E7 -1342333.5448625307 + ll2 -7.617997864500502 -73.39529156662769 +EPSG:5937 + ll 40.116601431432585 -5.977445286606297 + en 7888119.395689784 2414066.697619995 + ll2 40.116601431432414 -5.977445286606297 +EPSG:5938 + ll 41.74899088819822 4.7117069828731815 + en 5477455.142102011 -2497401.702663985 + ll2 41.74899088819807 4.711706982873189 +EPSG:5939 + ll 6.625520125212645 108.53414456579492 + en 1.326259955743121E7 2104999.54251288 + ll2 6.625520125212093 108.53414456579492 +EPSG:5940 + ll 67.16597966436889 -11.317200785908796 + en -301709.2745072837 3138435.488250934 + ll2 67.16597966436873 -11.317200785908824 EPSG:5942 ll 31.47253249231747 153.5274184466915 @@ -15393,4 +15689,8 @@ en 776697.6107237587 -5976596.604812752 ll2 -53.86393346300957 -64.79135821115935 +EPSG:6350 + ll -80.0209110224801 -11.618238432859727 + en 1.3063857734315593E7 -697620.1274206834 + ll2 -80.0209110224798 -11.618238432859727 EPSG:6351 ll 74.18155698794537 -149.27550769291977 @@ -15485,4 +15785,12 @@ en 7970893.496661244 1500408.7250747462 ll2 14.971323852919486 -13.315747713557954 +EPSG:6393 + ll 5.680096886456667 -177.46768485472967 + en -3204649.9178882474 -3884131.3066787203 + ll2 5.68009688645666 -177.46768485472967 +EPSG:6394 + ll 57.43001412397566 -140.9804855596243 + en 380081.29686265625 646725.2280274499 + ll2 57.43001412397313 -140.9804855596243 EPSG:6395 ll 76.25909754766835 -138.63247756354963 @@ -15561,4 +15869,8 @@ en -592448.651227721 -588120.3974274138 ll2 23.390428775690044 -101.56334400184963 +EPSG:6414 + ll -46.687072210647905 -90.63362928555675 + en 4811217.263010543 -6720230.288116514 + ll2 -46.68707221064784 -90.63362928555674 EPSG:6415 ll 77.66785860605287 -67.02727481867939 @@ -15657,4 +15969,8 @@ en 780346.1968745661 -8328955.048259961 ll2 -50.57725912828304 -72.80095574898347 +EPSG:6439 + ll -69.91347359264388 -43.519370309940854 + en 6785306.202994696 -6200050.583403238 + ll2 -69.9134735926439 -43.51937030994086 EPSG:6440 ll 52.32620854990201 -86.71846001110967 @@ -15885,4 +16201,8 @@ en 5760031.794054981 1111591.41023054 ll2 50.59585050645332 -119.44507517510519 +EPSG:6497 + ll 47.483240761154256 -85.40849207600685 + en 544389.0285745421 770360.2613843884 + ll2 47.48324076113724 -85.40849207600685 EPSG:6498 ll 23.077703633744676 -107.4529507181953 @@ -16205,4 +16525,8 @@ en 2081466.594118415 9324906.683250513 ll2 77.02897090553842 -66.81795940080735 +EPSG:6579 + ll -16.133325692503647 59.57117649203889 + en 1.6707217079333391E7 1.6005629629845746E7 + ll2 -16.13332569250366 59.57117649203889 EPSG:6580 ll -20.908775566246 -79.05597389140104 @@ -16373,4 +16697,12 @@ en -2086427.0470751773 4751680.71261087 ll2 74.52160987211981 -148.52387879147497 +EPSG:6623 + ll -70.12026794790006 -34.43336166133315 + en 6439299.406407849 -6814257.92083024 + ll2 -70.12026794790016 -34.43336166133316 +EPSG:6624 + ll -54.51001526692251 -4.0030579480078075 + en 1.0677990752566695E7 -2786747.8178774514 + ll2 -54.51001526692274 -4.003057948007808 EPSG:6625 ll -17.586925210314448 -91.78892049203859 Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 9534) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 9535) @@ -157,7 +157,5 @@ } - /** - * Iteratively solve equation (7-9) from Snyder. - */ + // Iteratively solve equation (7-9) from Snyder. final double cphi2(final double ts) { final double eccnth = 0.5 * e; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 9534) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 9535) @@ -26,11 +26,10 @@ *
* There are two forms of the oblique mercator, differing in the origin of their grid coordinates. - * The {@linkplain HotineObliqueMercator Hotine Oblique Mercator} (EPSG code 9812) has grid - * coordinates start at the intersection of the central line and the equator of the aposphere. - * The {@linkplain ObliqueMercator Oblique Mercator} (EPSG code 9815) is the same, except the - * grid coordinates begin at the central point (where the latitude of center and central line - * intersect). ESRI separates these two case by appending {@code "Natural_Origin"} (for the - * {@code "Hotine_Oblique_Mercator"}) and {@code "Center"} (for the {@code "Oblique_Mercator"}) - * to the projection names. + * The Hotine Oblique Mercator (EPSG code 9812) has grid coordinates start at the intersection of + * the central line and the equator of the aposphere. + * The Oblique Mercator (EPSG code 9815) is the same, except the grid coordinates begin at the + * central point (where the latitude of center and central line intersect). ESRI separates these + * two case by appending {@code "Natural_Origin"} (for the {@code "Hotine_Oblique_Mercator"}) and + * {@code "Center"} (for the {@code "Oblique_Mercator"}) to the projection names. *
* Two different methods are used to specify the central line for the oblique mercator: Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 9534) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 9535) @@ -116,6 +116,11 @@ testProj("lcc", EPS, "+lat_1=87 +lat_2=83.6 +lat_0=85.43"); testProj("somerc", EPS, "+lat_0=47"); + testProj("tmerc", 1e-5, "+bounds=-2.5,-89,2.5,89"); testProj("tmerc", 2e-3, ""); testProj("sterea", EPS, "+lat_0=52"); + testProj("aea", EPS, "+lat_1=27.5 +lat_2=35 +lat_0=18"); + testProj("stere", 1e-5, "+lat_0=-90 +lat_ts=-70"); + testProj("stere", 1e-5, "+lat_0=90 +lat_ts=90"); + testProj("omerc", EPS, "+lat_0=4 +lonc=115 +alpha=53 +no_uoff +gamma=53.130 +bounds=112,4,116,7"); if (error2) { @@ -137,4 +142,6 @@ } Bounds b = p.getWorldBoundsLatLon(); + double maxDist = 0; + LatLon maxLatLon = null; for (int i = 0; i < NUM_IT; i++) { LatLon ll1 = random(b); @@ -145,7 +152,12 @@ if (dist > eps) { error2 = true; - text2 += id + ": dist " + dist + " at " + ll1 + "\n"; - return; + if (dist > maxDist) { + maxDist = dist; + maxLatLon = ll1; + } } + } + if (maxDist > 0) { + text2 += id + ": dist " + maxDist + " at " + maxLatLon + "\n"; } }