Index: trunk/data/projection/epsg =================================================================== --- trunk/data/projection/epsg (revision 8567) +++ trunk/data/projection/epsg (revision 8568) @@ -1,76 +1,76 @@ # NAD27(76) / MTM zone 8 -<2017> +proj=tmerc +lat_0=0 +lon_0=-73.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-75.5,40,-74,60 <> +<2017> +proj=tmerc +lat_0=0 +lon_0=-73.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-75.5,40,-74,60 <> # NAD27(76) / MTM zone 9 -<2018> +proj=tmerc +lat_0=0 +lon_0=-76.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-78.5,40,-74.5,60 <> +<2018> +proj=tmerc +lat_0=0 +lon_0=-76.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-78.5,40,-74.5,60 <> # NAD27(76) / MTM zone 10 -<2019> +proj=tmerc +lat_0=0 +lon_0=-79.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-81.5,40,-77.5,60 <> +<2019> +proj=tmerc +lat_0=0 +lon_0=-79.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-81.5,40,-77.5,60 <> # NAD27(76) / MTM zone 11 -<2020> +proj=tmerc +lat_0=0 +lon_0=-82.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-84,40,-80.5,60 <> +<2020> +proj=tmerc +lat_0=0 +lon_0=-82.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-84,40,-80.5,60 <> # NAD27(76) / MTM zone 12 -<2021> +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-83,40,-79,60 <> +<2021> +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-83,40,-79,60 <> # NAD27(76) / MTM zone 13 -<2022> +proj=tmerc +lat_0=0 +lon_0=-84 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-86,40,-82,60 <> +<2022> +proj=tmerc +lat_0=0 +lon_0=-84 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-86,40,-82,60 <> # NAD27(76) / MTM zone 14 -<2023> +proj=tmerc +lat_0=0 +lon_0=-87 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-89,40,-85,60 <> +<2023> +proj=tmerc +lat_0=0 +lon_0=-87 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-89,40,-85,60 <> # NAD27(76) / MTM zone 15 -<2024> +proj=tmerc +lat_0=0 +lon_0=-90 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-92,40,-88,60 <> +<2024> +proj=tmerc +lat_0=0 +lon_0=-90 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-92,40,-88,60 <> # NAD27(76) / MTM zone 16 -<2025> +proj=tmerc +lat_0=0 +lon_0=-93 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-95,40,-91,60 <> +<2025> +proj=tmerc +lat_0=0 +lon_0=-93 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-95,40,-91,60 <> # NAD27(76) / MTM zone 17 -<2026> +proj=tmerc +lat_0=0 +lon_0=-96 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-96,40,-94,60 <> +<2026> +proj=tmerc +lat_0=0 +lon_0=-96 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +units=m +bounds=-96,40,-94,60 <> # Lambert 93 (France) -<2154> +proj=lcc +lat_0=46.5 +lat_1=44 +lat_2=49 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,41,10.2,51 <> +<2154> +proj=lcc +lat_0=46.5 +lat_1=44 +lat_2=49 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,41,10.2,51 <> # PUWG 2000 Zone 5 (Poland) -<2176> +proj=tmerc +lon_0=15 +k_0=0.999923 +x_0=5500000 +ellps=GRS80 +nadgrids=null +bounds=13.5,49,16.5,54.84 <> +<2176> +proj=tmerc +lon_0=15 +k_0=0.999923 +x_0=5500000 +ellps=GRS80 +nadgrids=null +units=m +bounds=13.5,49,16.5,54.84 <> # PUWG 2000 Zone 6 (Poland) -<2177> +proj=tmerc +lon_0=18 +k_0=0.999923 +x_0=6500000 +ellps=GRS80 +nadgrids=null +bounds=16.5,49,19.5,54.84 <> +<2177> +proj=tmerc +lon_0=18 +k_0=0.999923 +x_0=6500000 +ellps=GRS80 +nadgrids=null +units=m +bounds=16.5,49,19.5,54.84 <> # PUWG 2000 Zone 7 (Poland) -<2178> +proj=tmerc +lon_0=21 +k_0=0.999923 +x_0=7500000 +ellps=GRS80 +nadgrids=null +bounds=19.5,49,22.5,54.84 <> +<2178> +proj=tmerc +lon_0=21 +k_0=0.999923 +x_0=7500000 +ellps=GRS80 +nadgrids=null +units=m +bounds=19.5,49,22.5,54.84 <> # PUWG 2000 Zone 8 (Poland) -<2179> +proj=tmerc +lon_0=24 +k_0=0.999923 +x_0=8500000 +ellps=GRS80 +nadgrids=null +bounds=22.5,49,25.5,54.84 <> +<2179> +proj=tmerc +lon_0=24 +k_0=0.999923 +x_0=8500000 +ellps=GRS80 +nadgrids=null +units=m +bounds=22.5,49,25.5,54.84 <> # PUWG 1992 (Poland) -<2180> +proj=tmerc +lon_0=19 +k_0=0.9993 +x_0=500000 +y_0=-5300000 +ellps=GRS80 +nadgrids=null +bounds=14.12,49,24.15,54.84 <> +<2180> +proj=tmerc +lon_0=19 +k_0=0.9993 +x_0=500000 +y_0=-5300000 +ellps=GRS80 +nadgrids=null +units=m +bounds=14.12,49,24.15,54.84 <> # UTM France (DOM) Fort Marigot -<2969> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=136.596,248.148,-429.789 +bounds=-63.25,17.6,-62.5,18.5 <> +<2969> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=136.596,248.148,-429.789 +units=m +bounds=-63.25,17.6,-62.5,18.5 <> # UTM France (DOM) Sainte Anne -<2970> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=-472.29,-5.63,-304.12,0.4362,-0.8374,0.2563,1.8984 +bounds=-61.9,15.8,-60.9,16.6 <> +<2970> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=-472.29,-5.63,-304.12,0.4362,-0.8374,0.2563,1.8984 +units=m +bounds=-61.9,15.8,-60.9,16.6 <> # UTM France (DOM) Guyane -<2972> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +nadgrids=null +bounds=-54,2.16,-49.62,9.06 <> +<2972> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-54,2.16,-49.62,9.06 <> # UTM France (DOM) Martinique -<2973> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=126.926,547.939,130.409,-2.7867,5.16124,-0.85844,13.82265 +bounds=-61.25,14.25,-60.725,15.025 <> +<2973> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=intl +towgs84=126.926,547.939,130.409,-2.7867,5.16124,-0.85844,13.82265 +units=m +bounds=-61.25,14.25,-60.725,15.025 <> # UTM France (DOM) Reunion -<2975> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=GRS80 +nadgrids=null +bounds=37.58,-25.92,58.27,-10.6 <> +<2975> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=GRS80 +nadgrids=null +units=m +bounds=37.58,-25.92,58.27,-10.6 <> # Monte Mario / Italy zone 1 -<3003> +proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl +bounds=5,36,13,48 <> +<3003> +proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl +units=m +bounds=5,36,13,48 <> # Monte Mario / Italy zone 2 -<3004> +proj=tmerc +lat_0=0 +lon_0=15 +k=0.9996 +x_0=2520000 +y_0=0 +ellps=intl +bounds=11,34,24,48 <> +<3004> +proj=tmerc +lat_0=0 +lon_0=15 +k=0.9996 +x_0=2520000 +y_0=0 +ellps=intl +units=m +bounds=11,34,24,48 <> # SWEREF99 13 30 / EPSG:3008 (Sweden) -<3008> +proj=tmerc +lon_0=13.5 +x_0=150000 +ellps=GRS80 +nadgrids=null +bounds=12.1,55.2,14.65,62.26 <> +<3008> +proj=tmerc +lon_0=13.5 +x_0=150000 +ellps=GRS80 +nadgrids=null +units=m +bounds=12.1,55.2,14.65,62.26 <> # LKS-92 (Latvia TM) -<3059> +proj=tmerc +lon_0=24 +k_0=0.9996 +x_0=500000 +y_0=-6000000 +ellps=GRS80 +nadgrids=null +bounds=-180,-90,180,90 <> +<3059> +proj=tmerc +lon_0=24 +k_0=0.9996 +x_0=500000 +y_0=-6000000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-180,-90,180,90 <> # Lambert Zone (Estonia) -<3301> +proj=lcc +lat_0=57.51755393055556 +lat_1=59.333333333333336 +lat_2=58 +lon_0=24 +x_0=500000 +y_0=6375000 +ellps=GRS80 +nadgrids=null +bounds=21.64,56.05,28.58,61.13 <> +<3301> +proj=lcc +lat_0=57.51755393055556 +lat_1=59.333333333333336 +lat_2=58 +lon_0=24 +x_0=500000 +y_0=6375000 +ellps=GRS80 +nadgrids=null +units=m +bounds=21.64,56.05,28.58,61.13 <> # Belgian Lambert 2008 -<3812> +proj=lcc +lat_0=50d47'52.134" +lat_1=49d50'0" +lat_2=51d10'0" +lon_0=4d21'33.177" +x_0=649328 +y_0=665262 +ellps=GRS80 +nadgrids=null +bounds=2.54,49.51,6.4,51.5 <> +<3812> +proj=lcc +lat_0=50d47'52.134" +lat_1=49d50'0" +lat_2=51d10'0" +lon_0=4d21'33.177" +x_0=649328 +y_0=665262 +ellps=GRS80 +nadgrids=null +units=m +bounds=2.54,49.51,6.4,51.5 <> # Pseudo-Mercator -<3857> +proj=josm:smerc +ellps=WGS84 +datum=WGS84 +bounds=-180,-85.05112877980659,180,85.05112877980659 <> +<3857> +proj=josm:smerc +ellps=WGS84 +datum=WGS84 +units=m +bounds=-180,-85.05112877980659,180,85.05112877980659 <> # Lambert CC9 (France) Zone 42 -<3942> +proj=lcc +lat_0=42 +lat_1=41.25 +lat_2=42.75 +lon_0=3 +x_0=1700000 +y_0=1200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,41,10.2,44.5 <> +<3942> +proj=lcc +lat_0=42 +lat_1=41.25 +lat_2=42.75 +lon_0=3 +x_0=1700000 +y_0=1200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,41,10.2,44.5 <> # Lambert CC9 (France) Zone 43 -<3943> +proj=lcc +lat_0=43 +lat_1=42.25 +lat_2=43.75 +lon_0=3 +x_0=1700000 +y_0=2200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,41,10.2,45.5 <> +<3943> +proj=lcc +lat_0=43 +lat_1=42.25 +lat_2=43.75 +lon_0=3 +x_0=1700000 +y_0=2200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,41,10.2,45.5 <> # Lambert CC9 (France) Zone 44 -<3944> +proj=lcc +lat_0=44 +lat_1=43.25 +lat_2=44.75 +lon_0=3 +x_0=1700000 +y_0=3200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,41.5,10.2,46.5 <> +<3944> +proj=lcc +lat_0=44 +lat_1=43.25 +lat_2=44.75 +lon_0=3 +x_0=1700000 +y_0=3200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,41.5,10.2,46.5 <> # Lambert CC9 (France) Zone 45 -<3945> +proj=lcc +lat_0=45 +lat_1=44.25 +lat_2=45.75 +lon_0=3 +x_0=1700000 +y_0=4200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,42.5,10.2,47.5 <> +<3945> +proj=lcc +lat_0=45 +lat_1=44.25 +lat_2=45.75 +lon_0=3 +x_0=1700000 +y_0=4200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,42.5,10.2,47.5 <> # Lambert CC9 (France) Zone 46 -<3946> +proj=lcc +lat_0=46 +lat_1=45.25 +lat_2=46.75 +lon_0=3 +x_0=1700000 +y_0=5200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,43.5,10.2,48.5 <> +<3946> +proj=lcc +lat_0=46 +lat_1=45.25 +lat_2=46.75 +lon_0=3 +x_0=1700000 +y_0=5200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,43.5,10.2,48.5 <> # Lambert CC9 (France) Zone 47 -<3947> +proj=lcc +lat_0=47 +lat_1=46.25 +lat_2=47.75 +lon_0=3 +x_0=1700000 +y_0=6200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,44.5,10.2,49.5 <> +<3947> +proj=lcc +lat_0=47 +lat_1=46.25 +lat_2=47.75 +lon_0=3 +x_0=1700000 +y_0=6200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,44.5,10.2,49.5 <> # Lambert CC9 (France) Zone 48 -<3948> +proj=lcc +lat_0=48 +lat_1=47.25 +lat_2=48.75 +lon_0=3 +x_0=1700000 +y_0=7200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,45.5,10.2,50.5 <> +<3948> +proj=lcc +lat_0=48 +lat_1=47.25 +lat_2=48.75 +lon_0=3 +x_0=1700000 +y_0=7200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,45.5,10.2,50.5 <> # Lambert CC9 (France) Zone 49 -<3949> +proj=lcc +lat_0=49 +lat_1=48.25 +lat_2=49.75 +lon_0=3 +x_0=1700000 +y_0=8200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,46.5,10.2,51.1 <> +<3949> +proj=lcc +lat_0=49 +lat_1=48.25 +lat_2=49.75 +lon_0=3 +x_0=1700000 +y_0=8200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,46.5,10.2,51.1 <> # Lambert CC9 (France) Zone 50 -<3950> +proj=lcc +lat_0=50 +lat_1=49.25 +lat_2=50.75 +lon_0=3 +x_0=1700000 +y_0=9200000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,47.5,10.2,51.1 <> +<3950> +proj=lcc +lat_0=50 +lat_1=49.25 +lat_2=50.75 +lon_0=3 +x_0=1700000 +y_0=9200000 +ellps=GRS80 +nadgrids=null +units=m +bounds=-5.5,47.5,10.2,51.1 <> # ETRS89 <4258> +proj=lonlat +ellps=GRS80 +datum=GRS80 +bounds=-180,-90,180,90 <> @@ -78,285 +78,285 @@ <4326> +proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90 <> # Swiss Grid (Switzerland) -<21781> +proj=somerc +lat_0=46d57'8.66" +lon_0=7d26'22.5" +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.374,15.056,405.346 +bounds=5.7,45.7,10.6,47.9 <> +<21781> +proj=somerc +lat_0=46d57'8.66" +lon_0=7d26'22.5" +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.374,15.056,405.346 +units=m +bounds=5.7,45.7,10.6,47.9 <> # HD72 / EOV (Hungary) <23700> +proj=somerc +lat_0=47.14439372222222 +lon_0=19.04857177777778 +k_0=0.99993 +x_0=650000 +y_0=200000 +ellps=GRS67 +towgs84=52.17,-71.82,-14.9 +units=m +bounds=16.1200,45.7800,22.9100,48.6000 <> # ETRS89 / UTM zone 28N -<25828> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=-20,-5,-10,85 <> +<25828> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-20,-5,-10,85 <> # ETRS89 / UTM zone 29N -<25829> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=-14,-5,-4,85 <> +<25829> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-14,-5,-4,85 <> # ETRS89 / UTM zone 30N -<25830> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=-8,-5,2,85 <> +<25830> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-8,-5,2,85 <> # ETRS89 / UTM zone 31N -<25831> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=-2,-5,8,85 <> +<25831> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-2,-5,8,85 <> # ETRS89 / UTM zone 32N -<25832> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=4,-5,14,85 <> +<25832> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=4,-5,14,85 <> # ETRS89 / UTM zone 33N -<25833> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=10,-5,20,85 <> +<25833> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=10,-5,20,85 <> # ETRS89 / UTM zone 34N -<25834> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=16,-5,26,85 <> +<25834> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=16,-5,26,85 <> # ETRS89 / UTM zone 35N -<25835> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=22,-5,32,85 <> +<25835> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=22,-5,32,85 <> # ETRS89 / UTM zone 36N -<25836> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=28,-5,38,85 <> +<25836> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=28,-5,38,85 <> # ETRS89 / UTM zone 37N -<25837> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=34,-5,44,85 <> +<25837> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=34,-5,44,85 <> # ETRS89 / UTM zone 38N -<25838> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +bounds=40,-5,50,85 <> +<25838> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +ellps=GRS80 +datum=GRS80 +units=m +bounds=40,-5,50,85 <> # Lambert 4 Zones France (Nord) -<27561> +proj=lcc +lat_0=49.5 +lat_1=48d35'54.682" +lat_2=50d23'45.282" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +bounds=-4.416666666666665,46.65,9.18,51.300000000000004 <> +<27561> +proj=lcc +lat_0=49.5 +lat_1=48d35'54.682" +lat_2=50d23'45.282" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +units=m +bounds=-4.416666666666665,46.65,9.18,51.300000000000004 <> # Lambert 4 Zones France (Centre) -<27562> +proj=lcc +lat_0=46.8 +lat_1=45d53'56.108" +lat_2=47d41'45.652" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +bounds=-4.416666666666665,43.95,9.18,49.65 <> +<27562> +proj=lcc +lat_0=46.8 +lat_1=45d53'56.108" +lat_2=47d41'45.652" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +units=m +bounds=-4.416666666666665,43.95,9.18,49.65 <> # Lambert 4 Zones France (South) -<27563> +proj=lcc +lat_0=44.1 +lat_1=43d11'57.449" +lat_2=44d59'45.938" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +bounds=-4.416666666666665,41.49,9.18,46.95 <> +<27563> +proj=lcc +lat_0=44.1 +lat_1=43d11'57.449" +lat_2=44d59'45.938" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +units=m +bounds=-4.416666666666665,41.49,9.18,46.95 <> # Lambert 4 Zones France (Corsica) -<27564> +proj=lcc +lat_0=42.165 +lat_1=41d33'37.396" +lat_2=42d46'3.588" +lon_0=2d20'14.025" +x_0=234.358 +y_0=185861.369 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +bounds=-4.416666666666665,41.49,9.18,44.267667 <> +<27564> +proj=lcc +lat_0=42.165 +lat_1=41d33'37.396" +lat_2=42d46'3.588" +lon_0=2d20'14.025" +x_0=234.358 +y_0=185861.369 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +units=m +bounds=-4.416666666666665,41.49,9.18,44.267667 <> # Belgian Lambert 1972 -<31370> +proj=lcc +lat_0=90 +lat_1=49d50'0.00204" +lat_2=51d10'0.00204" +lon_0=4d22'2.952" +x_0=150000.013 +y_0=5400088.438 +ellps=intl +towgs84=-99.06,53.32,-112.49,0.419,-0.83,1.885,-1.0 +bounds=2.54,49.51,6.4,51.5 <> +<31370> +proj=lcc +lat_0=90 +lat_1=49d50'0.00204" +lat_2=51d10'0.00204" +lon_0=4d22'2.952" +x_0=150000.013 +y_0=5400088.438 +ellps=intl +towgs84=-99.06,53.32,-112.49,0.419,-0.83,1.885,-1.0 +units=m +bounds=2.54,49.51,6.4,51.5 <> # Gauß-Krüger Zone 2 -<31466> +proj=tmerc +lon_0=6 +x_0=2500000 +ellps=bessel +nadgrids=BETA2007.gsb +bounds=3.5,-5,8.5,85 <> +<31466> +proj=tmerc +lon_0=6 +x_0=2500000 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +bounds=3.5,-5,8.5,85 <> # Gauß-Krüger Zone 3 -<31467> +proj=tmerc +lon_0=9 +x_0=3500000 +ellps=bessel +nadgrids=BETA2007.gsb +bounds=6.5,-5,11.5,85 <> +<31467> +proj=tmerc +lon_0=9 +x_0=3500000 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +bounds=6.5,-5,11.5,85 <> # Gauß-Krüger Zone 4 -<31468> +proj=tmerc +lon_0=12 +x_0=4500000 +ellps=bessel +nadgrids=BETA2007.gsb +bounds=9.5,-5,14.5,85 <> +<31468> +proj=tmerc +lon_0=12 +x_0=4500000 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +bounds=9.5,-5,14.5,85 <> # Gauß-Krüger Zone 5 -<31469> +proj=tmerc +lon_0=15 +x_0=5500000 +ellps=bessel +nadgrids=BETA2007.gsb +bounds=12.5,-5,17.5,85 <> +<31469> +proj=tmerc +lon_0=15 +x_0=5500000 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +bounds=12.5,-5,17.5,85 <> # UTM zone 1N -<32601> +proj=tmerc +lon_0=-177 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-182,-5,-172,85 <> +<32601> +proj=tmerc +lon_0=-177 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-182,-5,-172,85 <> # UTM zone 2N -<32602> +proj=tmerc +lon_0=-171 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-176,-5,-166,85 <> +<32602> +proj=tmerc +lon_0=-171 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-176,-5,-166,85 <> # UTM zone 3N -<32603> +proj=tmerc +lon_0=-165 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-170,-5,-160,85 <> +<32603> +proj=tmerc +lon_0=-165 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-170,-5,-160,85 <> # UTM zone 4N -<32604> +proj=tmerc +lon_0=-159 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-164,-5,-154,85 <> +<32604> +proj=tmerc +lon_0=-159 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-164,-5,-154,85 <> # UTM zone 5N -<32605> +proj=tmerc +lon_0=-153 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-158,-5,-148,85 <> +<32605> +proj=tmerc +lon_0=-153 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-158,-5,-148,85 <> # UTM zone 6N -<32606> +proj=tmerc +lon_0=-147 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-152,-5,-142,85 <> +<32606> +proj=tmerc +lon_0=-147 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-152,-5,-142,85 <> # UTM zone 7N -<32607> +proj=tmerc +lon_0=-141 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-146,-5,-136,85 <> +<32607> +proj=tmerc +lon_0=-141 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-146,-5,-136,85 <> # UTM zone 8N -<32608> +proj=tmerc +lon_0=-135 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-140,-5,-130,85 <> +<32608> +proj=tmerc +lon_0=-135 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-140,-5,-130,85 <> # UTM zone 9N -<32609> +proj=tmerc +lon_0=-129 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-134,-5,-124,85 <> +<32609> +proj=tmerc +lon_0=-129 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-134,-5,-124,85 <> # UTM zone 10N -<32610> +proj=tmerc +lon_0=-123 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-128,-5,-118,85 <> +<32610> +proj=tmerc +lon_0=-123 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-128,-5,-118,85 <> # UTM zone 11N -<32611> +proj=tmerc +lon_0=-117 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-122,-5,-112,85 <> +<32611> +proj=tmerc +lon_0=-117 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-122,-5,-112,85 <> # UTM zone 12N -<32612> +proj=tmerc +lon_0=-111 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-116,-5,-106,85 <> +<32612> +proj=tmerc +lon_0=-111 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-116,-5,-106,85 <> # UTM zone 13N -<32613> +proj=tmerc +lon_0=-105 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-110,-5,-100,85 <> +<32613> +proj=tmerc +lon_0=-105 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-110,-5,-100,85 <> # UTM zone 14N -<32614> +proj=tmerc +lon_0=-99 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-104,-5,-94,85 <> +<32614> +proj=tmerc +lon_0=-99 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-104,-5,-94,85 <> # UTM zone 15N -<32615> +proj=tmerc +lon_0=-93 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-98,-5,-88,85 <> +<32615> +proj=tmerc +lon_0=-93 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-98,-5,-88,85 <> # UTM zone 16N -<32616> +proj=tmerc +lon_0=-87 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-92,-5,-82,85 <> +<32616> +proj=tmerc +lon_0=-87 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-92,-5,-82,85 <> # UTM zone 17N -<32617> +proj=tmerc +lon_0=-81 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-86,-5,-76,85 <> +<32617> +proj=tmerc +lon_0=-81 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-86,-5,-76,85 <> # UTM zone 18N -<32618> +proj=tmerc +lon_0=-75 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-80,-5,-70,85 <> +<32618> +proj=tmerc +lon_0=-75 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-80,-5,-70,85 <> # UTM zone 19N -<32619> +proj=tmerc +lon_0=-69 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-74,-5,-64,85 <> +<32619> +proj=tmerc +lon_0=-69 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-74,-5,-64,85 <> # UTM zone 20N -<32620> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-68,-5,-58,85 <> +<32620> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-68,-5,-58,85 <> # UTM zone 21N -<32621> +proj=tmerc +lon_0=-57 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-62,-5,-52,85 <> +<32621> +proj=tmerc +lon_0=-57 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-62,-5,-52,85 <> # UTM zone 22N -<32622> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-56,-5,-46,85 <> +<32622> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-56,-5,-46,85 <> # UTM zone 23N -<32623> +proj=tmerc +lon_0=-45 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-50,-5,-40,85 <> +<32623> +proj=tmerc +lon_0=-45 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-50,-5,-40,85 <> # UTM zone 24N -<32624> +proj=tmerc +lon_0=-39 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-44,-5,-34,85 <> +<32624> +proj=tmerc +lon_0=-39 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-44,-5,-34,85 <> # UTM zone 25N -<32625> +proj=tmerc +lon_0=-33 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-38,-5,-28,85 <> +<32625> +proj=tmerc +lon_0=-33 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-38,-5,-28,85 <> # UTM zone 26N -<32626> +proj=tmerc +lon_0=-27 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-32,-5,-22,85 <> +<32626> +proj=tmerc +lon_0=-27 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-32,-5,-22,85 <> # UTM zone 27N -<32627> +proj=tmerc +lon_0=-21 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-26,-5,-16,85 <> +<32627> +proj=tmerc +lon_0=-21 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-26,-5,-16,85 <> # UTM zone 28N -<32628> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-20,-5,-10,85 <> +<32628> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-20,-5,-10,85 <> # UTM zone 29N -<32629> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-14,-5,-4,85 <> +<32629> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-14,-5,-4,85 <> # UTM zone 30N -<32630> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-8,-5,2,85 <> +<32630> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-8,-5,2,85 <> # UTM zone 31N -<32631> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=-2,-5,8,85 <> +<32631> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-2,-5,8,85 <> # UTM zone 32N -<32632> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=4,-5,14,85 <> +<32632> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=4,-5,14,85 <> # UTM zone 33N -<32633> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=10,-5,20,85 <> +<32633> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=10,-5,20,85 <> # UTM zone 34N -<32634> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=16,-5,26,85 <> +<32634> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=16,-5,26,85 <> # UTM zone 35N -<32635> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=22,-5,32,85 <> +<32635> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=22,-5,32,85 <> # UTM zone 36N -<32636> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=28,-5,38,85 <> +<32636> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=28,-5,38,85 <> # UTM zone 37N -<32637> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=34,-5,44,85 <> +<32637> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=34,-5,44,85 <> # UTM zone 38N -<32638> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=40,-5,50,85 <> +<32638> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=40,-5,50,85 <> # UTM zone 39N -<32639> +proj=tmerc +lon_0=51 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=46,-5,56,85 <> +<32639> +proj=tmerc +lon_0=51 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=46,-5,56,85 <> # UTM zone 40N -<32640> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=52,-5,62,85 <> +<32640> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=52,-5,62,85 <> # UTM zone 41N -<32641> +proj=tmerc +lon_0=63 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=58,-5,68,85 <> +<32641> +proj=tmerc +lon_0=63 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=58,-5,68,85 <> # UTM zone 42N -<32642> +proj=tmerc +lon_0=69 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=64,-5,74,85 <> +<32642> +proj=tmerc +lon_0=69 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=64,-5,74,85 <> # UTM zone 43N -<32643> +proj=tmerc +lon_0=75 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=70,-5,80,85 <> +<32643> +proj=tmerc +lon_0=75 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=70,-5,80,85 <> # UTM zone 44N -<32644> +proj=tmerc +lon_0=81 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=76,-5,86,85 <> +<32644> +proj=tmerc +lon_0=81 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=76,-5,86,85 <> # UTM zone 45N -<32645> +proj=tmerc +lon_0=87 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=82,-5,92,85 <> +<32645> +proj=tmerc +lon_0=87 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=82,-5,92,85 <> # UTM zone 46N -<32646> +proj=tmerc +lon_0=93 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=88,-5,98,85 <> +<32646> +proj=tmerc +lon_0=93 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=88,-5,98,85 <> # UTM zone 47N -<32647> +proj=tmerc +lon_0=99 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=94,-5,104,85 <> +<32647> +proj=tmerc +lon_0=99 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=94,-5,104,85 <> # UTM zone 48N -<32648> +proj=tmerc +lon_0=105 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=100,-5,110,85 <> +<32648> +proj=tmerc +lon_0=105 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=100,-5,110,85 <> # UTM zone 49N -<32649> +proj=tmerc +lon_0=111 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=106,-5,116,85 <> +<32649> +proj=tmerc +lon_0=111 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=106,-5,116,85 <> # UTM zone 50N -<32650> +proj=tmerc +lon_0=117 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=112,-5,122,85 <> +<32650> +proj=tmerc +lon_0=117 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=112,-5,122,85 <> # UTM zone 51N -<32651> +proj=tmerc +lon_0=123 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=118,-5,128,85 <> +<32651> +proj=tmerc +lon_0=123 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=118,-5,128,85 <> # UTM zone 52N -<32652> +proj=tmerc +lon_0=129 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=124,-5,134,85 <> +<32652> +proj=tmerc +lon_0=129 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=124,-5,134,85 <> # UTM zone 53N -<32653> +proj=tmerc +lon_0=135 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=130,-5,140,85 <> +<32653> +proj=tmerc +lon_0=135 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=130,-5,140,85 <> # UTM zone 54N -<32654> +proj=tmerc +lon_0=141 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=136,-5,146,85 <> +<32654> +proj=tmerc +lon_0=141 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=136,-5,146,85 <> # UTM zone 55N -<32655> +proj=tmerc +lon_0=147 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=142,-5,152,85 <> +<32655> +proj=tmerc +lon_0=147 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=142,-5,152,85 <> # UTM zone 56N -<32656> +proj=tmerc +lon_0=153 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=148,-5,158,85 <> +<32656> +proj=tmerc +lon_0=153 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=148,-5,158,85 <> # UTM zone 57N -<32657> +proj=tmerc +lon_0=159 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=154,-5,164,85 <> +<32657> +proj=tmerc +lon_0=159 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=154,-5,164,85 <> # UTM zone 58N -<32658> +proj=tmerc +lon_0=165 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=160,-5,170,85 <> +<32658> +proj=tmerc +lon_0=165 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=160,-5,170,85 <> # UTM zone 59N -<32659> +proj=tmerc +lon_0=171 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=166,-5,176,85 <> +<32659> +proj=tmerc +lon_0=171 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=166,-5,176,85 <> # UTM zone 60N -<32660> +proj=tmerc +lon_0=177 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +bounds=172,-5,182,85 <> +<32660> +proj=tmerc +lon_0=177 +k_0=0.9996 +x_0=500000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=172,-5,182,85 <> # UTM zone 1S -<32701> +proj=tmerc +lon_0=-177 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-182,-85,-172,5 <> +<32701> +proj=tmerc +lon_0=-177 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-182,-85,-172,5 <> # UTM zone 2S -<32702> +proj=tmerc +lon_0=-171 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-176,-85,-166,5 <> +<32702> +proj=tmerc +lon_0=-171 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-176,-85,-166,5 <> # UTM zone 3S -<32703> +proj=tmerc +lon_0=-165 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-170,-85,-160,5 <> +<32703> +proj=tmerc +lon_0=-165 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-170,-85,-160,5 <> # UTM zone 4S -<32704> +proj=tmerc +lon_0=-159 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-164,-85,-154,5 <> +<32704> +proj=tmerc +lon_0=-159 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-164,-85,-154,5 <> # UTM zone 5S -<32705> +proj=tmerc +lon_0=-153 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-158,-85,-148,5 <> +<32705> +proj=tmerc +lon_0=-153 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-158,-85,-148,5 <> # UTM zone 6S -<32706> +proj=tmerc +lon_0=-147 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-152,-85,-142,5 <> +<32706> +proj=tmerc +lon_0=-147 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-152,-85,-142,5 <> # UTM zone 7S -<32707> +proj=tmerc +lon_0=-141 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-146,-85,-136,5 <> +<32707> +proj=tmerc +lon_0=-141 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-146,-85,-136,5 <> # UTM zone 8S -<32708> +proj=tmerc +lon_0=-135 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-140,-85,-130,5 <> +<32708> +proj=tmerc +lon_0=-135 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-140,-85,-130,5 <> # UTM zone 9S -<32709> +proj=tmerc +lon_0=-129 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-134,-85,-124,5 <> +<32709> +proj=tmerc +lon_0=-129 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-134,-85,-124,5 <> # UTM zone 10S -<32710> +proj=tmerc +lon_0=-123 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-128,-85,-118,5 <> +<32710> +proj=tmerc +lon_0=-123 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-128,-85,-118,5 <> # UTM zone 11S -<32711> +proj=tmerc +lon_0=-117 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-122,-85,-112,5 <> +<32711> +proj=tmerc +lon_0=-117 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-122,-85,-112,5 <> # UTM zone 12S -<32712> +proj=tmerc +lon_0=-111 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-116,-85,-106,5 <> +<32712> +proj=tmerc +lon_0=-111 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-116,-85,-106,5 <> # UTM zone 13S -<32713> +proj=tmerc +lon_0=-105 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-110,-85,-100,5 <> +<32713> +proj=tmerc +lon_0=-105 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-110,-85,-100,5 <> # UTM zone 14S -<32714> +proj=tmerc +lon_0=-99 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-104,-85,-94,5 <> +<32714> +proj=tmerc +lon_0=-99 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-104,-85,-94,5 <> # UTM zone 15S -<32715> +proj=tmerc +lon_0=-93 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-98,-85,-88,5 <> +<32715> +proj=tmerc +lon_0=-93 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-98,-85,-88,5 <> # UTM zone 16S -<32716> +proj=tmerc +lon_0=-87 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-92,-85,-82,5 <> +<32716> +proj=tmerc +lon_0=-87 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-92,-85,-82,5 <> # UTM zone 17S -<32717> +proj=tmerc +lon_0=-81 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-86,-85,-76,5 <> +<32717> +proj=tmerc +lon_0=-81 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-86,-85,-76,5 <> # UTM zone 18S -<32718> +proj=tmerc +lon_0=-75 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-80,-85,-70,5 <> +<32718> +proj=tmerc +lon_0=-75 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-80,-85,-70,5 <> # UTM zone 19S -<32719> +proj=tmerc +lon_0=-69 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-74,-85,-64,5 <> +<32719> +proj=tmerc +lon_0=-69 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-74,-85,-64,5 <> # UTM zone 20S -<32720> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-68,-85,-58,5 <> +<32720> +proj=tmerc +lon_0=-63 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-68,-85,-58,5 <> # UTM zone 21S -<32721> +proj=tmerc +lon_0=-57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-62,-85,-52,5 <> +<32721> +proj=tmerc +lon_0=-57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-62,-85,-52,5 <> # UTM zone 22S -<32722> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-56,-85,-46,5 <> +<32722> +proj=tmerc +lon_0=-51 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-56,-85,-46,5 <> # UTM zone 23S -<32723> +proj=tmerc +lon_0=-45 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-50,-85,-40,5 <> +<32723> +proj=tmerc +lon_0=-45 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-50,-85,-40,5 <> # UTM zone 24S -<32724> +proj=tmerc +lon_0=-39 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-44,-85,-34,5 <> +<32724> +proj=tmerc +lon_0=-39 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-44,-85,-34,5 <> # UTM zone 25S -<32725> +proj=tmerc +lon_0=-33 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-38,-85,-28,5 <> +<32725> +proj=tmerc +lon_0=-33 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-38,-85,-28,5 <> # UTM zone 26S -<32726> +proj=tmerc +lon_0=-27 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-32,-85,-22,5 <> +<32726> +proj=tmerc +lon_0=-27 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-32,-85,-22,5 <> # UTM zone 27S -<32727> +proj=tmerc +lon_0=-21 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-26,-85,-16,5 <> +<32727> +proj=tmerc +lon_0=-21 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-26,-85,-16,5 <> # UTM zone 28S -<32728> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-20,-85,-10,5 <> +<32728> +proj=tmerc +lon_0=-15 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-20,-85,-10,5 <> # UTM zone 29S -<32729> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-14,-85,-4,5 <> +<32729> +proj=tmerc +lon_0=-9 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-14,-85,-4,5 <> # UTM zone 30S -<32730> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-8,-85,2,5 <> +<32730> +proj=tmerc +lon_0=-3 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-8,-85,2,5 <> # UTM zone 31S -<32731> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=-2,-85,8,5 <> +<32731> +proj=tmerc +lon_0=3 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-2,-85,8,5 <> # UTM zone 32S -<32732> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=4,-85,14,5 <> +<32732> +proj=tmerc +lon_0=9 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=4,-85,14,5 <> # UTM zone 33S -<32733> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=10,-85,20,5 <> +<32733> +proj=tmerc +lon_0=15 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=10,-85,20,5 <> # UTM zone 34S -<32734> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=16,-85,26,5 <> +<32734> +proj=tmerc +lon_0=21 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=16,-85,26,5 <> # UTM zone 35S -<32735> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=22,-85,32,5 <> +<32735> +proj=tmerc +lon_0=27 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=22,-85,32,5 <> # UTM zone 36S -<32736> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=28,-85,38,5 <> +<32736> +proj=tmerc +lon_0=33 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=28,-85,38,5 <> # UTM zone 37S -<32737> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=34,-85,44,5 <> +<32737> +proj=tmerc +lon_0=39 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=34,-85,44,5 <> # UTM zone 38S -<32738> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=40,-85,50,5 <> +<32738> +proj=tmerc +lon_0=45 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=40,-85,50,5 <> # UTM zone 39S -<32739> +proj=tmerc +lon_0=51 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=46,-85,56,5 <> +<32739> +proj=tmerc +lon_0=51 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=46,-85,56,5 <> # UTM zone 40S -<32740> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=52,-85,62,5 <> +<32740> +proj=tmerc +lon_0=57 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=52,-85,62,5 <> # UTM zone 41S -<32741> +proj=tmerc +lon_0=63 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=58,-85,68,5 <> +<32741> +proj=tmerc +lon_0=63 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=58,-85,68,5 <> # UTM zone 42S -<32742> +proj=tmerc +lon_0=69 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=64,-85,74,5 <> +<32742> +proj=tmerc +lon_0=69 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=64,-85,74,5 <> # UTM zone 43S -<32743> +proj=tmerc +lon_0=75 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=70,-85,80,5 <> +<32743> +proj=tmerc +lon_0=75 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=70,-85,80,5 <> # UTM zone 44S -<32744> +proj=tmerc +lon_0=81 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=76,-85,86,5 <> +<32744> +proj=tmerc +lon_0=81 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=76,-85,86,5 <> # UTM zone 45S -<32745> +proj=tmerc +lon_0=87 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=82,-85,92,5 <> +<32745> +proj=tmerc +lon_0=87 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=82,-85,92,5 <> # UTM zone 46S -<32746> +proj=tmerc +lon_0=93 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=88,-85,98,5 <> +<32746> +proj=tmerc +lon_0=93 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=88,-85,98,5 <> # UTM zone 47S -<32747> +proj=tmerc +lon_0=99 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=94,-85,104,5 <> +<32747> +proj=tmerc +lon_0=99 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=94,-85,104,5 <> # UTM zone 48S -<32748> +proj=tmerc +lon_0=105 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=100,-85,110,5 <> +<32748> +proj=tmerc +lon_0=105 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=100,-85,110,5 <> # UTM zone 49S -<32749> +proj=tmerc +lon_0=111 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=106,-85,116,5 <> +<32749> +proj=tmerc +lon_0=111 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=106,-85,116,5 <> # UTM zone 50S -<32750> +proj=tmerc +lon_0=117 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=112,-85,122,5 <> +<32750> +proj=tmerc +lon_0=117 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=112,-85,122,5 <> # UTM zone 51S -<32751> +proj=tmerc +lon_0=123 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=118,-85,128,5 <> +<32751> +proj=tmerc +lon_0=123 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=118,-85,128,5 <> # UTM zone 52S -<32752> +proj=tmerc +lon_0=129 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=124,-85,134,5 <> +<32752> +proj=tmerc +lon_0=129 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=124,-85,134,5 <> # UTM zone 53S -<32753> +proj=tmerc +lon_0=135 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=130,-85,140,5 <> +<32753> +proj=tmerc +lon_0=135 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=130,-85,140,5 <> # UTM zone 54S -<32754> +proj=tmerc +lon_0=141 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=136,-85,146,5 <> +<32754> +proj=tmerc +lon_0=141 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=136,-85,146,5 <> # UTM zone 55S -<32755> +proj=tmerc +lon_0=147 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=142,-85,152,5 <> +<32755> +proj=tmerc +lon_0=147 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=142,-85,152,5 <> # UTM zone 56S -<32756> +proj=tmerc +lon_0=153 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=148,-85,158,5 <> +<32756> +proj=tmerc +lon_0=153 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=148,-85,158,5 <> # UTM zone 57S -<32757> +proj=tmerc +lon_0=159 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=154,-85,164,5 <> +<32757> +proj=tmerc +lon_0=159 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=154,-85,164,5 <> # UTM zone 58S -<32758> +proj=tmerc +lon_0=165 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=160,-85,170,5 <> +<32758> +proj=tmerc +lon_0=165 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=160,-85,170,5 <> # UTM zone 59S -<32759> +proj=tmerc +lon_0=171 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=166,-85,176,5 <> +<32759> +proj=tmerc +lon_0=171 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=166,-85,176,5 <> # UTM zone 60S -<32760> +proj=tmerc +lon_0=177 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +bounds=172,-85,182,5 <> +<32760> +proj=tmerc +lon_0=177 +k_0=0.9996 +x_0=500000 +y_0=10000000 +ellps=WGS84 +datum=WGS84 +units=m +bounds=172,-85,182,5 <> Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8568) @@ -2,8 +2,6 @@ package org.openstreetmap.josm.data.cache; -import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; @@ -30,4 +28,5 @@ import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult; import org.openstreetmap.josm.data.preferences.IntegerProperty; +import org.openstreetmap.josm.tools.Utils; /** @@ -350,5 +349,5 @@ attributes.setResponseCode(responseCode(urlConn)); - byte[] raw = read(urlConn); + byte[] raw = Utils.readBytesFromStream(urlConn.getInputStream()); if (isResponseLoadable(urlConn.getHeaderFields(), responseCode(urlConn), raw)) { @@ -473,26 +472,4 @@ } - private static byte[] read(URLConnection urlConn) throws IOException { - InputStream input = urlConn.getInputStream(); - try { - ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available()); - byte[] buffer = new byte[2048]; - boolean finished = false; - do { - int read = input.read(buffer); - if (read >= 0) { - bout.write(buffer, 0, read); - } else { - finished = true; - } - } while (!finished); - if (bout.size() == 0) - return null; - return bout.toByteArray(); - } finally { - input.close(); - } - } - /** * TODO: move to JobFactory Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 8568) @@ -56,5 +56,7 @@ SCANEX("scanex"), /** A WMS endpoint entry only stores the WMS server info, without layer, which are chosen later by the user. **/ - WMS_ENDPOINT("wms_endpoint"); + WMS_ENDPOINT("wms_endpoint"), + /** WMTS stores GetCapabilities URL. Does not store any information about the layer **/ + WMTS("wmts"); Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8568) +++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8568) @@ -0,0 +1,606 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.imagery; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.GridBagLayout; +import java.awt.Point; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.ListSelectionModel; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.openstreetmap.gui.jmapviewer.Coordinate; +import org.openstreetmap.gui.jmapviewer.Tile; +import org.openstreetmap.gui.jmapviewer.TileXY; +import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate; +import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource; +import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.projection.Projection; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.io.CachedFile; +import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Utils; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Tile Source handling WMS providers + * + * @author Wiktor Niesiobędzki + * @since 8526 + */ +public class WMTSTileSource extends TMSTileSource implements TemplatedTileSource { + private static final String PATTERN_HEADER = "\\{header\\(([^,]+),([^}]+)\\)\\}"; + + private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={style}&" + + "FORMAT={format}&tileMatrixSet={TileMatrixSet}&tileMatrix={TileMatrix}&tileRow={TileRow}&tileCol={TileCol}"; + + private static final String[] ALL_PATTERNS = { + PATTERN_HEADER, + }; + + private class TileMatrix { + String identifier; + double scaleDenominator; + EastNorth topLeftCorner; + int tileWidth; + int tileHeight; + } + + private class TileMatrixSet { + SortedSet tileMatrix = new TreeSet<>(new Comparator() { + @Override + public int compare(TileMatrix o1, TileMatrix o2) { + // reverse the order, so it will be from greatest (lowest zoom level) to lowest value (highest zoom level) + return -1 * Double.compare(o1.scaleDenominator, o2.scaleDenominator); + } + }); // sorted by zoom level + String crs; + String identifier; + } + + private class Layer { + String format; + String name; + Map tileMatrixSetByCRS = new ConcurrentHashMap<>(); + public String baseUrl; + } + + private enum TransferMode { + KVP("KVP"), + REST("RESTful"); + + private final String typeString; + + private TransferMode(String urlString) { + this.typeString = urlString; + } + + private final String getTypeString() { + return typeString; + } + + private static TransferMode fromString(String s) { + for (TransferMode type : TransferMode.values()) { + if (type.getTypeString().equals(s)) { + return type; + } + } + return null; + } + } + + private class SelectLayerDialog extends ExtendedDialog { + private Layer[] layers; + private JList list; + + private SelectLayerDialog(Collection layers) { + super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")}); + this.layers = layers.toArray(new Layer[]{}); + this.list = new JList<>(getLayerNames(layers)); + this.list.setPreferredSize(new Dimension(400, 400)); + this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION) ; + JPanel panel = new JPanel(new GridBagLayout()); + panel.add(this.list, GBC.eol().fill()); + setContent(panel); + } + + private String[] getLayerNames(Collection layers) { + Collection ret = new ArrayList<>(); + for(Layer layer: layers) { + ret.add(layer.name); + } + return ret.toArray(new String[]{}); + } + + public Layer getSelectedLayer() { + int index = list.getSelectedIndex(); + if (index < 0) { + return null; //nothing selected + } + return layers[index]; + } + } + + private Map headers = new HashMap<>(); + private Collection layers; + private Layer currentLayer; + private TileMatrixSet currentTileMatrixSet; + private double crsScale; + private TransferMode transferMode; + + /** + * Creates a tile source based on imagery info + * @param info imagery info + * @throws IOException + */ + public WMTSTileSource(ImageryInfo info) throws IOException { + super(info); + this.baseUrl = normalizeCapabilitiesUrl(handleTemplate(info.getUrl())); + this.layers = getCapabilities(); + if (layers.size() > 1) { + SelectLayerDialog layerSelection = new SelectLayerDialog(layers); + if (layerSelection.showDialog().getValue() == 1) { + this.currentLayer = layerSelection.getSelectedLayer(); + // TODO: save layer information into ImageryInfo / ImageryPreferences + } else { + throw new IllegalArgumentException(); //user canceled operation + } + } else if (layers.size() == 1) { + this.currentLayer = this.layers.iterator().next(); + } else { + throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl())); + } + + initProjection(); + } + + + + private String handleTemplate(String url) { + Pattern pattern = Pattern.compile(PATTERN_HEADER); + StringBuffer output = new StringBuffer(); + Matcher matcher = pattern.matcher(url); + while (matcher.find()) { + this.headers.put(matcher.group(1), matcher.group(2)); + matcher.appendReplacement(output, ""); + } + matcher.appendTail(output); + return output.toString(); + } + + private Collection getCapabilities() throws IOException { + DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); + builderFactory.setValidating(false); + builderFactory.setNamespaceAware(false); + DocumentBuilder builder = null; + byte[] data = {}; + InputStream in = new CachedFile(baseUrl). + setHttpHeaders(headers). + setMaxAge(7 * CachedFile.DAYS). + setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince). + getInputStream(); + try { + builder = builderFactory.newDocumentBuilder(); + data = Utils.readBytesFromStream(in); + if (data == null || data.length == 0) { + throw new IllegalArgumentException("Could not read data from: " + baseUrl); + } + Document document = builder.parse(new ByteArrayInputStream(data)); + Node getTileOperation = getByXpath(document, "/Capabilities/OperationsMetadata/Operation[@name=\"GetTile\"]/DCP/HTTP/Get").item(0); + this.baseUrl = getStringByXpath(getTileOperation, "@href"); + this.transferMode = TransferMode.fromString(getStringByXpath(getTileOperation, "Constraint[@name=\"GetEncoding\"]/AllowedValues/Value")); + NodeList layersNodeList = getByXpath(document, "/Capabilities/Contents/Layer"); + Map matrixSetById = parseMatrices(getByXpath(document, "/Capabilities/Contents/TileMatrixSet")); + return parseLayer(layersNodeList, matrixSetById); + + } catch (Exception e) { + Main.error(e); + //Main.error(new String(data, "UTF-8")); + } + return null; + } + + private static String normalizeCapabilitiesUrl(String url) throws MalformedURLException { + URL inUrl = new URL(url); + URL ret = new URL(inUrl.getProtocol(), inUrl.getHost(), inUrl.getPort(), inUrl.getFile()); + return ret.toExternalForm(); + } + + private final Collection parseLayer(NodeList nodeList, Map matrixSetById) throws XPathExpressionException { + Collection ret = new ArrayList<>(); + for (int layerId = 0; layerId < nodeList.getLength(); layerId++) { + Node layerNode = nodeList.item(layerId); + Layer layer = new Layer(); + layer.format = getStringByXpath(layerNode, "Format"); + layer.name = getStringByXpath(layerNode, "Identifier"); + layer.baseUrl = getStringByXpath(layerNode, "ResourceURL[@resourceType='tile']/@template"); + NodeList tileMatrixSetLinks = getByXpath(layerNode, "TileMatrixSetLink"); + for (int tileMatrixId = 0; tileMatrixId < tileMatrixSetLinks.getLength(); tileMatrixId++) { + Node tileMatrixLink = tileMatrixSetLinks.item(tileMatrixId); + TileMatrixSet tms = matrixSetById.get(getStringByXpath(tileMatrixLink, "TileMatrixSet")); + layer.tileMatrixSetByCRS.put(tms.crs, tms); + } + ret.add(layer); + } + return ret; + + } + + private final Map parseMatrices(NodeList nodeList) throws DOMException, XPathExpressionException { + Map ret = new ConcurrentHashMap<>(); + for (int matrixSetId = 0; matrixSetId < nodeList.getLength(); matrixSetId++) { + Node matrixSetNode = nodeList.item(matrixSetId); + TileMatrixSet matrixSet = new TileMatrixSet(); + matrixSet.identifier = getStringByXpath(matrixSetNode, "Identifier"); + matrixSet.crs = crsToCode(getStringByXpath(matrixSetNode, "SupportedCRS")); + NodeList tileMatrixList = getByXpath(matrixSetNode, "TileMatrix"); + for (int matrixId = 0; matrixId < tileMatrixList.getLength(); matrixId++) { + Node tileMatrixNode = tileMatrixList.item(matrixId); + TileMatrix tileMatrix = new TileMatrix(); + tileMatrix.identifier = getStringByXpath(tileMatrixNode, "Identifier"); + tileMatrix.scaleDenominator = Double.parseDouble(getStringByXpath(tileMatrixNode, "ScaleDenominator")); + String[] topLeftCorner = getStringByXpath(tileMatrixNode, "TopLeftCorner").split(" "); + tileMatrix.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[1]), Double.parseDouble(topLeftCorner[0])); + tileMatrix.tileHeight = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight")); + tileMatrix.tileWidth = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight")); + if (tileMatrix.tileHeight != tileMatrix.tileWidth) { + throw new AssertionError(tr("Only square tiles are supported. {0}x{1} returned by server for TileMatrix identifier {2}", + tileMatrix.tileHeight, tileMatrix.tileWidth, tileMatrix.identifier)); + } + + matrixSet.tileMatrix.add(tileMatrix); + } + ret.put(matrixSet.identifier, matrixSet); + } + return ret; + } + + private static String crsToCode(String crsIdentifier) { + if(crsIdentifier.startsWith("urn:ogc:def:crs:")) { + return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):[^:]*:(.*)$", "$1:$2"); + } + return crsIdentifier; + } + private static String getStringByXpath(Node document, String xpathQuery) throws XPathExpressionException { + return (String) getByXpath(document, xpathQuery, XPathConstants.STRING); + } + + private static NodeList getByXpath(Node document, String xpathQuery) throws XPathExpressionException { + return (NodeList) getByXpath(document, xpathQuery, XPathConstants.NODESET); + } + + + private static Object getByXpath(Node document, String xpathQuery, QName returnType) throws XPathExpressionException { + XPath xpath = XPathFactory.newInstance().newXPath(); + XPathExpression expr = xpath.compile(xpathQuery); + return expr.evaluate(document, returnType); + } + + /** + * Initializes projection for this TileSource with current projection + */ + protected void initProjection() { + initProjection(Main.getProjection()); + } + + /** + * Initializes projection for this TileSource with projection + * @param proj projection to be used by this TileSource + */ + public void initProjection(Projection proj) { + this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.get(proj.toCode()); + if(this.currentTileMatrixSet == null) { + Main.warn("Unsupported CRS selected"); + // take first, maybe it will work (if user sets custom projections, codes will not match) + this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.values().iterator().next(); + } + this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit() ; + } + + @Override + public int getDefaultTileSize() { + return getTileSize(); + } + + // FIXME: remove in September 2015, when ImageryPreferenceEntry.tileSize will be initialized to -1 instead to 256 + // need to leave it as it is to keep compatiblity between tested and latest JOSM versions + @Override + public int getTileSize() { + TileMatrix matrix = getTileMatrix(1); + if (matrix == null) { + return 1; + } + return matrix.tileHeight; + } + + @Override + public String getTileUrl(int zoom, int tilex, int tiley) throws IOException { + String url; + switch (transferMode) { + case KVP: + url = baseUrl + URL_GET_ENCODING_PARAMS; + break; + case REST: + url = currentLayer.baseUrl; + break; + default: + url = ""; + break; + } + + TileMatrix tileMatrix = getTileMatrix(zoom); + + if (tileMatrix == null) { + return ""; // no matrix, probably unsupported CRS selected. + } + + return url.replaceAll("\\{layer\\}", this.currentLayer.name) + .replaceAll("\\{format\\}", this.currentLayer.format) + .replaceAll("\\{TileMatrixSet\\}", this.currentTileMatrixSet.identifier) + .replaceAll("\\{TileMatrix\\}", tileMatrix.identifier) + .replaceAll("\\{TileRow\\}", Integer.toString(tiley)) + .replaceAll("\\{TileCol\\}", Integer.toString(tilex)); + } + + /** + * + * @param zoom + * @return TileMatrix that's working on this zoom level + */ + private TileMatrix getTileMatrix(int zoom) { + if (zoom > getMaxZoom()) { + return null; + } + if (zoom < 1) { + return null; + } + return this.currentTileMatrixSet.tileMatrix.toArray(new TileMatrix[]{})[zoom - 1]; + } + + @Override + public double getDistance(double lat1, double lon1, double lat2, double lon2) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public int lonToX(double lon, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public int latToY(double lat, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public double XToLon(int x, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public double YToLat(int y, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public double latToTileY(double lat, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + + @Override + public ICoordinate tileXYToLatLon(Tile tile) { + return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom()); + } + + @Override + public ICoordinate tileXYToLatLon(TileXY xy, int zoom) { + return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom); + } + + @Override + public ICoordinate tileXYToLatLon(int x, int y, int zoom) { + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null) { + return Main.getProjection().getWorldBoundsLatLon().getCenter().toCoordinate(); + } + double scale = matrix.scaleDenominator * this.crsScale; + EastNorth ret = new EastNorth(matrix.topLeftCorner.getX() + x * scale, matrix.topLeftCorner.getY() - y * scale); + return Main.getProjection().eastNorth2latlon(ret).toCoordinate(); + } + + @Override + public TileXY latLonToTileXY(double lat, double lon, int zoom) { + Projection proj = Main.getProjection(); + EastNorth enPoint = proj.latlon2eastNorth(new LatLon(lat, lon)); + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null) { + return new TileXY(0, 0); + } + double scale = matrix.scaleDenominator * this.crsScale; + return new TileXY( + (enPoint.east() - matrix.topLeftCorner.east()) / scale, + (matrix.topLeftCorner.north() - enPoint.north()) / scale + ); + } + + @Override + public TileXY latLonToTileXY(ICoordinate point, int zoom) { + return latLonToTileXY(point.getLat(), point.getLon(), zoom); + } + + @Override + public int getTileXMax(int zoom) { + return getTileXMax(zoom, Main.getProjection()); + } + + @Override + public int getTileXMin(int zoom) { + return 0; + } + + @Override + public int getTileYMax(int zoom) { + return getTileYMax(zoom, Main.getProjection()); + } + + @Override + public int getTileYMin(int zoom) { + return 0; + } + + @Override + public Point latLonToXY(double lat, double lon, int zoom) { + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null) { + return new Point(0, 0); + } + double scale = matrix.scaleDenominator * this.crsScale; + EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon)); + return new Point( + (int) Math.round((point.east() - matrix.topLeftCorner.east()) / scale), + (int) Math.round((matrix.topLeftCorner.north() - point.north()) / scale) + ); + } + + @Override + public Point latLonToXY(ICoordinate point, int zoom) { + return latLonToXY(point.getLat(), point.getLon(), zoom); + } + + @Override + public Coordinate XYToLatLon(Point point, int zoom) { + return XYToLatLon(point.x, point.y, zoom); + } + + @Override + public Coordinate XYToLatLon(int x, int y, int zoom) { + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null ){ + return new Coordinate(0, 0); + } + double scale = matrix.scaleDenominator * this.crsScale; + Projection proj = Main.getProjection(); + EastNorth ret = new EastNorth( + matrix.topLeftCorner.east() + x * scale, + matrix.topLeftCorner.north() - y * scale + ); + LatLon ll = proj.eastNorth2latlon(ret); + return new Coordinate(ll.lat(), ll.lon()); + } + + @Override + public double lonToTileX(double lon, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public double tileXToLon(int x, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public double tileYToLat(int y, int zoom) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public Map getHeaders() { + return headers; + } + + @Override + public int getMaxZoom() { + if (this.currentTileMatrixSet != null) { + return this.currentTileMatrixSet.tileMatrix.size(); + } + return 0; + } + + /** + * Checks if url is acceptable by this Tile Source + * @param url URL to check + */ + public static void checkUrl(String url) { + CheckParameterUtil.ensureParameterNotNull(url, "url"); + Matcher m = Pattern.compile("\\{[^}]*\\}").matcher(url); + while (m.find()) { + boolean isSupportedPattern = false; + for (String pattern : ALL_PATTERNS) { + if (m.group().matches(pattern)) { + isSupportedPattern = true; + break; + } + } + if (!isSupportedPattern) { + throw new IllegalArgumentException( + tr("{0} is not a valid WMS argument. Please check this server URL:\n{1}", m.group(), url)); + } + } + } + + /** + * @return set of projection codes that this TileSource supports + */ + public Set getSupportedProjections() { + return this.currentLayer.tileMatrixSetByCRS.keySet(); + } + + private int getTileYMax(int zoom, Projection proj) { + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null) { + return 0; + } + double scale = matrix.scaleDenominator * this.crsScale; + Bounds bounds = Main.getProjection().getWorldBoundsLatLon(); + EastNorth min = proj.latlon2eastNorth(bounds.getMin()); + EastNorth max = proj.latlon2eastNorth(bounds.getMax()); + return (int) Math.ceil(Math.abs(max.getY() - min.getY()) / scale); + } + + private int getTileXMax(int zoom, Projection proj) { + TileMatrix matrix = getTileMatrix(zoom); + if (matrix == null) { + return 0; + } + double scale = matrix.scaleDenominator * this.crsScale; + Bounds bounds = Main.getProjection().getWorldBoundsLatLon(); + EastNorth min = proj.latlon2eastNorth(bounds.getMin()); + EastNorth max = proj.latlon2eastNorth(bounds.getMax()); + return (int) Math.ceil(Math.abs(max.getX() - min.getX()) / scale); + } +} Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 8568) @@ -8,4 +8,5 @@ import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -35,4 +36,7 @@ public class CustomProjection extends AbstractProjection { + private final static Map UNITS_TO_METERS = getUnitsToMeters(); + private final static double METER_PER_UNIT_DEGREE = 2 * Math.PI * 6370997 / 360; + /** * pref String that defines the projection @@ -45,4 +49,5 @@ protected String cacheDir; protected Bounds bounds; + private double metersPerUnit = METER_PER_UNIT_DEGREE; // default to degrees /** @@ -89,8 +94,9 @@ wktext("wktext", false), // ignored /** meters, US survey feet, etc. */ - units("units", true), // ignored + units("units", true), /** Don't use the /usr/share/proj/proj_def.dat defaults file */ no_defs("no_defs", false), init("init", true), + to_meter("to_meter", true), // JOSM extensions, not present in PROJ.4 wmssrs("wmssrs", true), @@ -103,5 +109,5 @@ /** Map of all parameters by key */ - static final Map paramsByKey = new HashMap<>(); + static final Map paramsByKey = new ConcurrentHashMap<>(); static { for (Param p : Param.values()) { @@ -198,4 +204,12 @@ if (s != null) { this.code = s; + } + s = parameters.get(Param.units.key); + if (s != null) { + this.metersPerUnit = UNITS_TO_METERS.get(s); + } + s = parameters.get(Param.to_meter.key); + if (s != null) { + this.metersPerUnit = parseDouble(s, Param.to_meter.key); } } @@ -528,3 +542,35 @@ return name != null ? name : tr("Custom Projection"); } + + @Override + public double getMetersPerUnit() { + return metersPerUnit; + } + + private static Map getUnitsToMeters() { + Map ret = new ConcurrentHashMap<>(); + ret.put("km", 1000d); + ret.put("m", 1d); + ret.put("dm", 1d/10); + ret.put("cm", 1d/100); + ret.put("mm", 1d/1000); + ret.put("kmi", 1852.0); + ret.put("in", 0.0254); + ret.put("ft", 0.3048); + ret.put("yd", 0.9144); + ret.put("mi", 1609.344); + ret.put("fathom", 1.8288); + ret.put("chain", 20.1168); + ret.put("link", 0.201168); + ret.put("us-in", 1d/39.37); + ret.put("us-ft", 0.304800609601219); + ret.put("us-yd", 0.914401828803658); + ret.put("us-ch", 20.11684023368047); + ret.put("us-mi", 1609.347218694437); + ret.put("ind-yd", 0.91439523); + ret.put("ind-ft", 0.30479841); + ret.put("ind-ch", 20.11669506); + ret.put("degree", METER_PER_UNIT_DEGREE); + return ret; + } } Index: trunk/src/org/openstreetmap/josm/data/projection/Projection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 8568) @@ -68,3 +68,14 @@ */ Bounds getWorldBoundsLatLon(); + + /** + * Get the number of meters per unit of this projection. This more + * defines the scale of the map, than real conversion of unit to meters + * as this value is more less correct only along great circles. + * + * Used by WMTS to properly scale tiles + * @return meters per unit of projection + * + */ + double getMetersPerUnit(); } Index: trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 8568) @@ -64,4 +64,3 @@ */ double[] invproject(double east, double north); - } Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8568) @@ -31,4 +31,5 @@ import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.atomic.AtomicInteger; import javax.swing.AbstractAction; @@ -44,5 +45,4 @@ import org.openstreetmap.gui.jmapviewer.AttributionSupport; -import org.openstreetmap.gui.jmapviewer.Coordinate; import org.openstreetmap.gui.jmapviewer.MemoryTileCache; import org.openstreetmap.gui.jmapviewer.OsmTileLoader; @@ -51,4 +51,5 @@ import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader; import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate; +import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource; import org.openstreetmap.gui.jmapviewer.interfaces.TileCache; import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; @@ -102,5 +103,5 @@ /** do set autoload when creating a new layer */ public static final BooleanProperty PROP_DEFAULT_AUTOLOAD = new BooleanProperty(PREFERENCE_PREFIX + ".default_autoload", true); - /** do set showerrors when creating a new layer */ + /** do show errors per default */ public static final BooleanProperty PROP_DEFAULT_SHOWERRORS = new BooleanProperty(PREFERENCE_PREFIX + ".default_showerrors", true); /** minimum zoom level to show to user */ @@ -118,5 +119,4 @@ private AttributionSupport attribution = new AttributionSupport(); - Tile showMetadataTile; // needed public access for session exporter @@ -130,5 +130,4 @@ protected TileCache tileCache; protected TileSource tileSource; - //protected tileMatrix; protected TileLoader tileLoader; @@ -154,13 +153,17 @@ protected abstract TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException; - protected abstract Map getHeaders(TileSource tileSource); - - protected void initTileSource(TileSource tileMatrix) { - this.tileSource = tileMatrix; - attribution.initialize(tileMatrix); + protected Map getHeaders(TileSource tileSource) { + if (tileSource instanceof TemplatedTileSource) { + return ((TemplatedTileSource) tileSource).getHeaders(); + } + return null; + } + + protected void initTileSource(TileSource tileSource) { + attribution.initialize(tileSource); currentZoomLevel = getBestZoom(); - Map headers = getHeaders(tileMatrix); + Map headers = getHeaders(tileSource); tileLoader = getTileLoaderFactory().makeTileLoader(this, headers); @@ -247,5 +250,5 @@ } - private int getBestZoom() { + protected int getBestZoom() { double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view double result = Math.log(factor)/Math.log(2)/2+1; @@ -273,5 +276,5 @@ private final class ShowTileInfoAction extends AbstractAction { - private final TileHolder clickedTileHolder; + private transient final TileHolder clickedTileHolder; private ShowTileInfoAction(TileHolder clickedTileHolder) { @@ -349,4 +352,5 @@ } + @Override public Component createMenuComponent() { JCheckBoxMenuItem item = new JCheckBoxMenuItem(this); @@ -414,6 +418,6 @@ @Override public void actionPerformed(ActionEvent ae) { - double new_factor = Math.sqrt(getScaleFactor(currentZoomLevel)); - Main.map.mapView.zoomToFactor(new_factor); + double newFactor = Math.sqrt(getScaleFactor(currentZoomLevel)); + Main.map.mapView.zoomToFactor(newFactor); redraw(); } @@ -451,6 +455,7 @@ @Override public void hookUpMapView() { - initTileSource(getTileSource(info)); + this.tileSource = getTileSource(info); projectionChanged(null, Main.getProjection()); // check if projection is supported + initTileSource(this.tileSource); // keep them final here, so we avoid namespace clutter in the class @@ -538,8 +543,10 @@ @Override protected void finish() { + // empty - flush is instaneus } @Override protected void cancel() { + // empty - flush is instaneus } }.run(); @@ -642,6 +649,5 @@ */ public static void setMaxZoomLvl(int maxZoomLvl) { - maxZoomLvl = checkMaxZoomLvl(maxZoomLvl, null); - PROP_MAX_ZOOM_LVL.put(maxZoomLvl); + PROP_MAX_ZOOM_LVL.put(checkMaxZoomLvl(maxZoomLvl, null)); } @@ -651,6 +657,5 @@ */ public static void setMinZoomLvl(int minZoomLvl) { - minZoomLvl = checkMinZoomLvl(minZoomLvl, null); - PROP_MIN_ZOOM_LVL.put(minZoomLvl); + PROP_MIN_ZOOM_LVL.put(checkMinZoomLvl(minZoomLvl, null)); } @@ -742,5 +747,4 @@ */ public boolean decreaseZoomLevel() { - //int minZoom = this.getMinZoomLvl(); if (zoomDecreaseAllowed()) { if (Main.isDebugEnabled()) { @@ -750,5 +754,4 @@ zoomChanged(); } else { - /*Main.debug("Current zoom level could not be decreased. Min. zoom level "+minZoom+" reached.");*/ return false; } @@ -786,6 +789,5 @@ */ private Tile getTile(int x, int y, int zoom) { - int max = (1 << zoom); - if (x < 0 || x >= max || y < 0 || y >= max) + if (x < 0 || x >= tileSource.getTileXMax(zoom) || y < 0 || y >= tileSource.getTileYMax(zoom)) return null; return tileCache.getTile(tileSource, x, y, zoom); @@ -1003,7 +1005,7 @@ } - /*int xCursor = -1; + int xCursor = -1; int yCursor = -1; - if (PROP_DRAW_DEBUG.get()) { + if (Main.isDebugEnabled()) { if (yCursor < t.getYtile()) { if (t.getYtile() % 32 == 31) { @@ -1026,5 +1028,5 @@ xCursor = t.getXtile(); } - }*/ + } } @@ -1042,7 +1044,6 @@ } - private Coordinate getShiftedCoord(EastNorth en) { - LatLon ll = getShiftedLatLon(en); - return new Coordinate(ll.lat(), ll.lon()); + private ICoordinate getShiftedCoord(EastNorth en) { + return getShiftedLatLon(en).toCoordinate(); } @@ -1117,7 +1118,7 @@ private int size() { - int x_span = x1 - x0 + 1; - int y_span = y1 - y0 + 1; - return x_span * y_span; + int xSpan = x1 - x0 + 1; + int ySpan = y1 - y0 + 1; + return xSpan * ySpan; } @@ -1355,5 +1356,5 @@ } int newzoom = displayZoomLevel + zoomOffset; - if (newzoom < MIN_ZOOM) { + if (newzoom < getMinZoomLvl() || newzoom > getMaxZoomLvl()) { continue; } @@ -1513,7 +1514,7 @@ public class PrecacheTask implements TileLoaderListener { private final ProgressMonitor progressMonitor; - private volatile int totalCount; - private volatile int processedCount = 0; - private TileLoader tileLoader; + private int totalCount; + private AtomicInteger processedCount = new AtomicInteger(0); + private final TileLoader tileLoader; /** @@ -1534,5 +1535,5 @@ */ public boolean isFinished() { - return processedCount >= totalCount; + return processedCount.get() >= totalCount; } @@ -1556,7 +1557,7 @@ public void tileLoadingFinished(Tile tile, boolean success) { if (success) { - this.processedCount++; + int processed = this.processedCount.incrementAndGet(); this.progressMonitor.worked(1); - this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processedCount, totalCount)); + this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processed, totalCount)); } } Index: trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8568) @@ -41,5 +41,4 @@ import org.openstreetmap.josm.data.ProjectionBounds; import org.openstreetmap.josm.data.imagery.ImageryInfo; -import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; import org.openstreetmap.josm.data.imagery.OffsetBookmark; import org.openstreetmap.josm.data.preferences.ColorProperty; @@ -153,10 +152,17 @@ public static ImageryLayer create(ImageryInfo info) { - ImageryType type = info.getImageryType(); - if (type == ImageryType.WMS || type == ImageryType.HTML) + switch(info.getImageryType()) { + case WMS: + case HTML: return new WMSLayer(info); - else if (type == ImageryType.TMS || type == ImageryType.BING || type == ImageryType.SCANEX) + case WMTS: + return new WMTSLayer(info); + case TMS: + case BING: + case SCANEX: return new TMSLayer(info); - else throw new AssertionError(); + default: + throw new AssertionError(tr("Unsupported imagery type: {0}", info.getImageryType())); + } } Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8568) @@ -78,12 +78,4 @@ } - @Override - protected Map getHeaders(TileSource tileSource) { - if (tileSource instanceof TemplatedTMSTileSource) { - return ((TemplatedTMSTileSource) tileSource).getHeaders(); - } - return null; - } - /** * Creates and returns a new TileSource instance depending on the {@link ImageryType} Index: trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8568) +++ trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8568) @@ -0,0 +1,126 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.layer; + +import java.io.IOException; +import java.util.Map; + +import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate; +import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; +import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener; +import org.openstreetmap.gui.jmapviewer.interfaces.TileSource; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory; +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; +import org.openstreetmap.josm.data.imagery.TileLoaderFactory; +import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader; +import org.openstreetmap.josm.data.imagery.WMTSTileSource; +import org.openstreetmap.josm.data.preferences.BooleanProperty; +import org.openstreetmap.josm.data.projection.Projection; +import org.openstreetmap.josm.gui.MapView; + +/** + * WMTS layer based on AbstractTileSourceLayer. Overrides few methods to align WMTS to Tile based computations + * but most magic is done within WMTSTileSource class. + * + * Full specification of the protocol available at: + * http://www.opengeospatial.org/standards/wmts + * + * @author Wiktor Niesiobędzki + * + */ +public class WMTSLayer extends AbstractTileSourceLayer { + /** + * default setting of autozoom per layer + */ + public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wmts.default_autozoom", true); + + + /** + * Creates WMTS layer from ImageryInfo + * @param info Imagery Info describing the layer + */ + public WMTSLayer(ImageryInfo info) { + super(info); + } + + private static TileLoaderFactory loaderFactory = new CachedTileLoaderFactory("WMTS") { + @Override + protected TileLoader getLoader(TileLoaderListener listener, String cacheName, int connectTimeout, + int readTimeout, Map headers, String cacheDir) throws IOException { + return new WMSCachedTileLoader(listener, cacheName, connectTimeout, readTimeout, headers, cacheDir); + } + + }; + + @Override + protected TileLoaderFactory getTileLoaderFactory() { + return loaderFactory; + } + + @Override + protected TileSource getTileSource(ImageryInfo info) { + try { + if (info.getImageryType() == ImageryType.WMTS && info.getUrl() != null) { + WMTSTileSource.checkUrl(info.getUrl()); + WMTSTileSource tileSource = new WMTSTileSource(info); + info.setAttribution(tileSource); + return tileSource; + } + } catch (Exception e) { + Main.warn("Could not create imagery layer:"); + Main.warn(e); + } + return null; + } + + /** + * @param zoom level of the tile + * @return how many pixels of the screen occupies one pixel of the tile + */ + private double getTileToScreenRatio(int zoom) { + ICoordinate north = tileSource.tileXYToLatLon(0, 0, zoom); + ICoordinate south = tileSource.tileXYToLatLon(0, 1, zoom); + + MapView mv = Main.map.mapView; + LatLon topLeft = mv.getLatLon(0, 0); + LatLon botLeft = mv.getLatLon(0, tileSource.getTileSize()); + + return Math.abs((north.getLat() - south.getLat()) / ( topLeft.lat() - botLeft.lat())); + } + + @Override + protected int getBestZoom() { + if (!Main.isDisplayingMapView()) return 1; + + for(int i=getMinZoomLvl(); i <= getMaxZoomLvl(); i++) { + double ret = getTileToScreenRatio(i); + if (ret < 1) { + return i; + } + } + return getMaxZoomLvl(); + } + + @Override + public boolean isProjectionSupported(Projection proj) { + return ((WMTSTileSource)tileSource).getSupportedProjections().contains(proj.toCode()); + } + + @Override + public String nameSupportedProjections() { + StringBuilder ret = new StringBuilder(); + for (String e: ((WMTSTileSource)tileSource).getSupportedProjections()) { + ret.append(e).append(", "); + } + return ret.substring(0, ret.length()-2); + } + + @Override + public void projectionChanged(Projection oldValue, Projection newValue) { + super.projectionChanged(oldValue, newValue); + ((WMTSTileSource)tileSource).initProjection(newValue); + } + +} Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 8568) @@ -16,4 +16,5 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; import org.openstreetmap.josm.gui.widgets.JosmTextArea; import org.openstreetmap.josm.gui.widgets.JosmTextField; @@ -86,4 +87,14 @@ } + protected static String sanitize(String s, ImageryType type) { + String ret = s; + String imageryType = type.getTypeString() + ":"; + if (ret.startsWith(imageryType)) { + // remove ImageryType from URL + ret = ret.substring(imageryType.length()); + } + return sanitize(ret); + } + protected final String getImageryName() { return sanitize(name.getText()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 8568) @@ -11,4 +11,5 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; import org.openstreetmap.josm.gui.widgets.JosmTextArea; import org.openstreetmap.josm.gui.widgets.JosmTextField; @@ -71,5 +72,5 @@ a.append('[').append(z).append(']'); } - a.append(':').append(getImageryRawUrl()); + a.append(':').append(sanitize(getImageryRawUrl(), ImageryType.TMS)); return a.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 8568) @@ -178,5 +178,5 @@ protected final String getWmsUrl() { - return sanitize(wmsUrl.getText()); + return sanitize(wmsUrl.getText(), ImageryInfo.ImageryType.WMS); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java (revision 8568) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java (revision 8568) @@ -0,0 +1,41 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.preferences.imagery; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import javax.swing.JLabel; + +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; +import org.openstreetmap.josm.tools.GBC; + +/** + * Panel for adding WMTS imagery sources + * @author Wiktor Niesiobędzki + * + */ +public class AddWMTSLayerPanel extends AddImageryPanel { + + /** + * default constructor + */ + public AddWMTSLayerPanel() { + add(new JLabel(tr("1. Enter getCapabilities URL")), GBC.eol()); + add(rawUrl, GBC.eop().fill()); + rawUrl.setLineWrap(true); + rawUrl.setAlignmentY(TOP_ALIGNMENT); + add(new JLabel(tr("2. Enter name for this layer")), GBC.eol()); + add(name, GBC.eol().fill(GBC.HORIZONTAL)); + registerValidableComponent(rawUrl); + } + @Override + protected ImageryInfo getImageryInfo() { + return new ImageryInfo(getImageryName(), "wmts:" + sanitize(getImageryRawUrl(), ImageryType.WMTS)); + } + + @Override + protected boolean isImageryValid() { + return !getImageryName().isEmpty() && !getImageryRawUrl().isEmpty(); + } + +} Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8568) @@ -389,4 +389,5 @@ activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.WMS)); activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.TMS)); + activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.WMTS)); //activeToolbar.add(edit); TODO activeToolbar.add(remove); @@ -482,8 +483,17 @@ putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString())); String icon = /* ICON(dialogs/) */ "add"; - if (ImageryInfo.ImageryType.WMS.equals(type)) + switch (type) { + case WMS: icon = /* ICON(dialogs/) */ "add_wms"; - else if (ImageryInfo.ImageryType.TMS.equals(type)) + break; + case TMS: icon = /* ICON(dialogs/) */ "add_tms"; + break; + case WMTS: + icon = /* ICON(dialogs/) */ "add_wmts"; + break; + default: + break; + } putValue(SMALL_ICON, ImageProvider.get("dialogs", icon)); this.type = type; @@ -493,9 +503,15 @@ public void actionPerformed(ActionEvent evt) { final AddImageryPanel p; - if (ImageryInfo.ImageryType.WMS.equals(type)) { + switch (type) { + case WMS: p = new AddWMSLayerPanel(); - } else if (ImageryInfo.ImageryType.TMS.equals(type)) { + break; + case TMS: p = new AddTMSLayerPanel(); - } else { + break; + case WMTS: + p = new AddWMTSLayerPanel(); + break; + default: throw new IllegalStateException("Type " + type + " not supported"); } Index: trunk/src/org/openstreetmap/josm/io/CachedFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 8568) @@ -20,4 +20,7 @@ import java.util.Enumeration; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -72,4 +75,6 @@ public static final long DAYS = 24*60*60; // factor to get caching time in days + private Map httpHeaders = new ConcurrentHashMap<>(); + /** * Constructs a CachedFile object from a given filename, URL or internal resource. @@ -142,4 +147,14 @@ public CachedFile setCachingStrategy(CachingStrategy cachingStrategy) { this.cachingStrategy = cachingStrategy; + return this; + } + + /** + * Sets the http headers. Only applies to URL pointing to http or https resources + * @param headers that should be sent together with request + * @return this object + */ + public CachedFile setHttpHeaders(Map headers) { + this.httpHeaders.putAll(headers); return this; } @@ -397,5 +412,5 @@ destDirFile = new File(destDir, localPath + ".tmp"); try { - HttpURLConnection con = connectFollowingRedirect(url, httpAccept, ifModifiedSince); + HttpURLConnection con = connectFollowingRedirect(url, httpAccept, ifModifiedSince, httpHeaders); if (ifModifiedSince != null && con.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) { if (Main.isDebugEnabled()) { @@ -464,4 +479,27 @@ public static HttpURLConnection connectFollowingRedirect(URL downloadUrl, String httpAccept, Long ifModifiedSince) throws MalformedURLException, IOException { + return connectFollowingRedirect(downloadUrl, httpAccept, ifModifiedSince, null); + } + /** + * Opens a connection for downloading a resource. + *

