Index: /trunk/data/projection/epsg
===================================================================
--- /trunk/data/projection/epsg	(revision 8609)
+++ /trunk/data/projection/epsg	(revision 8610)
@@ -54,5 +54,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 +units=m +bounds=-180,-85.05112877980659,180,85.05112877980659  <>
+<3857> +proj=josm:smerc +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 +units=m +bounds=-5.5,41,10.2,44.5  <>
@@ -74,7 +74,7 @@
 <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 +axis=neu +bounds=-180,-90,180,90  <>
+<4258> +proj=lonlat +datum=GRS80 +axis=neu +bounds=-180,-90,180,90  <>
 # WGS 84
-<4326> +proj=lonlat +ellps=WGS84 +datum=WGS84 +axis=neu +bounds=-180,-90,180,90  <>
+<4326> +proj=lonlat +datum=WGS84 +axis=neu +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 +units=m +bounds=5.7,45.7,10.6,47.9  <>
@@ -82,25 +82,25 @@
 <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=utm +zone=28 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-20,-5,-10,85 <>
+<25828> +proj=utm +zone=28 +datum=GRS80 +units=m +bounds=-20,-5,-10,85 <>
 # ETRS89 / UTM zone 29N
-<25829> +proj=utm +zone=29 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-14,-5,-4,85  <>
+<25829> +proj=utm +zone=29 +datum=GRS80 +units=m +bounds=-14,-5,-4,85  <>
 # ETRS89 / UTM zone 30N
-<25830> +proj=utm +zone=30 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-8,-5,2,85  <>
+<25830> +proj=utm +zone=30 +datum=GRS80 +units=m +bounds=-8,-5,2,85  <>
 # ETRS89 / UTM zone 31N
-<25831> +proj=utm +zone=31 +ellps=GRS80 +datum=GRS80 +units=m +bounds=-2,-5,8,85  <>
+<25831> +proj=utm +zone=31 +datum=GRS80 +units=m +bounds=-2,-5,8,85  <>
 # ETRS89 / UTM zone 32N
-<25832> +proj=utm +zone=32 +ellps=GRS80 +datum=GRS80 +units=m +bounds=4,-5,14,85  <>
+<25832> +proj=utm +zone=32 +datum=GRS80 +units=m +bounds=4,-5,14,85  <>
 # ETRS89 / UTM zone 33N
-<25833> +proj=utm +zone=33 +ellps=GRS80 +datum=GRS80 +units=m +bounds=10,-5,20,85  <>
+<25833> +proj=utm +zone=33 +datum=GRS80 +units=m +bounds=10,-5,20,85  <>
 # ETRS89 / UTM zone 34N
-<25834> +proj=utm +zone=34 +ellps=GRS80 +datum=GRS80 +units=m +bounds=16,-5,26,85  <>
+<25834> +proj=utm +zone=34 +datum=GRS80 +units=m +bounds=16,-5,26,85  <>
 # ETRS89 / UTM zone 35N
-<25835> +proj=utm +zone=35 +ellps=GRS80 +datum=GRS80 +units=m +bounds=22,-5,32,85  <>
+<25835> +proj=utm +zone=35 +datum=GRS80 +units=m +bounds=22,-5,32,85  <>
 # ETRS89 / UTM zone 36N
-<25836> +proj=utm +zone=36 +ellps=GRS80 +datum=GRS80 +units=m +bounds=28,-5,38,85  <>
+<25836> +proj=utm +zone=36 +datum=GRS80 +units=m +bounds=28,-5,38,85  <>
 # ETRS89 / UTM zone 37N
-<25837> +proj=utm +zone=37 +ellps=GRS80 +datum=GRS80 +units=m +bounds=34,-5,44,85  <>
+<25837> +proj=utm +zone=37 +datum=GRS80 +units=m +bounds=34,-5,44,85  <>
 # ETRS89 / UTM zone 38N
-<25838> +proj=utm +zone=38 +ellps=GRS80 +datum=GRS80 +units=m +bounds=40,-5,50,85  <>
+<25838> +proj=utm +zone=38 +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 +units=m +bounds=-4.416666666666665,46.65,9.18,51.300000000000004  <>
@@ -122,241 +122,241 @@
 <31469> +proj=tmerc +lon_0=15 +x_0=5500000 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +axis=neu +bounds=12.5,-5,17.5,85  <>
 # UTM zone 1N
-<32601> +proj=utm +zone=1 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-182,-5,-172,85  <>
+<32601> +proj=utm +zone=1 +datum=WGS84 +units=m +bounds=-182,-5,-172,85  <>
 # UTM zone 2N
