Merge pull request osm2pgsql-dev#354 from lonvia/remove-oldmerc

Remove oldmerc option

Author: pnorman

docs/osm2pgsql.1

@@ -78,9 +78,6 @@ Store data in degrees of latitude & longitude.
 \fB\-m\fR|\-\-merc
 Store data in proper spherical Mercator (the default).
 .TP
-\fB\-M\fR|\-\-oldmerc
-Store data in the legacy OSM Mercator format.
-.TP
 \fB\-E\fR|\-\-proj num
 Use projection EPSG:num
 .TP
@@ -246,9 +243,9 @@ Verbose output.
 .SH SUPPORTED PROJECTIONS
 Latlong             (\-l) SRS:  4326 (none)
 .br
-WGS84 Mercator      (  ) SRS:  3395 +proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs
-.br
 Spherical Mercator  (\-m) SRS:900913 +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 +no_defs +over
+.br
+EPSG-defined        (\-E) SRS: +init=epsg:(as given in parameter)
 .PP
 .SH SEE ALSO
 .BR proj (1),

options.cpp

@@ -29,7 +29,6 @@ namespace
         {"prefix",   1, 0, 'p'},
         {"proj",     1, 0, 'E'},
         {"merc",     0, 0, 'm'},
-        {"oldmerc",  0, 0, 'M'},
         {"utf8-sanitize", 0, 0, 'u'},
         {"cache",    1, 0, 'C'},
         {"username", 1, 0, 'U'},
@@ -128,7 +127,6 @@ namespace
     Obsolete options:\n\
        -u|--utf8-sanitize   Repair bad UTF8 input data (present in planet\n\
                         dumps prior to August 2007). Adds about 10% overhead.\n\
-       -M|--oldmerc     Store data in the legacy OSM mercator format\n\
     \n\
     Performance options:\n\
        -i|--tablespace-index    The name of the PostgreSQL tablespace where\n\
@@ -326,9 +324,6 @@ options_t options_t::parse(int argc, char *argv[])
         case 'm':
             options.projection.reset(new reprojection(PROJ_SPHERE_MERC));
             break;
-        case 'M':
-            options.projection.reset(new reprojection(PROJ_MERC));
-            break;
         case 'E':
             options.projection.reset(new reprojection(-atoi(optarg)));
             break;

reprojection.cpp

@@ -34,11 +34,6 @@ const struct Projection_Info Projection_Infos[] = {
         /*proj4text*/ "+init=epsg:4326",
         /*srs      */ 4326,
         /*option   */ "-l" ),
-    /*PROJ_MERC*/ Projection_Info(
-        /*descr    */ "WGS84 Mercator",
-        /*proj4text*/ "+proj=merc +datum=WGS84  +k=1/*0 +units=m +over +no_defs",
-        /*srs      */ 3395,
-        /*option   */ "-M" ),
     /*PROJ_SPHERE_MERC*/ Projection_Info(
         /*descr    */ "Spherical Mercator",
         /*proj4text*/ "+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 +wktext  +no_defs",

reprojection.hpp

@@ -19,7 +19,7 @@ struct Projection_Info {
     const char *option;
 };
 
-enum Projection { PROJ_LATLONG = 0, PROJ_MERC, PROJ_SPHERE_MERC,   PROJ_COUNT };
+enum Projection { PROJ_LATLONG = 0, PROJ_SPHERE_MERC, PROJ_COUNT };
 
 struct reprojection : public boost::noncopyable
 {

tests/test-parse-options.cpp

@@ -138,7 +138,6 @@ int get_random_proj(std::vector<std::string>& args)
     switch(proj)
     {
     case PROJ_LATLONG:
-    case PROJ_MERC:
     case PROJ_SPHERE_MERC:
         args.push_back(reprojection(proj).project_getprojinfo()->option);
         break;