Index: trunk/data_nodist/projection/josm-epsg
===================================================================
--- trunk/data_nodist/projection/josm-epsg	(revision 9560)
+++ trunk/data_nodist/projection/josm-epsg	(revision 9565)
@@ -53,6 +53,6 @@
 # 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 +units=m +bounds=2.54,49.51,6.4,51.5  <>
-# Pseudo-Mercator
-<3857> +proj=josm:smerc +datum=WGS84 +units=m +bounds=-180,-85.05112877980659,180,85.05112877980659  <>
+# WGS 84 / Pseudo-Mercator
+<3857> +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +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  <>
Index: trunk/data_nodist/projection/projection-regression-test-data
===================================================================
--- trunk/data_nodist/projection/projection-regression-test-data	(revision 9560)
+++ trunk/data_nodist/projection/projection-regression-test-data	(revision 9565)
@@ -5945,4 +5945,16 @@
   en  -193969.4282884883 8469842.549172236
   ll2 -13.760992483199203 38.60194124510362
+EPSG:3000
+  ll  31.910053601835273 18.106211343257215
+  en  -6298607.693804365 4617158.822506971
+  ll2 31.910053822996915 18.10621242764793
+EPSG:3001
+  ll  35.517579866263844 152.3184248561901
+  en  8596711.674334003 5097011.9228557665
+  ll2 35.51757975669143 152.31842469563856
+EPSG:3002
+  ll  11.457376033055027 163.93490862689723
+  en  9885642.748954434 2171556.0805702494
+  ll2 11.457376033600664 163.9349086202522
 EPSG:3003
   ll  38.09725651416973 7.4345625019044315
@@ -9541,4 +9553,8 @@
   en  6480276.344184 1151844.8226038879
   ll2 10.291404319051509 41.91402761717174
+EPSG:3388
+  ll  -73.24907273227738 126.72589597701531
+  en  6273844.747247949 -9063422.188490324
+  ll2 -73.24907270081529 126.72589592872397
 EPSG:3389
   ll  -14.438886660384838 173.46408675562256
@@ -9565,4 +9581,8 @@
   en  4744317.466116981 -1532445.4287352874
   ll2 5.39523547581824 71.65431390978326
+EPSG:3395
+  ll  -55.07366715935213 -39.25832129180364
+  en  -4370216.3356023105 -7341116.553800662
+  ll2 -55.073667159347856 -39.25832129180364
 EPSG:3396
   ll  85.94787390828097 5.998729693776394
@@ -11173,4 +11193,8 @@
   en  578839.8963415996 9495341.810721355
   ll2 85.4401286193869 132.0129193956132
+EPSG:3832
+  ll  73.69237557115602 34.57071836335369
+  en  -1.284952885442483E7 1.23513911708691E7
+  ll2 73.69237557115602 34.57071836335369
 EPSG:3833
   ll  -40.122015589116714 8.310180221924293
@@ -11461,4 +11485,8 @@
   en  4313912.928101179 3313513.266237703
   ll2 41.9479651127952 -20.193469561386244
+EPSG:3994
+  ll  -50.71638723313427 160.46719257754955
+  en  5087418.440840361 -4941555.3324789135
+  ll2 -50.716387233124316 160.46719257754955
 EPSG:3995
   ll  -58.51924034223759 170.25401704511552
@@ -14405,4 +14433,16 @@
   en  3110069.5559353866 -4317519.519979515
   ll2 25.078168139707362 -7.402209063825693
+EPSG:5329
+  ll  -23.170901896645304 -57.605842799307936
+  en  -1.4699694275369853E7 -1727381.2603731817
+  ll2 -23.170902573741188 -57.605842740240085
+EPSG:5330
+  ll  12.9779121381478 142.08163488900027
+  en  7460496.874071628 2343321.8977075103
+  ll2 12.977912125247077 142.08163486687238
+EPSG:5331
+  ll  -4.523931631753413 -57.62016766238983
+  en  -1.4701037559979454E7 400716.72736424254
+  ll2 -4.523931469991159 -57.620168125269096
 EPSG:5337
   ll  -0.4402497156128504 -35.57669067759142
@@ -14769,4 +14809,8 @@
   en  4181126.435413616 2483990.525243229
   ll2 49.02916195063009 12.564236704801566
+EPSG:5641
+  ll  -49.93383931217301 40.41312972718575
+  en  1.4279888478912478E7 3601767.464654859
+  ll2 -49.933839312161766 40.413129727185755
 EPSG:5643
   ll  41.66055483285982 31.866237633592732