-<32602> +proj=utm +zone=2 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-176,-5,-166,85  <>
+<32602> +proj=utm +zone=2 +datum=WGS84 +units=m +bounds=-176,-5,-166,85  <>
 # UTM zone 3N
-<32603> +proj=utm +zone=3 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-170,-5,-160,85  <>
+<32603> +proj=utm +zone=3 +datum=WGS84 +units=m +bounds=-170,-5,-160,85  <>
 # UTM zone 4N
-<32604> +proj=utm +zone=4 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-164,-5,-154,85  <>
+<32604> +proj=utm +zone=4 +datum=WGS84 +units=m +bounds=-164,-5,-154,85  <>
 # UTM zone 5N
-<32605> +proj=utm +zone=5 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-158,-5,-148,85  <>
+<32605> +proj=utm +zone=5 +datum=WGS84 +units=m +bounds=-158,-5,-148,85  <>
 # UTM zone 6N
-<32606> +proj=utm +zone=6 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-152,-5,-142,85  <>
+<32606> +proj=utm +zone=6 +datum=WGS84 +units=m +bounds=-152,-5,-142,85  <>
 # UTM zone 7N
-<32607> +proj=utm +zone=7 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-146,-5,-136,85  <>
+<32607> +proj=utm +zone=7 +datum=WGS84 +units=m +bounds=-146,-5,-136,85  <>
 # UTM zone 8N
-<32608> +proj=utm +zone=8 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-140,-5,-130,85  <>
+<32608> +proj=utm +zone=8 +datum=WGS84 +units=m +bounds=-140,-5,-130,85  <>
 # UTM zone 9N
-<32609> +proj=utm +zone=9 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-134,-5,-124,85  <>
+<32609> +proj=utm +zone=9 +datum=WGS84 +units=m +bounds=-134,-5,-124,85  <>
 # UTM zone 10N
-<32610> +proj=utm +zone=10 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-128,-5,-118,85  <>
+<32610> +proj=utm +zone=10 +datum=WGS84 +units=m +bounds=-128,-5,-118,85  <>
 # UTM zone 11N
-<32611> +proj=utm +zone=11 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-122,-5,-112,85  <>
+<32611> +proj=utm +zone=11 +datum=WGS84 +units=m +bounds=-122,-5,-112,85  <>
 # UTM zone 12N
-<32612> +proj=utm +zone=12 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-116,-5,-106,85  <>
+<32612> +proj=utm +zone=12 +datum=WGS84 +units=m +bounds=-116,-5,-106,85  <>
 # UTM zone 13N
-<32613> +proj=utm +zone=13 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-110,-5,-100,85  <>
+<32613> +proj=utm +zone=13 +datum=WGS84 +units=m +bounds=-110,-5,-100,85  <>
 # UTM zone 14N
-<32614> +proj=utm +zone=14 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-104,-5,-94,85  <>
+<32614> +proj=utm +zone=14 +datum=WGS84 +units=m +bounds=-104,-5,-94,85  <>
 # UTM zone 15N
-<32615> +proj=utm +zone=15 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-98,-5,-88,85  <>
+<32615> +proj=utm +zone=15 +datum=WGS84 +units=m +bounds=-98,-5,-88,85  <>
 # UTM zone 16N
-<32616> +proj=utm +zone=16 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-92,-5,-82,85  <>
+<32616> +proj=utm +zone=16 +datum=WGS84 +units=m +bounds=-92,-5,-82,85  <>
 # UTM zone 17N
-<32617> +proj=utm +zone=17 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-86,-5,-76,85  <>
+<32617> +proj=utm +zone=17 +datum=WGS84 +units=m +bounds=-86,-5,-76,85  <>
 # UTM zone 18N
-<32618> +proj=utm +zone=18 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-80,-5,-70,85  <>
+<32618> +proj=utm +zone=18 +datum=WGS84 +units=m +bounds=-80,-5,-70,85  <>
 # UTM zone 19N
-<32619> +proj=utm +zone=19 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-74,-5,-64,85  <>
+<32619> +proj=utm +zone=19 +datum=WGS84 +units=m +bounds=-74,-5,-64,85  <>
 # UTM zone 20N
-<32620> +proj=utm +zone=20 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-68,-5,-58,85  <>
+<32620> +proj=utm +zone=20 +datum=WGS84 +units=m +bounds=-68,-5,-58,85  <>
 # UTM zone 21N