+ * Manually follows redirects because + * {@link HttpURLConnection#setFollowRedirects(boolean)} fails if the redirect + * is going from a http to a https URL, see bug report. + *

+ * This can cause problems when downloading from certain GitHub URLs. + * + * @param downloadUrl The resource URL to download + * @param httpAccept The accepted MIME types sent in the HTTP Accept header. Can be {@code null} + * @param ifModifiedSince The download time of the cache file, optional + * @param headers http headers to be sent together with http request + * @return The HTTP connection effectively linked to the resource, after all potential redirections + * @throws MalformedURLException If a redirected URL is wrong + * @throws IOException If any I/O operation goes wrong + * @throws OfflineAccessException if resource is accessed in offline mode, in any protocol + * @since TODO + */ + public static HttpURLConnection connectFollowingRedirect(URL downloadUrl, String httpAccept, Long ifModifiedSince, Map headers) + throws MalformedURLException, IOException { CheckParameterUtil.ensureParameterNotNull(downloadUrl, "downloadUrl"); String downloadString = downloadUrl.toExternalForm(); @@ -474,4 +512,9 @@ if (ifModifiedSince != null) { con.setIfModifiedSince(ifModifiedSince); + } + if (headers != null) { + for (Entry header: headers.entrySet()) { + con.setRequestProperty(header.getKey(), header.getValue()); + } } con.setInstanceFollowRedirects(false); Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8567) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8568) @@ -14,4 +14,5 @@ import java.awt.datatransfer.UnsupportedFlavorException; import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.File; @@ -1337,3 +1338,31 @@ return hasExtension(file.getName(), extensions); } + + /** + * Reads the input stream and closes the stream at the end of processing (regardless if an exception was thrown) + * + * @param stream + * @return byte array of data in input stream + * @throws IOException + */ + public static byte[] readBytesFromStream(InputStream stream) throws IOException { + try { + ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available()); + byte[] buffer = new byte[2048]; + boolean finished = false; + do { + int read = stream.read(buffer); + if (read >= 0) { + bout.write(buffer, 0, read); + } else { + finished = true; + } + } while (!finished); + if (bout.size() == 0) + return null; + return bout.toByteArray(); + } finally { + stream.close(); + } + } } Index: trunk/test/data/wmts/getcapabilities-ORTO.xml =================================================================== --- trunk/test/data/wmts/getcapabilities-ORTO.xml (revision 8568) +++ trunk/test/data/wmts/getcapabilities-ORTO.xml (revision 8568) @@ -0,0 +1,779 @@ + + + + Usługa przeglądania ortofotomap dla obszaru Polski. Profil kafelkowany (WMTS) + Usługa przeglądania ortofotomap dla obszaru Polski. Dane udostępniane za pomocą tej usługi stanowią ortofotomapę wykonaną ze zdjęć lotniczych. Usługa wykorzystuje interfejs WMTS OGC w wersji 1.0.0. + + WMTS + Tiled + Web Map Tile Service + Usługa przeglądania + Aerial ortoimagery + Aerial photography + Dane referencyjne + Fotografia terenu + Land image + Land photography + Obraz terenu + Orthoimagery + Ortofotogram + Ortofotomapa lotnicza + Ortofotomapa + Raster + Rastry + Referential data + Zdjęcie lotnicze + Sporządzanie ortoobrazów + + + OGC WMTS + 1.0.0 + Korzystanie z usługi danych przestrzennych oznacza akceptację bez ograniczeń i zastrzeżeń Regulaminu dostępnego na stronie internetowej Geoportalu http://www.geoportal.gov.pl/ + brak ograniczeń + + + Centralny Ośrodek Dokumentacji Geodezyjnej i Kartograficznej + + + Dział Geoportal + + + +48225322501 + + + ul. Jana Olbrachta 94B + Warszawa + mazowieckie + 01-102 + Polska + geoportal@geoportal.gov.pl + + + + + + + + + + + + KVP + + + + + + + + + + + + + KVP + + + + + + + + + + + + + KVP + + + + + + + + + http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/ORTO?REQUEST=GetCapabilities&SERVICE=WMTS + text/xml + + service + + 2012-10-24 + + + + ROZPORZĄDZENIE KOMISJI (UE) NR 1089/2010 z dnia 23 listopada 2010 r. w sprawie wykonania dyrektywy 2007/2/WE Parlamentu Europejskiego i Rady w zakresie interoperacyjności zbiorów i usług danych przestrzennych + 2010-12-08 + OJ:L:2010:323:0011:0102:PL:PDF + + http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:PL:PDF + application/pdf + + + notConformant + + + Centralny Ośrodek Dokumentacji Geodezyjnej i Kartograficznej + geoportal@geoportal.gov.pl + + 2012-10-24 + view + + infoMapAccessService + + + + GEMET - INSPIRE themes + 2008-06-01 + + Użytkowanie terenu + + + WMTS + + + Tiled + + + View service + + + Web Map Tile Service + + + Usługa przeglądania + + + Aerial ortoimagery + + + Aerial photography + + + Dane referencyjne + + + Fotografia terenu + + + Land image + + + Land photography + + + Obraz terenu + + + Orthoimagery + + + Ortofotogram + + + Ortofotomapa lotnicza + + + Ortofotomapa + + + Raster + + + Rastry + + + Referential data + + + Zdjęcie lotnicze + + + Sporządzanie ortoobrazów + + + + pol + + + + pol + + + http://mapy.geoportal.gov.pl/wss/service/CSW/guest/CSWStartup?SERVICE=CSW&REQUEST=GetRecordById&VERSION=2.0.2&OUTPUTSCHEMA=http://www.isotc211.org/2005/gmd&ID=8b61894c-5e89-4626-8353-9f00b302d2eb + text/xml + + + + + + ORTOFOTOMAPA + Warstwa prezentująca ortofotomapę utworzoną ze zdjęć lotniczych. + + Ortofotomapa + + ORTOFOTOMAPA + + + + + + + + + + + + + + + + + + image/jpeg + text/html + text/xml; subtype=gml/3.2 + application/gml+xml; version=3.2 + + + + + + EPSG:2180 + + + EPSG:2180:0 + 0 + 0 + 0 + 0 + + + + EPSG:2180:1 + 0 + 1 + 0 + 1 + + + + EPSG:2180:2 + 0 + 2 + 0 + 2 + + + + EPSG:2180:3 + 0 + 5 + 0 + 5 + + + + EPSG:2180:4 + 0 + 10 + 0 + 11 + + + + EPSG:2180:5 + 1 + 21 + 1 + 22 + + + + EPSG:2180:6 + 3 + 53 + 4 + 56 + + + + EPSG:2180:7 + 7 + 107 + 9 + 113 + + + + EPSG:2180:8 + 14 + 214 + 19 + 227 + + + + EPSG:2180:9 + 36 + 535 + 47 + 568 + + + + EPSG:2180:10 + 73 + 1070 + 95 + 1136 + + + + EPSG:2180:11 + 184 + 2675 + 239 + 2842 + + + + EPSG:2180:12 + 369 + 5351 + 479 + 5684 + + + + EPSG:2180:13 + 738 + 10703 + 959 + 11368 + + + + + + + + EPSG:4326 + + + EPSG:4326:0 + 0 + 0 + 0 + 1 + + + + EPSG:4326:1 + 0 + 1 + 0 + 2 + + + + EPSG:4326:2 + 0 + 2 + 0 + 5 + + + + EPSG:4326:3 + 0 + 5 + 1 + 10 + + + + EPSG:4326:4 + 1 + 11 + 2 + 20 + + + + EPSG:4326:5 + 3 + 23 + 5 + 41 + + + + EPSG:4326:6 + 8 + 58 + 14 + 104 + + + + EPSG:4326:7 + 17 + 116 + 29 + 209 + + + + EPSG:4326:8 + 35 + 233 + 58 + 418 + + + + EPSG:4326:9 + 87 + 584 + 146 + 1047 + + + + EPSG:4326:10 + 175 + 1168 + 292 + 2094 + + + + EPSG:4326:11 + 439 + 2921 + 731 + 5236 + + + + EPSG:4326:12 + 879 + 5842 + 1463 + 10473 + + + + EPSG:4326:13 + 1759 + 11685 + 2926 + 20946 + + + + + + + + + EPSG:2180 + urn:ogc:def:crs:EPSG::2180 + + EPSG:2180:0 + 7559538.928571429 + 850000.0 100000.0 + 512 + 512 + 1 + 1 + + + + EPSG:2180:1 + 3779769.4642857146 + 850000.0 100000.0 + 512 + 512 + 2 + 2 + + + + EPSG:2180:2 + 1889884.7321428573 + 850000.0 100000.0 + 512 + 512 + 3 + 3 + + + + EPSG:2180:3 + 944942.3660714286 + 850000.0 100000.0 + 512 + 512 + 6 + 6 + + + + EPSG:2180:4 + 472471.1830357143 + 850000.0 100000.0 + 512 + 512 + 12 + 11 + + + + EPSG:2180:5 + 236235.59151785716 + 850000.0 100000.0 + 512 + 512 + 23 + 22 + + + + EPSG:2180:6 + 94494.23660714286 + 850000.0 100000.0 + 512 + 512 + 57 + 54 + + + + EPSG:2180:7 + 47247.11830357143 + 850000.0 100000.0 + 512 + 512 + 114 + 108 + + + + EPSG:2180:8 + 23623.559151785714 + 850000.0 100000.0 + 512 + 512 + 228 + 215 + + + + EPSG:2180:9 + 9449.423660714287 + 850000.0 100000.0 + 512 + 512 + 569 + 536 + + + + EPSG:2180:10 + 4724.711830357143 + 850000.0 100000.0 + 512 + 512 + 1137 + 1071 + + + + EPSG:2180:11 + 1889.8847321428573 + 850000.0 100000.0 + 512 + 512 + 2843 + 2676 + + + + EPSG:2180:12 + 944.9423660714286 + 850000.0 100000.0 + 512 + 512 + 5685 + 5352 + + + + EPSG:2180:13 + 472.4711830357143 + 850000.0 100000.0 + 512 + 512 + 11369 + 10704 + + + + + + + + EPSG:4326 + urn:ogc:def:crs:EPSG::4326 + + EPSG:4326:0 + 7559538.928571429 + 56.0 12.0 + 512 + 512 + 2 + 1 + + + + EPSG:4326:1 + 3779769.4642857146 + 56.0 12.0 + 512 + 512 + 3 + 2 + + + + EPSG:4326:2 + 1889884.7321428573 + 56.0 12.0 + 512 + 512 + 6 + 3 + + + + EPSG:4326:3 + 944942.3660714286 + 56.0 12.0 + 512 + 512 + 11 + 6 + + + + EPSG:4326:4 + 472471.1830357143 + 56.0 12.0 + 512 + 512 + 21 + 12 + + + + EPSG:4326:5 + 236235.59151785716 + 56.0 12.0 + 512 + 512 + 42 + 24 + + + + EPSG:4326:6 + 94494.23660714286 + 56.0 12.0 + 512 + 512 + 105 + 59 + + + + EPSG:4326:7 + 47247.11830357143 + 56.0 12.0 + 512 + 512 + 210 + 117 + + + + EPSG:4326:8 + 23623.559151785714 + 56.0 12.0 + 512 + 512 + 419 + 234 + + + + EPSG:4326:9 + 9449.423660714287 + 56.0 12.0 + 512 + 512 + 1048 + 585 + + + + EPSG:4326:10 + 4724.711830357143 + 56.0 12.0 + 512 + 512 + 2095 + 1169 + + + + EPSG:4326:11 + 1889.8847321428573 + 56.0 12.0 + 512 + 512 + 5237 + 2922 + + + + EPSG:4326:12 + 944.9423660714286 + 56.0 12.0 + 512 + 512 + 10474 + 5843 + + + + EPSG:4326:13 + 472.4711830357143 + 56.0 12.0 + 512 + 512 + 20947 + 11686 + + + + + + + + Index: trunk/test/data/wmts/getcapabilities-TOPO.xml =================================================================== --- trunk/test/data/wmts/getcapabilities-TOPO.xml (revision 8568) +++ trunk/test/data/wmts/getcapabilities-TOPO.xml (revision 8568) @@ -0,0 +1,890 @@ + + + + Usługa przeglądania rastrowych map topograficznych dla Polski. Profil kafelkowany (WMTS) + Usługa przeglądania rastrowych map topograficznych dla obszaru Polski. Mapa topograficzna Polski jest wielkoskalowym urzędowym opracowaniem kartograficznym, sporządzanym i aktualizowanym w sposób jednolity dla całego kraju. Jej treść stanowią elementy środowiska geograficznego powierzchni Ziemi i ich przestrzenne związki. Usługa wykorzystuje interfejs WMTS OGC w wersji 1.0.0. + + WMTS + Tiled + Web Map Tile Service + Zagospodarowanie przestrzenne + Wody i obiekty z nimi związane + Transport networks + Sieci transportowe + Sea regions + Rzeźba terenu + Roślinność, uprawy i grunty + Regiony morskie + Railways + Railway stations + Obiekty gospodarcze + Nazwy geograficzne + Land use + Land relief + Koleje i obiekty z nimi związane + Granice + Geographical names + Geodetic control network points + Drogi i obiekty z nimi związane + Buildings + Budynki + Budynki i budowle + Boundary + Boundaries + + OGC WMTS + 1.0.0 + Korzystanie z usługi danych przestrzennych oznacza akceptację bez ograniczeń i zastrzeżeń Regulaminu dostępnego na stronie internetowej Geoportalu http://www.geoportal.gov.pl/ + brak ograniczeń + + + Centralny Ośrodek Dokumentacji Geodezyjnej i Kartograficznej + + + Dział Geoportal + + + +48225322501 + + + ul. Jana Olbrachta 94B + Warszawa + mazowieckie + 01-102 + Polska + geoportal@geoportal.gov.pl + + + + + + + + + + + + KVP + + + + + + + + + + + + + KVP + + + + + + + + + + + + + KVP + + + + + + + + + http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/TOPO?REQUEST=GetCapabilities&SERVICE=WMTS + text/xml + + service + + 2012-10-24 + + + + ROZPORZĄDZENIE KOMISJI (UE) NR 1089/2010 z dnia 23 listopada 2010 r. w sprawie wykonania dyrektywy 2007/2/WE Parlamentu Europejskiego i Rady w zakresie interoperacyjności zbiorów i usług danych przestrzennych + 2010-12-08 + OJ:L:2010:323:0011:0102:PL:PDF + + http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:PL:PDF + application/pdf + + + notConformant + + + Centralny Ośrodek Dokumentacji Geodezyjnej i Kartograficznej + geoportal@geoportal.gov.pl + + 2012-10-24 + view + + infoMapAccessService + + + + GEMET - INSPIRE themes + 2008-06-01 + + Użytkowanie terenu + + + WMTS + + + Tiled + + + Web Map Tile Service + + + Boundaries + + + Boundary + + + Budynki i budowle + + + Budynki + + + Buildings + + + Drogi i obiekty z nimi związane + + + Geodetic control network points + + + Geographical names + + + Granice + + + Koleje i obiekty z nimi związane + + + Land relief + + + Land use + + + Nazwy geograficzne + + + Obiekty gospodarcze + + + Railway stations + + + Railways + + + Regiony morskie + + + Roślinność, uprawy i grunty + + + Rzeźba terenu + + + Sea regions + + + Sieci transportowe + + + Transport networks + + + Wody i obiekty z nimi związane + + + Zagospodarowanie przestrzenne + + + + pol + + + + pol + + + http://mapy.geoportal.gov.pl/wss/service/CSW/guest/CSWStartup?SERVICE=CSW&REQUEST=GetRecordById&VERSION=2.0.2&OUTPUTSCHEMA=http://www.isotc211.org/2005/gmd&ID=a658ac75-e2c6-4405-8bae-8d0f98f1babf + text/xml + + + + + + MAPA TOPOGRAFICZNA + Warstwa prezentująca rastrową mapę topograficzną + + Mapa topograficzna + + MAPA TOPOGRAFICZNA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/jpeg + text/html + text/xml; subtype=gml/3.2 + application/gml+xml; version=3.2 + + + + + + EPSG:2180 + + + EPSG:2180:0 + 0 + 0 + 0 + 0 + + + + EPSG:2180:1 + 0 + 1 + 0 + 1 + + + + EPSG:2180:2 + 0 + 2 + 0 + 2 + + + + EPSG:2180:3 + 0 + 5 + 0 + 5 + + + + EPSG:2180:4 + 0 + 11 + 0 + 11 + + + + EPSG:2180:5 + 0 + 22 + 0 + 23 + + + + EPSG:2180:6 + 1 + 56 + 1 + 59 + + + + EPSG:2180:7 + 2 + 112 + 3 + 119 + + + + EPSG:2180:8 + 5 + 224 + 7 + 239 + + + + EPSG:2180:9 + 14 + 561 + 18 + 597 + + + + EPSG:2180:10 + 29 + 1122 + 36 + 1195 + + + + EPSG:2180:11 + 73 + 2805 + 92 + 2989 + + + + EPSG:2180:12 + 147 + 5610 + 184 + 5979 + + + + + + + + EPSG:4326 + + + EPSG:4326:0 + 0 + 0 + 0 + 1 + + + + EPSG:4326:1 + 0 + 1 + 0 + 2 + + + + EPSG:4326:2 + 0 + 3 + 0 + 5 + + + + EPSG:4326:3 + 0 + 6 + 0 + 11 + + + + EPSG:4326:4 + 1 + 12 + 1 + 22 + + + + EPSG:4326:5 + 2 + 24 + 3 + 44 + + + + EPSG:4326:6 + 5 + 61 + 9 + 110 + + + + EPSG:4326:7 + 10 + 122 + 18 + 220 + + + + EPSG:4326:8 + 21 + 244 + 36 + 441 + + + + EPSG:4326:9 + 54 + 612 + 90 + 1103 + + + + EPSG:4326:10 + 109 + 1224 + 181 + 2206 + + + + EPSG:4326:11 + 273 + 3060 + 453 + 5516 + + + + EPSG:4326:12 + 547 + 6120 + 906 + 11033 + + + + + + + + + EPSG:2180 + urn:ogc:def:crs:EPSG::2180 + + EPSG:2180:0 + 7559538.928571429 + 850000.0 100000.0 + 512 + 512 + 1 + 1 + + + + EPSG:2180:1 + 3779769.4642857146 + 850000.0 100000.0 + 512 + 512 + 2 + 2 + + + + EPSG:2180:2 + 1889884.7321428573 + 850000.0 100000.0 + 512 + 512 + 3 + 3 + + + + EPSG:2180:3 + 944942.3660714286 + 850000.0 100000.0 + 512 + 512 + 6 + 6 + + + + EPSG:2180:4 + 472471.1830357143 + 850000.0 100000.0 + 512 + 512 + 12 + 12 + + + + EPSG:2180:5 + 236235.59151785716 + 850000.0 100000.0 + 512 + 512 + 24 + 23 + + + + EPSG:2180:6 + 94494.23660714286 + 850000.0 100000.0 + 512 + 512 + 60 + 57 + + + + EPSG:2180:7 + 47247.11830357143 + 850000.0 100000.0 + 512 + 512 + 120 + 113 + + + + EPSG:2180:8 + 23623.559151785714 + 850000.0 100000.0 + 512 + 512 + 240 + 225 + + + + EPSG:2180:9 + 9449.423660714287 + 850000.0 100000.0 + 512 + 512 + 598 + 562 + + + + EPSG:2180:10 + 4724.711830357143 + 850000.0 100000.0 + 512 + 512 + 1196 + 1123 + + + + EPSG:2180:11 + 1889.8847321428573 + 850000.0 100000.0 + 512 + 512 + 2990 + 2806 + + + + EPSG:2180:12 + 944.9423660714286 + 850000.0 100000.0 + 512 + 512 + 5980 + 5611 + + + + + + + + EPSG:4326 + urn:ogc:def:crs:EPSG::4326 + + EPSG:4326:0 + 7559538.928571429 + 56.0 12.0 + 512 + 512 + 2 + 1 + + + + EPSG:4326:1 + 3779769.4642857146 + 56.0 12.0 + 512 + 512 + 3 + 2 + + + + EPSG:4326:2 + 1889884.7321428573 + 56.0 12.0 + 512 + 512 + 6 + 4 + + + + EPSG:4326:3 + 944942.3660714286 + 56.0 12.0 + 512 + 512 + 12 + 7 + + + + EPSG:4326:4 + 472471.1830357143 + 56.0 12.0 + 512 + 512 + 23 + 13 + + + + EPSG:4326:5 + 236235.59151785716 + 56.0 12.0 + 512 + 512 + 45 + 25 + + + + EPSG:4326:6 + 94494.23660714286 + 56.0 12.0 + 512 + 512 + 111 + 62 + + + + EPSG:4326:7 + 47247.11830357143 + 56.0 12.0 + 512 + 512 + 221 + 123 + + + + EPSG:4326:8 + 23623.559151785714 + 56.0 12.0 + 512 + 512 + 442 + 245 + + + + EPSG:4326:9 + 9449.423660714287 + 56.0 12.0 + 512 + 512 + 1104 + 613 + + + + EPSG:4326:10 + 4724.711830357143 + 56.0 12.0 + 512 + 512 + 2207 + 1225 + + + + EPSG:4326:11 + 1889.8847321428573 + 56.0 12.0 + 512 + 512 + 5517 + 3061 + + + + EPSG:4326:12 + 944.9423660714286 + 56.0 12.0 + 512 + 512 + 11034 + 6121 + + + + + + + + Index: trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml =================================================================== --- trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml (revision 8568) +++ trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml (revision 8568) @@ -0,0 +1,165 @@ + + + + Test (WMTS) + Abstract. + + WMTS + + + OGC WMTS + 1.0.0 + Test Fees + Access + + + Provider + + + + + + + + + KVP + + + + + + + + + + Layer title + Layer identifier + + image/jpeg + text/html + + EPSG:3857 + + + + + + EPSG:3857 + urn:ogc:def:crs:EPSG::3857 + + EPSG:3857:0 + 559082264.0287178 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 1 + 1 + + + + EPSG:3857:1 + 279541132.0143589 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 2 + 2 + + + + EPSG:3857:2 + 139770566.0071794 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 4 + 4 + + + + EPSG:3857:3 + 69885283.00358972 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 8 + 8 + + + + EPSG:3857:4 + 34942641.50179486 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 16 + 16 + + + + EPSG:3857:5 + 17471320.75089743 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 32 + 32 + + + + EPSG:3857:6 + 8735660.375448715 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 64 + 64 + + + + EPSG:3857:7 + 4367830.187724357 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 128 + 128 + + + + EPSG:3857:8 + 2183915.093862179 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 256 + 256 + + + + EPSG:3857:9 + 1091957.546931089 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 512 + 512 + + + + EPSG:3857:10 + 545978.7734655447 + 20037509.917339604 -20037508.342789244 + 256 + 256 + 1024 + 1024 + + + + + + Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 8567) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 8568) @@ -7,5 +7,4 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.openstreetmap.gui.jmapviewer.Tile; import org.openstreetmap.gui.jmapviewer.TileXY; import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource; @@ -48,4 +47,5 @@ } } + verifyTileSquarness(source, 150, 20, 18); verifyTileSquarness(source, 2270, 1323, 12); verifyLocation(source, new LatLon(53.5937132, 19.5652017)); @@ -109,5 +109,5 @@ private LatLon getTileLatLon(TemplatedWMSTileSource source, int x, int y, int z) { - return new LatLon(source.tileXYToLatLon(new Tile(source, x, y, z))); + return new LatLon(source.tileXYToLatLon(x, y, z)); } Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8568) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8568) @@ -0,0 +1,131 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.imagery; + +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource; +import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.projection.Projections; + +public class WMTSTileSourceTest { + + private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery("test/data/wmts/getcapabilities-pseudo-mercator.xml"); + private ImageryInfo testImageryTOPO_PL = getImagery("test/data/wmts/getcapabilities-TOPO.xml"); + private ImageryInfo testImageryORTO_PL = getImagery("test/data/wmts/getcapabilities-ORTO.xml"); + + + @BeforeClass + public static void setUp() { + JOSMFixture.createUnitTestFixture().init(); + } + + private static ImageryInfo getImagery(String path) { + try { + return new ImageryInfo( + "test", + new File(path).toURI().toURL().toString() + ); + } catch (MalformedURLException e) { + e.printStackTrace(); + return null; + } + } + + @Test + public void testPseudoMercator() throws MalformedURLException, IOException { + Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); + WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR); + + verifyMercatorTile(testSource, 0, 0, 1); + verifyMercatorTile(testSource, 0, 0, 2); + verifyMercatorTile(testSource, 1, 1, 2); + for(int x = 0; x < 4; x++) { + for(int y = 0; y < 4; y++) { + verifyMercatorTile(testSource, x, y, 3); + } + } + for(int x = 0; x < 8; x++) { + for(int y = 0; y < 4; y++) { + verifyMercatorTile(testSource, x, y, 4); + } + } + + verifyMercatorTile(testSource, 2<<9 - 1, 2<<8 - 1, 10); + + assertEquals("TileXMax", 1, testSource.getTileXMax(1)); + assertEquals("TileYMax", 1, testSource.getTileYMax(1)); + assertEquals("TileXMax", 2, testSource.getTileXMax(2)); + assertEquals("TileYMax", 2, testSource.getTileYMax(2)); + assertEquals("TileXMax", 4, testSource.getTileXMax(3)); + assertEquals("TileYMax", 4, testSource.getTileYMax(3)); + + } + + @Test + public void testGeoportalTOPOPL() throws IOException { + Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); + WMTSTileSource testSource = new WMTSTileSource(testImageryTOPO_PL); + verifyTile(new LatLon(56,12), testSource, 0, 0, 1); + verifyTile(new LatLon(56,12), testSource, 0, 0, 2); + verifyTile(new LatLon(51.1323176, 16.8676823), testSource, 1, 1, 2); + + assertEquals("TileXMax", 37, testSource.getTileXMax(1)); + assertEquals("TileYMax", 19, testSource.getTileYMax(1)); + assertEquals("TileXMax", 74, testSource.getTileXMax(2)); + assertEquals("TileYMax", 37, testSource.getTileYMax(2)); + assertEquals("TileXMax", 148, testSource.getTileXMax(3)); + assertEquals("TileYMax", 74, testSource.getTileYMax(3)); + assertEquals( + "http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/TOPO?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=MAPA " + + "TOPOGRAFICZNA&STYLE=&FORMAT=image/jpeg&TileMatrixSet=EPSG:4326&TileMatrix=EPSG:4326:0&TileRow=1&TileCol=1", + testSource.getTileUrl(1, 1, 1)); + } + + @Test + public void testGeoportalORTOPL4326() throws IOException { + Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); + WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); + verifyTile(new LatLon(53.5993712684958, 19.560669777688176), testSource, 12412, 3941, 14); + + verifyTile(new LatLon(49.783096954497786, 22.79034127751704), testSource, 17714, 10206, 14); + } + + @Test + public void testGeoportalORTOPL2180() throws IOException { + Main.setProjection(Projections.getProjectionByCode("EPSG:2180")); + WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); + + verifyTile(new LatLon(53.59940948387726, 19.560544913270064), testSource, 6453, 3140, 14); + verifyTile(new LatLon(49.782984840526055, 22.790064966993445), testSource, 9932, 9305, 14); + } + + private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) { + LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z)); + assertEquals("Latitude", expected.lat(), ll.lat(), 1e-05); + assertEquals("Longitude", expected.lon(), ll.lon(), 1e-05); + + } + + private void verifyMercatorTile(WMTSTileSource testSource, int x, int y, int z) { + TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS); + LatLon result = new LatLon(testSource.tileXYToLatLon(x, y, z)); + LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z-1)); + System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString()); + assertEquals("Longitude" , expected.lon(), result.lon(), 1e-04); + assertEquals("Latitude", expected.lat(), result.lat(), 1e-04); + //assertTrue("result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString(), result.equalsEpsilon(expected)); +// LatLon tileCenter = new Bounds(result, new LatLon(testSource.tileXYToLatLon(x+1, y+1, z))).getCenter(); +// TileXY backwardsResult = testSource.latLonToTileXY(tileCenter.toCoordinate(), z); + //assertEquals(x, backwardsResult.getXIndex()); + //assertEquals(y, backwardsResult.getYIndex()); + } +}