-<32621> +proj=utm +zone=21 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-62,-5,-52,85  <>
+<32621> +proj=utm +zone=21 +datum=WGS84 +units=m +bounds=-62,-5,-52,85  <>
 # UTM zone 22N
-<32622> +proj=utm +zone=22 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-56,-5,-46,85  <>
+<32622> +proj=utm +zone=22 +datum=WGS84 +units=m +bounds=-56,-5,-46,85  <>
 # UTM zone 23N
-<32623> +proj=utm +zone=23 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-50,-5,-40,85  <>
+<32623> +proj=utm +zone=23 +datum=WGS84 +units=m +bounds=-50,-5,-40,85  <>
 # UTM zone 24N
-<32624> +proj=utm +zone=24 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-44,-5,-34,85  <>
+<32624> +proj=utm +zone=24 +datum=WGS84 +units=m +bounds=-44,-5,-34,85  <>
 # UTM zone 25N
-<32625> +proj=utm +zone=25 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-38,-5,-28,85  <>
+<32625> +proj=utm +zone=25 +datum=WGS84 +units=m +bounds=-38,-5,-28,85  <>
 # UTM zone 26N
-<32626> +proj=utm +zone=26 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-32,-5,-22,85  <>
+<32626> +proj=utm +zone=26 +datum=WGS84 +units=m +bounds=-32,-5,-22,85  <>
 # UTM zone 27N
-<32627> +proj=utm +zone=27 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-26,-5,-16,85  <>
+<32627> +proj=utm +zone=27 +datum=WGS84 +units=m +bounds=-26,-5,-16,85  <>
 # UTM zone 28N
-<32628> +proj=utm +zone=28 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-20,-5,-10,85  <>
+<32628> +proj=utm +zone=28 +datum=WGS84 +units=m +bounds=-20,-5,-10,85  <>
 # UTM zone 29N
-<32629> +proj=utm +zone=29 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-14,-5,-4,85  <>
+<32629> +proj=utm +zone=29 +datum=WGS84 +units=m +bounds=-14,-5,-4,85  <>
 # UTM zone 30N
-<32630> +proj=utm +zone=30 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-8,-5,2,85  <>
+<32630> +proj=utm +zone=30 +datum=WGS84 +units=m +bounds=-8,-5,2,85  <>
 # UTM zone 31N
-<32631> +proj=utm +zone=31 +ellps=WGS84 +datum=WGS84 +units=m +bounds=-2,-5,8,85  <>
+<32631> +proj=utm +zone=31 +datum=WGS84 +units=m +bounds=-2,-5,8,85  <>
 # UTM zone 32N
-<32632> +proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +bounds=4,-5,14,85  <>
+<32632> +proj=utm +zone=32 +datum=WGS84 +units=m +bounds=4,-5,14,85  <>
 # UTM zone 33N
-<32633> +proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +bounds=10,-5,20,85  <>
+<32633> +proj=utm +zone=33 +datum=WGS84 +units=m +bounds=10,-5,20,85  <>
 # UTM zone 34N
-<32634> +proj=utm +zone=34 +ellps=WGS84 +datum=WGS84 +units=m +bounds=16,-5,26,85  <>
+<32634> +proj=utm +zone=34 +datum=WGS84 +units=m +bounds=16,-5,26,85  <>
 # UTM zone 35N
-<32635> +proj=utm +zone=35 +ellps=WGS84 +datum=WGS84 +units=m +bounds=22,-5,32,85  <>
+<32635> +proj=utm +zone=35 +datum=WGS84 +units=m +bounds=22,-5,32,85  <>
 # UTM zone 36N
-<32636> +proj=utm +zone=36 +ellps=WGS84 +datum=WGS84 +units=m +bounds=28,-5,38,85  <>
+<32636> +proj=utm +zone=36 +datum=WGS84 +units=m +bounds=28,-5,38,85  <>
 # UTM zone 37N
-<32637> +proj=utm +zone=37 +ellps=WGS84 +datum=WGS84 +units=m +bounds=34,-5,44,85  <>
+<32637> +proj=utm +zone=37 +datum=WGS84 +units=m +bounds=34,-5,44,85  <>
 # UTM zone 38N
-<32638> +proj=utm +zone=38 +ellps=WGS84 +datum=WGS84 +units=m +bounds=40,-5,50,85  <>
+<32638> +proj=utm +zone=38 +datum=WGS84 +units=m +bounds=40,-5,50,85  <>
 # UTM zone 39N
-<32639> +proj=utm +zone=39 +ellps=WGS84 +datum=WGS84 +units=m +bounds=46,-5,56,85  <>
+<32639> +proj=utm +zone=39 +datum=WGS84 +units=m +bounds=46,-5,56,85  <>
 # UTM zone 40N
-<32640> +proj=utm +zone=40 +ellps=WGS84 +datum=WGS84 +units=m +bounds=52,-5,62,85  <>
+<32640> +proj=utm +zone=40 +datum=WGS84 +units=m +bounds=52,-5,62,85  <>
 # UTM zone 41N
-<32641> +proj=utm +zone=41 +ellps=WGS84 +datum=WGS84 +units=m +bounds=58,-5,68,85  <>
+<32641> +proj=utm +zone=41 +datum=WGS84 +units=m +bounds=58,-5,68,85  <>
 # UTM zone 42N
-<32642> +proj=utm +zone=42 +ellps=WGS84 +datum=WGS84 +units=m +bounds=64,-5,74,85  <>
+<32642> +proj=utm +zone=42 +datum=WGS84 +units=m +bounds=64,-5,74,85  <>
 # UTM zone 43N
-<32643> +proj=utm +zone=43 +ellps=WGS84 +datum=WGS84 +units=m +bounds=70,-5,80,85  <>
+<32643> +proj=utm +zone=43 +datum=WGS84 +units=m +bounds=70,-5,80,85  <>
 # UTM zone 44N
-<32644> +proj=utm +zone=44 +ellps=WGS84 +datum=WGS84 +units=m +bounds=76,-5,86,85  <>
+<32644> +proj=utm +zone=44 +datum=WGS84 +units=m +bounds=76,-5,86,85  <>
 # UTM zone 45N
-<32645> +proj=utm +zone=45 +ellps=WGS84 +datum=WGS84 +units=m +bounds=82,-5,92,85  <>
+<32645> +proj=utm +zone=45 +datum=WGS84 +units=m +bounds=82,-5,92,85  <>
 # UTM zone 46N
-<32646> +proj=utm +zone=46 +ellps=WGS84 +datum=WGS84 +units=m +bounds=88,-5,98,85  <>
+<32646> +proj=utm +zone=46 +datum=WGS84 +units=m +bounds=88,-5,98,85  <>
 # UTM zone 47N
-<32647> +proj=utm +zone=47 +ellps=WGS84 +datum=WGS84 +units=m +bounds=94,-5,104,85  <>
+<32647> +proj=utm +zone=47 +datum=WGS84 +units=m +bounds=94,-5,104,85  <>
 # UTM zone 48N
-<32648> +proj=utm +zone=48 +ellps=WGS84 +datum=WGS84 +units=m +bounds=100,-5,110,85  <>
+<32648> +proj=utm +zone=48 +datum=WGS84 +units=m +bounds=100,-5,110,85  <>
 # UTM zone 49N
-<32649> +proj=utm +zone=49 +ellps=WGS84 +datum=WGS84 +units=m +bounds=106,-5,116,85  <>
+<32649> +proj=utm +zone=49 +datum=WGS84 +units=m +bounds=106,-5,116,85  <>
 # UTM zone 50N
-<32650> +proj=utm +zone=50 +ellps=WGS84 +datum=WGS84 +units=m +bounds=112,-5,122,85  <>
+<32650> +proj=utm +zone=50 +datum=WGS84 +units=m +bounds=112,-5,122,85  <>
 # UTM zone 51N
-<32651> +proj=utm +zone=51 +ellps=WGS84 +datum=WGS84 +units=m +bounds=118,-5,128,85  <>
+<32651> +proj=utm +zone=51 +datum=WGS84 +units=m +bounds=118,-5,128,85  <>
 # UTM zone 52N
-<32652> +proj=utm +zone=52 +ellps=WGS84 +datum=WGS84 +units=m +bounds=124,-5,134,85  <>
+<32652> +proj=utm +zone=52 +datum=WGS84 +units=m +bounds=124,-5,134,85  <>
 # UTM zone 53N
-<32653> +proj=utm +zone=53 +ellps=WGS84 +datum=WGS84 +units=m +bounds=130,-5,140,85  <>
+<32653> +proj=utm +zone=53 +datum=WGS84 +units=m +bounds=130,-5,140,85  <>
 # UTM zone 54N
-<32654> +proj=utm +zone=54 +ellps=WGS84 +datum=WGS84 +units=m +bounds=136,-5,146,85  <>
+<32654> +proj=utm +zone=54 +datum=WGS84 +units=m +bounds=136,-5,146,85  <>
 # UTM zone 55N
-<32655> +proj=utm +zone=55 +ellps=WGS84 +datum=WGS84 +units=m +bounds=142,-5,152,85  <>
+<32655> +proj=utm +zone=55 +datum=WGS84 +units=m +bounds=142,-5,152,85  <>
 # UTM zone 56N
-<32656> +proj=utm +zone=56 +ellps=WGS84 +datum=WGS84 +units=m +bounds=148,-5,158,85  <>
+<32656> +proj=utm +zone=56 +datum=WGS84 +units=m +bounds=148,-5,158,85  <>
 # UTM zone 57N
-<32657> +proj=utm +zone=57 +ellps=WGS84 +datum=WGS84 +units=m +bounds=154,-5,164,85  <>
+<32657> +proj=utm +zone=57 +datum=WGS84 +units=m +bounds=154,-5,164,85  <>
 # UTM zone 58N
-<32658> +proj=utm +zone=58 +ellps=WGS84 +datum=WGS84 +units=m +bounds=160,-5,170,85  <>
+<32658> +proj=utm +zone=58 +datum=WGS84 +units=m +bounds=160,-5,170,85  <>
 # UTM zone 59N
-<32659> +proj=utm +zone=59 +ellps=WGS84 +datum=WGS84 +units=m +bounds=166,-5,176,85  <>
+<32659> +proj=utm +zone=59 +datum=WGS84 +units=m +bounds=166,-5,176,85  <>
 # UTM zone 60N
-<32660> +proj=utm +zone=60 +ellps=WGS84 +datum=WGS84 +units=m +bounds=172,-5,182,85  <>
+<32660> +proj=utm +zone=60 +datum=WGS84 +units=m +bounds=172,-5,182,85  <>
 # UTM zone 1S
-<32701> +proj=utm +zone=1 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-182,-85,-172,5  <>
+<32701> +proj=utm +zone=1 +south +datum=WGS84 +units=m +bounds=-182,-85,-172,5  <>
 # UTM zone 2S
-<32702> +proj=utm +zone=2 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-176,-85,-166,5  <>
+<32702> +proj=utm +zone=2 +south +datum=WGS84 +units=m +bounds=-176,-85,-166,5  <>
 # UTM zone 3S
-<32703> +proj=utm +zone=3 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-170,-85,-160,5  <>
+<32703> +proj=utm +zone=3 +south +datum=WGS84 +units=m +bounds=-170,-85,-160,5  <>
 # UTM zone 4S
-<32704> +proj=utm +zone=4 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-164,-85,-154,5  <>
+<32704> +proj=utm +zone=4 +south +datum=WGS84 +units=m +bounds=-164,-85,-154,5  <>
 # UTM zone 5S
-<32705> +proj=utm +zone=5 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-158,-85,-148,5  <>
+<32705> +proj=utm +zone=5 +south +datum=WGS84 +units=m +bounds=-158,-85,-148,5  <>
 # UTM zone 6S
-<32706> +proj=utm +zone=6 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-152,-85,-142,5  <>
+<32706> +proj=utm +zone=6 +south +datum=WGS84 +units=m +bounds=-152,-85,-142,5  <>
 # UTM zone 7S
-<32707> +proj=utm +zone=7 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-146,-85,-136,5  <>
+<32707> +proj=utm +zone=7 +south +datum=WGS84 +units=m +bounds=-146,-85,-136,5  <>
 # UTM zone 8S
-<32708> +proj=utm +zone=8 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-140,-85,-130,5  <>
+<32708> +proj=utm +zone=8 +south +datum=WGS84 +units=m +bounds=-140,-85,-130,5  <>
 # UTM zone 9S
-<32709> +proj=utm +zone=9 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-134,-85,-124,5  <>
+<32709> +proj=utm +zone=9 +south +datum=WGS84 +units=m +bounds=-134,-85,-124,5  <>
 # UTM zone 10S
-<32710> +proj=utm +zone=10 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-128,-85,-118,5  <>
+<32710> +proj=utm +zone=10 +south +datum=WGS84 +units=m +bounds=-128,-85,-118,5  <>
 # UTM zone 11S
-<32711> +proj=utm +zone=11 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-122,-85,-112,5  <>
+<32711> +proj=utm +zone=11 +south +datum=WGS84 +units=m +bounds=-122,-85,-112,5  <>
 # UTM zone 12S
-<32712> +proj=utm +zone=12 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-116,-85,-106,5  <>
+<32712> +proj=utm +zone=12 +south +datum=WGS84 +units=m +bounds=-116,-85,-106,5  <>
 # UTM zone 13S
-<32713> +proj=utm +zone=13 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-110,-85,-100,5  <>
+<32713> +proj=utm +zone=13 +south +datum=WGS84 +units=m +bounds=-110,-85,-100,5  <>
 # UTM zone 14S
-<32714> +proj=utm +zone=14 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-104,-85,-94,5  <>
+<32714> +proj=utm +zone=14 +south +datum=WGS84 +units=m +bounds=-104,-85,-94,5  <>
 # UTM zone 15S
-<32715> +proj=utm +zone=15 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-98,-85,-88,5  <>
+<32715> +proj=utm +zone=15 +south +datum=WGS84 +units=m +bounds=-98,-85,-88,5  <>
 # UTM zone 16S
-<32716> +proj=utm +zone=16 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-92,-85,-82,5  <>
+<32716> +proj=utm +zone=16 +south +datum=WGS84 +units=m +bounds=-92,-85,-82,5  <>
 # UTM zone 17S
-<32717> +proj=utm +zone=17 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-86,-85,-76,5  <>
+<32717> +proj=utm +zone=17 +south +datum=WGS84 +units=m +bounds=-86,-85,-76,5  <>
 # UTM zone 18S
-<32718> +proj=utm +zone=18 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-80,-85,-70,5  <>
+<32718> +proj=utm +zone=18 +south +datum=WGS84 +units=m +bounds=-80,-85,-70,5  <>
 # UTM zone 19S
-<32719> +proj=utm +zone=19 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-74,-85,-64,5  <>
+<32719> +proj=utm +zone=19 +south +datum=WGS84 +units=m +bounds=-74,-85,-64,5  <>
 # UTM zone 20S
-<32720> +proj=utm +zone=20 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-68,-85,-58,5  <>
+<32720> +proj=utm +zone=20 +south +datum=WGS84 +units=m +bounds=-68,-85,-58,5  <>
 # UTM zone 21S
-<32721> +proj=utm +zone=21 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-62,-85,-52,5  <>
+<32721> +proj=utm +zone=21 +south +datum=WGS84 +units=m +bounds=-62,-85,-52,5  <>
 # UTM zone 22S
-<32722> +proj=utm +zone=22 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-56,-85,-46,5  <>
+<32722> +proj=utm +zone=22 +south +datum=WGS84 +units=m +bounds=-56,-85,-46,5  <>
 # UTM zone 23S
-<32723> +proj=utm +zone=23 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-50,-85,-40,5  <>
+<32723> +proj=utm +zone=23 +south +datum=WGS84 +units=m +bounds=-50,-85,-40,5  <>
 # UTM zone 24S
-<32724> +proj=utm +zone=24 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-44,-85,-34,5  <>
+<32724> +proj=utm +zone=24 +south +datum=WGS84 +units=m +bounds=-44,-85,-34,5  <>
 # UTM zone 25S
-<32725> +proj=utm +zone=25 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-38,-85,-28,5  <>
+<32725> +proj=utm +zone=25 +south +datum=WGS84 +units=m +bounds=-38,-85,-28,5  <>
 # UTM zone 26S
-<32726> +proj=utm +zone=26 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-32,-85,-22,5  <>
+<32726> +proj=utm +zone=26 +south +datum=WGS84 +units=m +bounds=-32,-85,-22,5  <>
 # UTM zone 27S
-<32727> +proj=utm +zone=27 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-26,-85,-16,5  <>
+<32727> +proj=utm +zone=27 +south +datum=WGS84 +units=m +bounds=-26,-85,-16,5  <>
 # UTM zone 28S
-<32728> +proj=utm +zone=28 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-20,-85,-10,5  <>
+<32728> +proj=utm +zone=28 +south +datum=WGS84 +units=m +bounds=-20,-85,-10,5  <>
 # UTM zone 29S
-<32729> +proj=utm +zone=29 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-14,-85,-4,5  <>
+<32729> +proj=utm +zone=29 +south +datum=WGS84 +units=m +bounds=-14,-85,-4,5  <>
 # UTM zone 30S
-<32730> +proj=utm +zone=30 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-8,-85,2,5  <>
+<32730> +proj=utm +zone=30 +south +datum=WGS84 +units=m +bounds=-8,-85,2,5  <>
 # UTM zone 31S
-<32731> +proj=utm +zone=31 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=-2,-85,8,5  <>
+<32731> +proj=utm +zone=31 +south +datum=WGS84 +units=m +bounds=-2,-85,8,5  <>
 # UTM zone 32S
-<32732> +proj=utm +zone=32 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=4,-85,14,5  <>
+<32732> +proj=utm +zone=32 +south +datum=WGS84 +units=m +bounds=4,-85,14,5  <>
 # UTM zone 33S
-<32733> +proj=utm +zone=33 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=10,-85,20,5  <>
+<32733> +proj=utm +zone=33 +south +datum=WGS84 +units=m +bounds=10,-85,20,5  <>
 # UTM zone 34S
-<32734> +proj=utm +zone=34 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=16,-85,26,5  <>
+<32734> +proj=utm +zone=34 +south +datum=WGS84 +units=m +bounds=16,-85,26,5  <>
 # UTM zone 35S
-<32735> +proj=utm +zone=35 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=22,-85,32,5  <>
+<32735> +proj=utm +zone=35 +south +datum=WGS84 +units=m +bounds=22,-85,32,5  <>
 # UTM zone 36S
-<32736> +proj=utm +zone=36 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=28,-85,38,5  <>
+<32736> +proj=utm +zone=36 +south +datum=WGS84 +units=m +bounds=28,-85,38,5  <>
 # UTM zone 37S
-<32737> +proj=utm +zone=37 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=34,-85,44,5  <>
+<32737> +proj=utm +zone=37 +south +datum=WGS84 +units=m +bounds=34,-85,44,5  <>
 # UTM zone 38S
-<32738> +proj=utm +zone=38 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=40,-85,50,5  <>
+<32738> +proj=utm +zone=38 +south +datum=WGS84 +units=m +bounds=40,-85,50,5  <>
 # UTM zone 39S
-<32739> +proj=utm +zone=39 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=46,-85,56,5  <>
+<32739> +proj=utm +zone=39 +south +datum=WGS84 +units=m +bounds=46,-85,56,5  <>
 # UTM zone 40S
-<32740> +proj=utm +zone=40 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=52,-85,62,5  <>
+<32740> +proj=utm +zone=40 +south +datum=WGS84 +units=m +bounds=52,-85,62,5  <>
 # UTM zone 41S
-<32741> +proj=utm +zone=41 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=58,-85,68,5  <>
+<32741> +proj=utm +zone=41 +south +datum=WGS84 +units=m +bounds=58,-85,68,5  <>
 # UTM zone 42S
-<32742> +proj=utm +zone=42 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=64,-85,74,5  <>
+<32742> +proj=utm +zone=42 +south +datum=WGS84 +units=m +bounds=64,-85,74,5  <>
 # UTM zone 43S
-<32743> +proj=utm +zone=43 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=70,-85,80,5  <>
+<32743> +proj=utm +zone=43 +south +datum=WGS84 +units=m +bounds=70,-85,80,5  <>
 # UTM zone 44S
-<32744> +proj=utm +zone=44 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=76,-85,86,5  <>
+<32744> +proj=utm +zone=44 +south +datum=WGS84 +units=m +bounds=76,-85,86,5  <>
 # UTM zone 45S
-<32745> +proj=utm +zone=45 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=82,-85,92,5  <>
+<32745> +proj=utm +zone=45 +south +datum=WGS84 +units=m +bounds=82,-85,92,5  <>
 # UTM zone 46S
-<32746> +proj=utm +zone=46 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=88,-85,98,5  <>
+<32746> +proj=utm +zone=46 +south +datum=WGS84 +units=m +bounds=88,-85,98,5  <>
 # UTM zone 47S
-<32747> +proj=utm +zone=47 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=94,-85,104,5  <>
+<32747> +proj=utm +zone=47 +south +datum=WGS84 +units=m +bounds=94,-85,104,5  <>
 # UTM zone 48S
-<32748> +proj=utm +zone=48 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=100,-85,110,5  <>
+<32748> +proj=utm +zone=48 +south +datum=WGS84 +units=m +bounds=100,-85,110,5  <>
 # UTM zone 49S
-<32749> +proj=utm +zone=49 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=106,-85,116,5  <>
+<32749> +proj=utm +zone=49 +south +datum=WGS84 +units=m +bounds=106,-85,116,5  <>
 # UTM zone 50S
-<32750> +proj=utm +zone=50 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=112,-85,122,5  <>
+<32750> +proj=utm +zone=50 +south +datum=WGS84 +units=m +bounds=112,-85,122,5  <>
 # UTM zone 51S
-<32751> +proj=utm +zone=51 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=118,-85,128,5  <>
+<32751> +proj=utm +zone=51 +south +datum=WGS84 +units=m +bounds=118,-85,128,5  <>
 # UTM zone 52S
-<32752> +proj=utm +zone=52 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=124,-85,134,5  <>
+<32752> +proj=utm +zone=52 +south +datum=WGS84 +units=m +bounds=124,-85,134,5  <>
 # UTM zone 53S
-<32753> +proj=utm +zone=53 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=130,-85,140,5  <>
+<32753> +proj=utm +zone=53 +south +datum=WGS84 +units=m +bounds=130,-85,140,5  <>
 # UTM zone 54S
-<32754> +proj=utm +zone=54 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=136,-85,146,5  <>
+<32754> +proj=utm +zone=54 +south +datum=WGS84 +units=m +bounds=136,-85,146,5  <>
 # UTM zone 55S
-<32755> +proj=utm +zone=55 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=142,-85,152,5  <>
+<32755> +proj=utm +zone=55 +south +datum=WGS84 +units=m +bounds=142,-85,152,5  <>
 # UTM zone 56S
-<32756> +proj=utm +zone=56 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=148,-85,158,5  <>
+<32756> +proj=utm +zone=56 +south +datum=WGS84 +units=m +bounds=148,-85,158,5  <>
 # UTM zone 57S
-<32757> +proj=utm +zone=57 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=154,-85,164,5  <>
+<32757> +proj=utm +zone=57 +south +datum=WGS84 +units=m +bounds=154,-85,164,5  <>
 # UTM zone 58S
-<32758> +proj=utm +zone=58 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=160,-85,170,5  <>
+<32758> +proj=utm +zone=58 +south +datum=WGS84 +units=m +bounds=160,-85,170,5  <>
 # UTM zone 59S
-<32759> +proj=utm +zone=59 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=166,-85,176,5  <>
+<32759> +proj=utm +zone=59 +south +datum=WGS84 +units=m +bounds=166,-85,176,5  <>
 # UTM zone 60S
-<32760> +proj=utm +zone=60 +south +ellps=WGS84 +datum=WGS84 +units=m +bounds=172,-85,182,5  <>
+<32760> +proj=utm +zone=60 +south +datum=WGS84 +units=m +bounds=172,-85,182,5  <>
Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 8609)
+++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 8610)
@@ -188,4 +188,7 @@
             ellps = parseEllipsoid(parameters);
             datum = parseDatum(parameters, ellps);
+            if (ellps == null) {
+                ellps = datum.getEllipsoid();
+            }
             proj = parseProjection(parameters, ellps);
             // "utm" is a shortcut for a set of parameters
@@ -338,11 +341,21 @@
                 parameters.containsKey(Param.b.key))
             throw new ProjectionConfigurationException(tr("Combination of ellipsoid parameters is not supported."));
-        if (parameters.containsKey(Param.no_defs.key))
-            throw new ProjectionConfigurationException(tr("Ellipsoid required (+ellps=* or +a=*, +b=*)"));
-        // nothing specified, use WGS84 as default
-        return Ellipsoid.WGS84;
+        return null;
     }
 
     public Datum parseDatum(Map<String, String> parameters, Ellipsoid ellps) throws ProjectionConfigurationException {
+        String datumId = parameters.get(Param.datum.key);
+        if (datumId != null) {
+            Datum datum = Projections.getDatum(datumId);
+            if (datum == null) throw new ProjectionConfigurationException(tr("Unknown datum identifier: ''{0}''", datumId));
+            return datum;
+        }
+        if (ellps == null) {
+            if (parameters.containsKey(Param.no_defs.key))
+                throw new ProjectionConfigurationException(tr("Ellipsoid required (+ellps=* or +a=*, +b=*)"));
+            // nothing specified, use WGS84 as default
+            ellps = Ellipsoid.WGS84;
+        }
+        
         String nadgridsId = parameters.get(Param.nadgrids.key);
         if (nadgridsId != null) {
@@ -362,10 +375,4 @@
             return parseToWGS84(towgs84, ellps);
 
-        String datumId = parameters.get(Param.datum.key);
-        if (datumId != null) {
-            Datum datum = Projections.getDatum(datumId);
-            if (datum == null) throw new ProjectionConfigurationException(tr("Unknown datum identifier: ''{0}''", datumId));
-            return datum;
-        }
         if (parameters.containsKey(Param.no_defs.key))
             throw new ProjectionConfigurationException(tr("Datum required (+datum=*, +towgs84=* or +nadgrids=*)"));