Check-in Differences
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Difference From 1bccc483a4a0105c To 1b63c8b896d569f0

2015-05-31
09:47
supporting WMS Keywords: SE_RegisterRasterKeyword(), SE_RegisterVectorKeyword() and alike check-in: 72ff6cd29e user: sandro tags: trunk
2015-05-27
17:05
updating EPSG definitions to GDAL 2.0.0 Beta 2 check-in: 1bccc483a4 user: sandro tags: trunk
11:26
making all GCP symbols from GRASS being PRIVATE and prefixed so to avoid any possible link conflict check-in: d69a0e23ca user: sandro tags: trunk
2015-05-11
15:45
implementing GCP (Ground Control Points) based on Grass code check-in: 6796b86e37 user: sandro tags: trunk
2015-05-05
22:10
adding two missing files from the previous commit check-in: 1b63c8b896 user: sandro tags: trunk
22:00
implementing the Affine Transformations module (ATM) check-in: 42275338bd user: sandro tags: trunk

Changes to Makefile.am.

    15     15   pkgconfigdir = $(libdir)/pkgconfig
    16     16   pkgconfig_DATA = spatialite.pc
    17     17   
    18     18   coverage-init:
    19     19   	lcov --directory src --capture --initial --output-file libspatialite_cov.info
    20     20   
    21     21   coverage::
    22         -	lcov --rc lcov_branch_coverage=1 --directory src --output-file libspatialite_cov.info --capture
    23         -	genhtml --rc lcov_branch_coverage=1 -o covresults libspatialite_cov.info
           22  +	lcov --directory src --output-file libspatialite_cov.info --capture
           23  +	genhtml -o covresults libspatialite_cov.info
    24     24   
    25     25   MOSTLYCLEANFILES = libspatialite_cov.info

Changes to Makefile.in.

   876    876   	uninstall-am uninstall-pkgconfigDATA
   877    877   
   878    878   
   879    879   coverage-init:
   880    880   	lcov --directory src --capture --initial --output-file libspatialite_cov.info
   881    881   
   882    882   coverage::
   883         -	lcov --rc lcov_branch_coverage=1 --directory src --output-file libspatialite_cov.info --capture
   884         -	genhtml --rc lcov_branch_coverage=1 -o covresults libspatialite_cov.info
          883  +	lcov --directory src --output-file libspatialite_cov.info --capture
          884  +	genhtml -o covresults libspatialite_cov.info
   885    885   
   886    886   # Tell versions [3.59,3.63) of GNU make to not export all variables.
   887    887   # Otherwise a system limit (for SysV at least) may be exceeded.
   888    888   .NOEXPORT:

Changes to config.h.in.

     1      1   /* config.h.in.  Generated from configure.ac by autoheader.  */
     2      2   
     3         -/* Should be defined in order to enable GCP support. */
     4         -#undef ENABLE_GCP
            3  +/* Should be defined in order to enable CONTROL_POINTS support. */
            4  +#undef ENABLE_CONTROL_POINTS
     5      5   
     6      6   /* Should be defined in order to enable GeoPackage support. */
     7      7   #undef ENABLE_GEOPACKAGE
     8      8   
     9      9   /* Should be defined in order to enable LIBXML2 support. */
    10     10   #undef ENABLE_LIBXML2
    11     11   

Changes to configure.

   793    793   enable_geocallbacks
   794    794   enable_proj
   795    795   enable_iconv
   796    796   enable_freexl
   797    797   enable_epsg
   798    798   enable_geos
   799    799   with_geosconfig
   800         -enable_gcp
          800  +enable_controlpoints
   801    801   enable_geosadvanced
   802    802   enable_lwgeom
   803    803   enable_libxml2
   804    804   enable_geopackage
   805    805   enable_gcov
   806    806   enable_examples
   807    807   '
................................................................................
  1458   1458     --enable-mathsql        enables SQL math functions [default=yes]
  1459   1459     --enable-geocallbacks   enables geometry callbacks [default=no]
  1460   1460     --enable-proj           enables PROJ.4 inclusion [default=yes]
  1461   1461     --enable-iconv          enables ICONV inclusion [default=yes]
  1462   1462     --enable-freexl         enables FreeXL inclusion [default=yes]
  1463   1463     --enable-epsg           enables full EPSG dataset support [default=yes]
  1464   1464     --enable-geos           enables GEOS inclusion [default=yes]
  1465         -  --enable-gcp            enables Control Points (from Grass GIS) [default=no]
         1465  +  --enable-controlpoints  enables Control Points (from Grass GIS) [default=no]
  1466   1466     --enable-geosadvanced   enables GEOS advanced features [default=yes]
  1467   1467     --enable-lwgeom         enables LWGEOM support [default=no]
  1468   1468     --enable-libxml2        enables libxml2 inclusion [default=yes]
  1469   1469     --enable-geopackage     enables GeoPackage support [default=yes]
  1470   1470     --enable-gcov           turn on code coverage analysis tools
  1471   1471     --enable-examples       enables building examples [default=yes]
  1472   1472   
................................................................................
 17348  17348     LIBS="-lz $LIBS"
 17349  17349   
 17350  17350   else
 17351  17351     as_fn_error $? "'libz' is required but it doesn't seem to be installed on this system." "$LINENO" 5
 17352  17352   fi
 17353  17353   
 17354  17354   
 17355         -ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile src/connection_cache/generator/Makefile src/virtualtext/Makefile src/wfs/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_geos_tests/Makefile test/sql_stmt_geosadvanced_tests/Makefile test/sql_stmt_geopackage_tests/Makefile test/sql_stmt_proj_tests/Makefile test/sql_stmt_mathsql_tests/Makefile test/sql_stmt_lwgeom_tests/Makefile test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile test/sql_stmt_cache_tests/Makefile test/sql_stmt_nocache_tests/Makefile examples/Makefile Doxyfile spatialite.pc"
        17355  +ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile src/connection_cache/generator/Makefile src/virtualtext/Makefile src/wfs/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_geos_tests/Makefile test/sql_stmt_geosadvanced_tests/Makefile test/sql_stmt_geopackage_tests/Makefile test/sql_stmt_proj_tests/Makefile test/sql_stmt_mathsql_tests/Makefile test/sql_stmt_lwgeom_tests/Makefile test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile examples/Makefile Doxyfile spatialite.pc"
 17356  17356   
 17357  17357   
 17358  17358   # exporting the TARGET_CPU string
 17359  17359   splite_cpu=`$CC -dumpmachine`
 17360  17360   cat >>confdefs.h <<_ACEOF
 17361  17361   #define TARGET_CPU "$splite_cpu"
 17362  17362   _ACEOF
................................................................................
 18124  18124   
 18125  18125     LIBS="$LIBS_SAVE"
 18126  18126     LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c"
 18127  18127   
 18128  18128     #-----------------------------------------------------------------------
 18129  18129     #   --enable-controlpoints
 18130  18130     #
 18131         -  # Check whether --enable-gcp was given.
 18132         -if test "${enable_gcp+set}" = set; then :
 18133         -  enableval=$enable_gcp;
        18131  +  # Check whether --enable-controlpoints was given.
        18132  +if test "${enable_controlpoints+set}" = set; then :
        18133  +  enableval=$enable_controlpoints;
 18134  18134   else
 18135         -  enable_gcp=no
        18135  +  enable_controlpoints=no
 18136  18136   fi
 18137  18137   
 18138         -  if test x"$enable_gcp" != "xno"; then
 18139         -	  $as_echo "#define ENABLE_GCP 1" >>confdefs.h
        18138  +  if test x"$enable_controlpoints" != "xno"; then
        18139  +	  $as_echo "#define ENABLE_CONTROL_POINTS 1" >>confdefs.h
 18140  18140   
 18141  18141     fi
 18142  18142   
 18143  18143     #-----------------------------------------------------------------------
 18144  18144     #   --enable-geosadvanced
 18145  18145     #
 18146  18146     # Check whether --enable-geosadvanced was given.
................................................................................
 19783  19783       "test/sql_stmt_proj_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_proj_tests/Makefile" ;;
 19784  19784       "test/sql_stmt_mathsql_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_mathsql_tests/Makefile" ;;
 19785  19785       "test/sql_stmt_lwgeom_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_lwgeom_tests/Makefile" ;;
 19786  19786       "test/sql_stmt_libxml2_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_libxml2_tests/Makefile" ;;
 19787  19787       "test/sql_stmt_security_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_security_tests/Makefile" ;;
 19788  19788       "test/sql_stmt_xmlsec_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_xmlsec_tests/Makefile" ;;
 19789  19789       "test/sql_stmt_freexl_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_freexl_tests/Makefile" ;;
 19790         -    "test/sql_stmt_cache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_cache_tests/Makefile" ;;
 19791         -    "test/sql_stmt_nocache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_nocache_tests/Makefile" ;;
 19792  19790       "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
 19793  19791       "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
 19794  19792       "spatialite.pc") CONFIG_FILES="$CONFIG_FILES spatialite.pc" ;;
 19795  19793   
 19796  19794     *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 19797  19795     esac
 19798  19796   done
................................................................................
 21327  21325   #-----------------------------------------------------------------------
 21328  21326   # printing an eventual message reporting about GPL escalation
 21329  21327   #-----------------------------------------------------------------------
 21330  21328   gpl_escalation=no;
 21331  21329   if test x"$enable_lwgeom" != "xno"; then
 21332  21330       gpl_escalation=yes
 21333  21331   fi
 21334         -if test x"$enable_gcp" != "xno"; then
        21332  +if test x"$enable_controlpoints" != "xno"; then
 21335  21333       gpl_escalation=yes
 21336  21334   fi
 21337  21335   if test x"$gpl_escalation" != xno; then
 21338  21336       echo
 21339  21337       echo
 21340  21338       echo "=============================================================="
 21341  21339       echo "                        IMPORTANT NOTICE"
 21342  21340       echo "=============================================================="
 21343         -    echo "You have selected --enable-lwgeom and/or --enable-gcp"
        21341  +    echo "You have selected --enable-lwgeom and/or --enable-controlpoints"
 21344  21342       echo
 21345  21343       echo "Both modules strictly depend on code released under the GPLv2+"
 21346  21344       echo "license, wich is virally infective by definition."
 21347  21345       echo "Consequently the copy of libspatialite you are going to build"
 21348  21346       echo "if configured this way *must* be released under the GPLv2+ license."
 21349  21347       echo
 21350  21348       echo "If you wish better preserving the initial MPL tri-license you"
 21351  21349       echo "simply have to reconfigure by specifying the following options:"
 21352         -    echo "        --disable-lwgeom --disable-gcp"
        21350  +    echo "        --disable-lwgeom --disable-controlpoints"
 21353  21351       echo "=============================================================="
 21354  21352   
 21355  21353   fi

Changes to configure.ac.

    31     31               [Should be defined in order to disable GEOS support.])
    32     32   AH_TEMPLATE([GEOS_ADVANCED],
    33     33               [Should be defined in order to enable GEOS_ADVANCED support.])
    34     34   AH_TEMPLATE([GEOS_TRUNK],
    35     35               [Should be defined in order to enable GEOS_TRUNK experimental support.])
    36     36   AH_TEMPLATE([ENABLE_LWGEOM],
    37     37               [Should be defined in order to enable LWGEOM support.])
    38         -AH_TEMPLATE([ENABLE_GCP],
    39         -            [Should be defined in order to enable GCP support.])
           38  +AH_TEMPLATE([ENABLE_CONTROL_POINTS],
           39  +            [Should be defined in order to enable CONTROL_POINTS support.])
    40     40   AH_TEMPLATE([OMIT_PROJ],
    41     41               [Should be defined in order to disable PROJ.4 support.])
    42     42   AH_TEMPLATE([OMIT_ICONV],
    43     43               [Should be defined in order to disable ICONV support.])
    44     44   AH_TEMPLATE([OMIT_MATHSQL],
    45     45               [Should be defined in order to disable MATHSQL support.])
    46     46   AH_TEMPLATE([OMIT_EPSG],
................................................................................
   135    135   		test/sql_stmt_proj_tests/Makefile \
   136    136   		test/sql_stmt_mathsql_tests/Makefile \
   137    137   		test/sql_stmt_lwgeom_tests/Makefile \
   138    138   		test/sql_stmt_libxml2_tests/Makefile \
   139    139   		test/sql_stmt_security_tests/Makefile \
   140    140   		test/sql_stmt_xmlsec_tests/Makefile \
   141    141   		test/sql_stmt_freexl_tests/Makefile \
   142         -		test/sql_stmt_cache_tests/Makefile \
   143         -		test/sql_stmt_nocache_tests/Makefile \
   144    142   		examples/Makefile \
   145    143   		Doxyfile \
   146    144   		spatialite.pc])
   147    145   
   148    146   # exporting the TARGET_CPU string
   149    147   splite_cpu=`$CC -dumpmachine`
   150    148   AC_DEFINE_UNQUOTED([TARGET_CPU], ["$splite_cpu"])
................................................................................
   280    278     AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.3.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig]))
   281    279     LIBS="$LIBS_SAVE"
   282    280     LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c"
   283    281   
   284    282     #-----------------------------------------------------------------------
   285    283     #   --enable-controlpoints
   286    284     #
   287         -  AC_ARG_ENABLE(gcp, [AS_HELP_STRING(
   288         -	  [--enable-gcp], [enables Control Points (from Grass GIS) [default=no]])],
   289         -	  [], [enable_gcp=no])
   290         -  if test x"$enable_gcp" != "xno"; then
   291         -	  AC_DEFINE(ENABLE_GCP)
          285  +  AC_ARG_ENABLE(controlpoints, [AS_HELP_STRING(
          286  +	  [--enable-controlpoints], [enables Control Points (from Grass GIS) [default=no]])],
          287  +	  [], [enable_controlpoints=no])
          288  +  if test x"$enable_controlpoints" != "xno"; then
          289  +	  AC_DEFINE(ENABLE_CONTROL_POINTS)
   292    290     fi
   293    291   
   294    292     #-----------------------------------------------------------------------
   295    293     #   --enable-geosadvanced
   296    294     #
   297    295     AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
   298    296   	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
................................................................................
   385    383   #-----------------------------------------------------------------------
   386    384   # printing an eventual message reporting about GPL escalation
   387    385   #-----------------------------------------------------------------------
   388    386   gpl_escalation=no;
   389    387   if test x"$enable_lwgeom" != "xno"; then
   390    388       gpl_escalation=yes
   391    389   fi
   392         -if test x"$enable_gcp" != "xno"; then
          390  +if test x"$enable_controlpoints" != "xno"; then
   393    391       gpl_escalation=yes
   394    392   fi
   395    393   if test x"$gpl_escalation" != xno; then
   396    394       echo 
   397    395       echo
   398    396       echo "=============================================================="
   399    397       echo "                        IMPORTANT NOTICE"
   400    398       echo "=============================================================="
   401         -    echo "You have selected --enable-lwgeom and/or --enable-gcp"
          399  +    echo "You have selected --enable-lwgeom and/or --enable-controlpoints"
   402    400       echo
   403    401       echo "Both modules strictly depend on code released under the GPLv2+"
   404    402       echo "license, wich is virally infective by definition."
   405    403       echo "Consequently the copy of libspatialite you are going to build"
   406    404       echo "if configured this way *must* be released under the GPLv2+ license."
   407    405       echo
   408    406       echo "If you wish better preserving the initial MPL tri-license you"
   409    407       echo "simply have to reconfigure by specifying the following options:"
   410         -    echo "        --disable-lwgeom --disable-gcp"
          408  +    echo "        --disable-lwgeom --disable-controlpoints"
   411    409       echo "=============================================================="
   412    410       
   413    411   fi

Changes to spatialite-sql-latest.html.

    12     12   		</style>
    13     13   	</head><body bgcolor="#fffff0">
    14     14   		<h2>SpatiaLite 4.3.0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL functions reference list</h2>
    15     15   		<a href="https://www.gaia-gis.it/fossil/libspatialite">back</a>
    16     16   		<ul>
    17     17   			<li><a href="#version">SQL Version Info [and build options testing] functions</a></li>
    18     18   			<li><a href="#generic">Generic SQL utility functions</a></li>
    19         -			<li><a href="#global">Global settings per connection</a></li>
    20     19   			<li><a href="#math">SQL math functions</a></li>
    21     20   			<li><a href="#error">SQL functions reporting GEOS / LWGEOM errors and warnings</a></li>
    22     21   			<li><a href="#length_cvt">SQL length/distance unit-conversion functions</a></li>
    23     22   			<li><a href="#dms_cvt">SQL conversion functions from DD/DMS notations (longitude/latitude)</a></li>
    24     23   			<li><a href="#blob">SQL utility functions for BLOB objects</a></li>
    25     24   			<li><a href="#p0">SQL utility functions [non-standard] for geometric objects</a></li>
    26     25   			<li><a href="#p1">SQL functions for constructing a geometric object given its Well-known Text Representation</a></li>
................................................................................
    42     41   			<li><a href="#p12">SQL functions that test spatial relationships</a></li>
    43     42   			<li><a href="#p13">SQL functions for distance relationships</a></li>
    44     43   			<li><a href="#p14">SQL functions that implement spatial operators</a></li>
    45     44   			<li><a href="#p14b">SQL functions that implement spatial operators [GEOS specific features]</a></li>
    46     45   			<li><a href="#p14c">SQL functions that implement spatial operators [GEOS advanced features]</a></li>
    47     46   			<li><a href="#p14d">SQL functions that implement spatial operators [LWGEOM features]</a></li>
    48     47   			<li><a href="#p15">SQL functions for coordinate transformations</a></li>
    49         -			<li><a href="#p15plus">SQL functions supporting Affine Transformations and Ground Control Points</a></li>
    50     48   			<li><a href="#p16">SQL functions for Spatial-MetaData and Spatial-Index handling</a></li>
    51     49   			<li><a href="#p16metacatalog">SQL functions supporting the MetaCatalog and related Statistics</a></li>
    52     50   			<li><a href="#p16style">SQL functions supporting SLD/SE Styled Layers</a></li>
    53     51   			<li><a href="#p16isometa">SQL functions supporting ISO Metadata</a></li>
    54     52   			<li><a href="#p16fdo">SQL functions implementing FDO/OGR compatibility</a></li>
    55     53   			<li><a href="#p16gpkg">SQL functions implementing OGC GeoPackage compatibility</a></li>
    56     54   			<li><a href="#p17">SQL functions for MbrCache-based queries</a></li>
................................................................................
   184    182   				<td colspan="3">returns the File Extension from a relative or absolute Pathname.<br>Will return <b>NULL</b> for invalid input of for any path
   185    183   				 lacking a File Name or when no Extension is present.</td></tr>
   186    184   			<tr><td><b>eval</b></td>
   187    185   				<td>eval( X <i>TEXT</i> [ , Y <i>TEXT</i> ) : <i>Text</i></td>
   188    186   				<td colspan="3">Evaluate the SQL text in <b>X</b>.  Return the results, using string <b>Y</b> as the separator.<br>
   189    187   				If <b>Y</b> is omitted, use a single space character.<hr>
   190    188                   Explicitly setting the environment variable <b>SPATIALITE_SECURITY=relaxed</b> is absolutely required in order to effectively enable this function.</td></tr>
   191         -            <tr><td colspan="5" align="center" bgcolor="#f0e0c0">
   192         -				<h3><a name="global">Global settings per connection</a></h3></td></tr>
   193         -			<tr><th bgcolor="#d0d0d0">Function</th>
   194         -				<th bgcolor="#d0d0d0">Syntax</th>
   195         -				<th colspan="3" bgcolor="#d0d0d0">Summary</th></tr>
   196         -			<tr><td><b>EnableGpkgAmphibiousMode</b></td>
   197         -				<td>EnableGpkgAmphibiousMode( <i>void</i> ) : <i>void</i></td>
   198         -				<td colspan="3">Enables the <b>Geopackage amphibious mode</b><br>
   199         -				all connections initially start by disabling the amphibious mode, that has always to be explicitly enabled whenever reguired.</td></tr>
   200         -			<tr><td><b>DisableGpkgAmphibiousMode</b></td>
   201         -				<td>DisableGpkgAmphibiousMode( <i>void</i> ) : <i>void</i></td>
   202         -				<td colspan="3">Disables the <b>Geopackage amphibious mode</b></td></tr>
   203         -			<tr><td><b>GetGpkgAmphibiousMode</b></td>
   204         -				<td>GetGpkgAmphibiousMode( <i>void</i> ) : <i>boolean</i></td>
   205         -				<td colspan="3">Returns <b>TRUE</b> if the <b>Geopackage amphibious mode</b> is currently enabled, otherwise <b>FALSE</b></td></tr>
   206         -			<tr><td><b>SetDecimalPrecision</b></td>
   207         -				<td>SetDecimalPrecision( <i>integer</i> ) : <i>void</i></td>
   208         -				<td colspan="3">Explicitly sets the number of decimal digits (<i>precision</i>) to be displayed by <b>ST_AsText()</b> for coordinate values: the standard default setting is <b>6</b> decimal digits.<br>
   209         -				Passing any <b>negative</b> precision will automatically restore the initial default setting.<br>
   210         -				The <b>spatialite_gui</b> tool will honor this setting for all floating point values to be displayed on the screen.</td></tr>
   211         -			<tr><td><b>GetDecimalPrecision</b></td>
   212         -				<td>GetDecimalPrecision( <i>void</i> ) : <i>integer</i></td>
   213         -				<td colspan="3">Returns the currently set <b>decimal precision</b>.<br>
   214         -				A <b>negative</b> precision identifies the default setting.</td></tr>
   215    189   			<tr><td colspan="5" align="center" bgcolor="#f0e0c0">
   216    190   				<h3><a name="math">SQL math functions</a></h3></td></tr>
   217    191   			<tr><th bgcolor="#d0d0d0">Function</th>
   218    192   				<th bgcolor="#d0d0d0">Syntax</th>
   219    193   				<th colspan="3" bgcolor="#d0d0d0">Summary</th></tr>
   220    194   			<tr><td><b>Abs</b></td>
   221    195   				<td>Abs( x <i>Double precision</i> ) : <i>Double precision</i></td>
................................................................................
   227    201   			<tr><td><b>Asin</b></td>
   228    202   				<td>Asin( x <i>Double precision</i> ) : <i>Double precision</i></td>
   229    203   				<td colspan="3">returns the arc sine of <b>x</b>, that is, the value whose sine is <b>x</b><br>
   230    204   				returns NULL if <b>x</b> is not in the range -1 to 1</td></tr>
   231    205   			<tr><td><b>Atan</b></td>
   232    206   				<td>Atan( x <i>Double precision</i> ) : <i>Double precision</i></td>
   233    207   				<td colspan="3">returns the arc tangent of <b>x</b>, that is, the value whose tangent is <b>x</b></td></tr>
   234         -			<tr><td><b>Atan2</b></td>
   235         -				<td>Atan2( x <i>Double precision</i> , y <i>Double precision</i> ) : <i>Double precision</i></td>
   236         -				<td colspan="3">returns the principal value of the arc tangent of <b>y/x</b> in radians, using the signs of the two
   237         -				arguments to determine the quadrant of the result. The eturn value is in the range[<b>-pi</b>, <b>pi</b>].</td></tr>
   238    208   			<tr><td><b>Ceil<br>Ceiling</b></td>
   239    209   				<td>Ceil( x <i>Double precision</i> ) : <i>Double precision</i><hr>
   240    210   				Ceiling( x <i>Double precision</i> ) : <i>Double precision</i></td>
   241    211   				<td colspan="3">returns the smallest integer value not less than <b>x</b></td></tr>
   242    212   			<tr><td><b>Cos</b></td>
   243    213   				<td>Cos( x <i>Double precision</i> ) : <i>Double precision</i></td>
   244    214   				<td colspan="3">returns the cosine of <b>x</b>, where <b>x</b> is given in <u>radians</u></td></tr>
................................................................................
  2364   2334   					i.e. if xAxis is 0 (FALSE), then x-coordinates remains untouched; otherwise x-coordinates will be reflected</td></tr>
  2365   2335   			<tr><td><b>SwapCoords</b><br><b>SwapCoordinates</b></td>
  2366   2336   				<td>SwapCoords( geom <i>Geometry</i> ) : <i>Geometry</i><hr>
  2367   2337   					SwapCoordinates( geom <i>Geometry</i> ) : <i>Geometry</i></td>
  2368   2338   				<td></td>
  2369   2339   				<td align="center" bgcolor="#d0f0d0">base</td>
  2370   2340   				<td>return a geometric object obtained by swapping x- and y-coordinates</td></tr>
  2371         -			<tr><td colspan="5" align="center" bgcolor="#f0f0c0">	
  2372         -				<h3><a name="p15plus">SQL functions supporting Affine Transformations and Ground Control Points</a></h3></td></tr>
  2373         -			<tr><th bgcolor="#d0d0d0">Function</th>
  2374         -				<th bgcolor="#d0d0d0">Syntax</th>
  2375         -				<th bgcolor="#d0d0d0">OGC<br>defined</th>
  2376         -				<th bgcolor="#d0d0d0">required<br>module</th>
  2377         -				<th bgcolor="#d0d0d0">Summary</th></tr>
  2378         -			<tr><td><b>ATM_Create</b></td>
  2379         -				<td>ATM_Create( <i>void</i> ) : <i>AffineMatrix</i><hr>
  2380         -				ATM_Create( a <i>Integer</i> , b <i>Integer</i> , d <i>Integer</i> , e <i>Integer</i> , xoff <i>Integer</i> , yoff <i>Integer</i> ] ) : <i>AffineMatrix</i><hr>
  2381         -				ATM_Create( a <i>Integer</i> , b <i>Integer</i> , c <i>Integer</i> , d <i>Integer</i> , e <i>Integer</i>  , f <i>Integer</i> , 
  2382         -				g <i>Integer</i> , h </>Integer</i> , i <i>Integer</i> , xoff <i>Integer</i> , yoff <i>Integer</i> , zoff <i>Integer</i> ] ) : <i>AffineMatrix</i></td>
  2383         -				<td></td>
  2384         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2385         -				<td>return a BLOB-encoded Affine Transformation matrix.
  2386         -				<ul>
  2387         -					<li>the first form (no arguments) will return an <b>Identity</b> matrix.</li>
  2388         -					<li>the second and third forms will respectively return a fully initialized <b>2D</b> or <b>3D</b> Affine Transformation matrix.</li>
  2389         -				</ul><hr>
  2390         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2391         -			<tr><td><b>ATM_CreateTranslate</b></td>
  2392         -				<td>ATM_CreateTranslate( tx <i>Double precision</i> , ty <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2393         -				ATM_CreateTranslate( tx <i>Double precision</i> , ty <i>Double precision</i> , tz <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2394         -				<td></td>
  2395         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2396         -				<td>return a BLOB-encoded Affine Transformation matrix representing a <b>2D</b> or <b>3D Translate</b> transformation.</b><hr>
  2397         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2398         -			<tr><td><b>ATM_CreateScale</b></td>
  2399         -				<td>ATM_CreateScale( sx <i>Double precision</i> , sy <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2400         -				ATM_CreateScale( sx <i>Double precision</i> , sy <i>Double precision</i> , sz <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2401         -				<td></td>
  2402         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2403         -				<td>return a BLOB-encoded Affine Transformation matrix representing a <b>2D</b> or <b>3D Scale</b> transformation.</b><hr>
  2404         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2405         -			<tr><td><b>ATM_CreateRotate</b></td>
  2406         -				<td>ATM_CreateRotate( angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2407         -				ATM_CreateZRoll( angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2408         -				<td></td>
  2409         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2410         -				<td>return a BLOB-encoded Affine Transformation matrix representing a <b>Rotate</b> transformation (along the <b>Z axis</b>).</b><hr>
  2411         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2412         -			<tr><td><b>ATM_CreateXRoll</b></td>
  2413         -				<td>ATM_CreateXRoll( angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2414         -				<td></td>
  2415         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2416         -				<td>return a BLOB-encoded Affine Transformation matrix representing a <b>Rotate</b> transformation (along the <b>X axis</b>).</b><hr>
  2417         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2418         -			<tr><td><b>ATM_CreateYRoll</b></td>
  2419         -				<td>ATM_CreateYRoll( angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2420         -				<td></td>
  2421         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2422         -				<td>return a BLOB-encoded Affine Transformation matrix representing a <b>Rotate</b> transformation (along the <b>Y axis</b>).</b><hr>
  2423         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2424         -			<tr><td><b>ATM_Multiply</b></td>
  2425         -				<td>ATM_Multiply( matrixA <i>AffineMatrix</i> , matrixB <i>AffineMatrix</i> ) : <i>AffineMatrix</i></td>
  2426         -				<td></td>
  2427         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2428         -				<td>return a BLOB-encoded Affine Transformation matrix representing the result of multiplying <b>matrixA</b> by <b>matrixB</b>.<hr>
  2429         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2430         -			<tr><td><b>ATM_Translate</b></td>
  2431         -				<td>ATM_Translate( matrix <i>AffineMatrix</i> , tx <i>Double precision</i> , ty <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2432         -				ATM_CreateTranslate( matrix <i>AffineMatrix</i> , tx <i>Double precision</i> , ty <i>Double precision</i> , tz <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2433         -				<td></td>
  2434         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2435         -				<td>return a BLOB-encoded Affine Transformation matrix by chaining a further <b>2D</b> or <b>3D Translate</b> to a previous transformation matrix.</b><hr>
  2436         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2437         -			<tr><td><b>ATM_Scale</b></td>
  2438         -				<td>ATM_Scale( matrix <i>AffineMatrix</i> , sx <i>Double precision</i> , sy <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2439         -				ATM_Scale( matrix <i>AffineMatrix</i> , sx <i>Double precision</i> , sy <i>Double precision</i> , sz <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2440         -				<td></td>
  2441         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2442         -				<td>return a BLOB-encoded Affine Transformation matrix by chaining a further <b>2D</b> or <b>3D Scale</b> to a previous transformation matrix.</b><hr>
  2443         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2444         -			<tr><td><b>ATM_Rotate</b></td>
  2445         -				<td>ATM_Rotate( matrix <i>AffineMatrix</i> , angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i><hr>
  2446         -				ATM_ZRoll( matrix <i>AffineMatrix</i> , angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2447         -				<td></td>
  2448         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2449         -				<td>return a BLOB-encoded Affine Transformation matrix by chaining a further <b>Rotate</b> (along the <b>Z axis</b>) to a previous transformation matrix.</b><hr>
  2450         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2451         -			<tr><td><b>ATM_XRoll</b></td>
  2452         -				<td>ATM_XRoll( matrix <i>AffineMatrix</i> , angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2453         -				<td></td>
  2454         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2455         -				<td>return a BLOB-encoded Affine Transformation matrix by chaining a further <b>Rotate</b> (along the <b>X axis</b>) to a previous transformation matrix.</b><hr>
  2456         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2457         -			<tr><td><b>ATM_YRoll</b></td>
  2458         -				<td>ATM_YRoll( matrix <i>AffineMatrix</i> , angleInDegrees <i>Double precision</i> ] ) : <i>AffineMatrix</i></td>
  2459         -				<td></td>
  2460         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2461         -				<td>return a BLOB-encoded Affine Transformation matrix by chaining a further <b>Rotate</b> (along the <b>Y axis</b>) to a previous transformation matrix.</b><hr>
  2462         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2463         -			<tr><td><b>ATM_Determinant</b></td>
  2464         -				<td>ATM_Determinant( matrix <i>AffineMatrix</i> ] ) : <i>Double precision</i></td>
  2465         -				<td></td>
  2466         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2467         -				<td>return the Determinant from an Affine Transformation matrix.<hr>
  2468         -				will return <b>0.0</b> on invalid argument.</td></tr>
  2469         -			<tr><td><b>ATM_IsInvertible</b></td>
  2470         -				<td>ATM_IsInvertible( matrix <i>AffineMatrix</i> ] ) : <i>Integer</i></td>
  2471         -				<td></td>
  2472         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2473         -				<td>return <b>1</b> if the Affine Transformation matrix can be inverted, <b>0</b> if not.<hr>
  2474         -				will return <b>-1</b> on invalid argument.</td></tr>
  2475         -			<tr><td><b>ATM_Invert</b></td>
  2476         -				<td>ATM_Invert( matrix <i>AffineMatrix</i> ] ) : <i>AffineMatrix</i></td>
  2477         -				<td></td>
  2478         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2479         -				<td>return an inverted Affine Transformation matrix.<hr>
  2480         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2481         -			<tr><td><b>ATM_IsValid</b></td>
  2482         -				<td>ATM_IsValid( matrix <i>AffineMatrix</i> ] ) : <i>Integer</i></td>
  2483         -				<td></td>
  2484         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2485         -				<td>return <b>1</b> if the BLOB argument really contains a valid Affine Transformation matrix, <b>0</b> if not.<hr>
  2486         -				will return <b>-1</b> on invalid argument.</td></tr>
  2487         -			<tr><td><b>ATM_AsText</b></td>
  2488         -				<td>ATM_AsText( matrix <i>AffineMatrix</i> ] ) : <i>Text</i></td>
  2489         -				<td></td>
  2490         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2491         -				<td>return a serialized text string corresponding to an Affine Transformation matrix.<hr>
  2492         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2493         -			<tr><td><b>ATM_Transform</b></td>
  2494         -				<td>ATM_Transform( geom <i>Geometry</i> , matrix <i>AffineMatrix</i> [ , newSRID <i>Integer</i> ] ) : <i>Geometry</i></td>
  2495         -				<td></td>
  2496         -				<td align="center" bgcolor="#d0f0d0">base</td>
  2497         -				<td>return a geometric object obtained by applying an Affine Transformation; if the optional arg newSRID is defined then the returned Geometry will assume the corresponding 
  2498         -				Reference System, otherwise it will preserve the same Reference System of the input Geometry.<hr>
  2499         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2500         -			<tr><td><b>GCP_Compute</b></td>
  2501         -				<td>GCP_Compute( pointA <i>Geometry</i> , pointB <i>Geometry</i> [ order <i>Integer</i>] ) : <i>PolynomialCoeffs</i></td>
  2502         -				<td></td>
  2503         -				<td align="center" bgcolor="#90f0d0">GrassGis code<br>GPLv2+</td>
  2504         -				<td>return BLOB-encoded objects containing Polynomial coefficients computed from a set of matching <b>Ground Control Points</b> pairs.
  2505         -				<ul>
  2506         -					<li><b>pointA</b> corresponds to the origin Reference System; <b>pointB</b> corresponds to the destination target.</li>
  2507         -					<li>the input Geometries must be of the <b>Point</b> type and must have the same dimensions</li>
  2508         -					<li>if the points have <b>XYZ</b> or <b>XYZM</b> dimensions then <b>3D coeffs</b> will be returned, otherwise <b>2D</b> coeffs will be return.</li>
  2509         -					<li>the optional <b>order</b> argument can assume the following values:
  2510         -					<ul>
  2511         -						<li><b>0</b>: a set of <b>2D coeffs</b> will be returned by applying the <b>Thin Plate Spline</b> method.</li>
  2512         -						<li><b>1</b>: (<i>default setting</i>) a set of <b>2D</b> or <b>3D</b> Polynomial coeffs</b> of the <b>1st order</b> will be returned.</li>
  2513         -						<li><b>2</b>: a set of <b>2D</b> or <b>3D</b> Polynomial coeffs</b> of the <b>2nd order</b> will be returned.</li>
  2514         -						<li><b>3</b>: a set of <b>2D</b> or <b>3D</b> Polynomial coeffs</b> of the <b>3rd order</b> will be returned.</li>
  2515         -					</ul></li>
  2516         -				</ul><hr>
  2517         -				will return <b>NULL</b> on invalid arguments<hr>
  2518         -				<u><b>aggreagate function</b></u></td></tr>
  2519         -			<tr><td><b>GCP_IsValid</b></td>
  2520         -				<td>GCP_IsValid( matrix <i>PolynomialCoeffs</i> ] ) : <i>Integer</i></td>
  2521         -				<td></td>
  2522         -				<td align="center" bgcolor="#90f0d0">GrassGis code<br>GPLv2+</td>
  2523         -				<td>return <b>1</b> if the BLOB argument really contains valid Polynomial coeffs, <b>0</b> if not.<hr>
  2524         -				will return <b>-1</b> on invalid argument.</td></tr>
  2525         -			<tr><td><b>GCP_AsText</b></td>
  2526         -				<td>GCP_AsText( matrix <i>PolynomialCoeffs</i> ] ) : <i>Text</i></td>
  2527         -				<td></td>
  2528         -				<td align="center" bgcolor="#90f0d0">GrassGis code<br>GPLv2+</td>
  2529         -				<td>return a serialized text string corresponding to the Polynomial coeffs.<hr>
  2530         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2531         -			<tr><td><b>GCP2ATM</b></td>
  2532         -				<td>GCP2ATM( matrix <i>PolynomialCoeffs</i> ] ) : <i>AffineMatrix</i></td>
  2533         -				<td></td>
  2534         -				<td align="center" bgcolor="#90f0d0">GrassGis code<br>GPLv2+</td>
  2535         -				<td>return an Affine Transformation matrix corresponding to the Polynomial coeffs.<br>
  2536         -				Only a set of Polynomial coeffs of the <b>1st order</b> can be converted to an Affine Transformation matrix.<hr>
  2537         -				will return <b>NULL</b> on invalid argument.</td></tr>
  2538         -			<tr><td><b>GCP_Transform</b></td>
  2539         -				<td>GCP_Transform( geom <i>Geometry</i> , coeffs <i>PolynomialCoeffs</i> [ , newSRID <i>Integer</i> ] ) : <i>Geometry</i></td>
  2540         -				<td></td>
  2541         -				<td align="center" bgcolor="#90f0d0">GrassGis code<br>GPLv2+</td>
  2542         -				<td>return a geometric object obtained by applying a Transformation based on Polynomial coefficients of the <b>1st</b>, <b>2nd</b> or <b>3rd order</b>; if the optional arg newSRID is defined then the returned Geometry will assume the corresponding 
  2543         -				Reference System, otherwise it will preserve the same Reference System of the input Geometry.<hr>
  2544         -				will return <b>NULL</b> on invalid arguments.</td></tr>
  2545   2341   			<tr><td colspan="5" align="center" bgcolor="#f0f0c0">
  2546   2342   				<h3><a name="p16">SQL functions for Spatial-MetaData and Spatial-Index handling</a></h3></td></tr>
  2547   2343   			<tr><th bgcolor="#d0d0d0">Function</th>
  2548   2344   				<th bgcolor="#d0d0d0">Syntax</th>
  2549   2345   				<th bgcolor="#d0d0d0">OGC<br>defined</th>
  2550   2346   				<th bgcolor="#d0d0d0">required<br>module</th>
  2551   2347   				<th bgcolor="#d0d0d0">Summary</th></tr>
................................................................................
  3907   3703   				<h3><a name="srid">SQL functions supporting SRID inspection</a></h3></td></tr>
  3908   3704   			<tr><th bgcolor="#d0d0d0">Function</th>
  3909   3705   				<th bgcolor="#d0d0d0">Syntax</th>
  3910   3706   				<th bgcolor="#d0d0d0" colspan="3">Summary</th></tr>
  3911   3707   			<tr><td><b>SridIsGeographic</b></td>
  3912   3708   				<td>SridIsGeographic( SRID <i>Integer</i> ) : <i>Integer</i></td>
  3913   3709   				<td colspan="3">Will inspect the SRID definitions checking if the SRID is of the <b>Geographic</b> type;<br>
  3914         -					will return <b>1</b> (i.e. <b>TRUE</b>) or <b>0</b> (i.e. <b>FALSE</b>).<br>
         3710  +					will return <b>1</b> (i.e. <b>TRUE</b> or <b>0</b> (i.e. <b>FALSE</b>).<br>
  3915   3711   					<b>NULL</b> will be returned on invalid argument or if the SRID is undefined.</td></tr>
  3916   3712   			<tr><td><b>SridIsProjected</b></td>
  3917   3713   				<td>SridIsProjected( SRID <i>Integer</i> ) : <i>Integer</i></td>
  3918   3714   				<td colspan="3">Will inspect the SRID definitions checking if the SRID is of the <b>Projected</b> type;<br>
  3919         -					will return <b>1</b> (i.e. <b>TRUE</b>) or <b>0</b> (i.e. <b>FALSE</b>).<br>
         3715  +					will return <b>1</b> (i.e. <b>TRUE</b> or <b>0</b> (i.e. <b>FALSE</b>).<br>
  3920   3716   					<b>NULL</b> will be returned on invalid argument or if the SRID is undefined.</td></tr>
  3921   3717   			<tr><td><b>SridHasFlippedAxes</b></td>
  3922   3718   				<td>SridHasFlippedAxes( SRID <i>Integer</i> ) : <i>Integer</i></td>
  3923         -				<td colspan="3">Will inspect the SRID definitions checking if the SRID requires a flipped Axes configuration: i.e. <b>Y,X</b> instead of the most usual <b>X,Y</b>;<br>
  3924         -					will return <b>1</b> (i.e. <b>TRUE</b>) or <b>0</b> (i.e. <b>FALSE</b>).<br>
         3719  +				<td colspan="3">Will inspect the SRID definitions checking if the SRID requires a flipped Axes configuration: i.e. <b>Y,X</b> instead of the most usual <b>X.Y</b>;<br>
         3720  +					will return <b>1</b> (i.e. <b>TRUE</b> or <b>0</b> (i.e. <b>FALSE</b>).<br>
  3925   3721   					<b>NULL</b> will be returned on invalid argument or if the SRID is undefined.</td></tr>
  3926   3722   			<tr><td><b>SridGetSpheroid</b></td>
  3927   3723   				<td>SridGetSpheroid( SRID <i>Integer</i> ) : <i>Text</i><hr>
  3928   3724   					SridGetEllipsoid( SRID <i>Integer</i> ) : <i>Text</i></td>
  3929   3725   				<td colspan="3">Will inspect the SRID definitions then returning the appropriate <b>Spheroid</b> name.<br>
  3930   3726   					<b>NULL</b> will be returned on invalid argument or if the SRID is undefined.</td></tr>
  3931   3727   			<tr><td><b>SridGetPrimeMeridian</b></td>

Changes to src/connection_cache/alloc_cache.c.

   248    248       if (cache == NULL)
   249    249         {
   250    250   	  invalidate (pool_index);
   251    251   	  goto done;
   252    252         }
   253    253       cache->magic1 = SPATIALITE_CACHE_MAGIC1;
   254    254       cache->magic2 = SPATIALITE_CACHE_MAGIC2;
   255         -    cache->gpkg_amphibious_mode = 0;
   256         -    cache->decimal_precision = -1;
   257    255       cache->GEOS_handle = NULL;
   258    256       cache->PROJ_handle = NULL;
   259    257       cache->pool_index = pool_index;
   260    258       confirm (pool_index, cache);
   261    259   /* initializing the XML error buffers */
   262    260       out = malloc (sizeof (gaiaOutBuffer));
   263    261       gaiaOutBufferInitialize (out);

Changes to src/control_points/gaia_control_points.c.

    34     34   
    35     35   #if defined(_WIN32) && !defined(__MINGW32__)
    36     36   #include "config-msvc.h"
    37     37   #else
    38     38   #include "config.h"
    39     39   #endif
    40     40   
    41         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
    42         -
    43         -#include <spatialite/sqlite.h>
           41  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
    44     42   
    45     43   #include <spatialite_private.h>
    46         -#include <spatialite/gaiageo.h>
    47         -#include <spatialite/gaiamatrix.h>
    48     44   #include <spatialite/control_points.h>
    49     45   
    50     46   #include "grass_crs.h"
    51     47   
    52         -#define POLYNOMIAL_MAGIC_START		0x00
    53         -#define POLYNOMIAL_MAGIC_DELIMITER	0x6a
    54         -#define POLYNOMIAL_MAGIC_END		0x63
    55         -#define POLYNOMIAL_FIRST_ORDER		0xb1
    56         -#define POLYNOMIAL_SECOND_ORDER		0xb2
    57         -#define POLYNOMIAL_THIRD_ORDER		0xb3
    58         -#define THIN_PLATE_SPLINE			0x3f
    59         -#define POLYNOMIAL_2D				0x3e
    60         -#define POLYNOMIAL_3D				0x3d
    61         -
    62         -struct cp_coeffs
    63         -{
    64         -/* Polynomial Coefficients */
    65         -    unsigned char type;
    66         -    unsigned char order;
    67         -    double E[20];
    68         -    double N[20];
    69         -    double Z[20];
    70         -    double *Etps;
    71         -    double *Ntps;
    72         -    struct Control_Points grass_cp;
    73         -};
    74         -
    75     48   GAIACP_DECLARE GaiaControlPointsPtr
    76         -gaiaCreateControlPoints (int allocation_incr, int has3d, int order, int tps)
           49  +gaiaCreateControlPoints (int allocation_incr, int has3d, int tps)
    77     50   {
    78     51   /* creating a Control Point set container */
    79     52       struct gaia_control_points *cp =
    80     53   	malloc (sizeof (struct gaia_control_points));
    81     54       if (cp == NULL)
    82     55   	return NULL;
    83         -    if (order < 1)
    84         -	order = 1;
    85         -    if (order > 3)
    86         -	order = 3;
    87         -    cp->order = order;
    88     56       cp->has3d = has3d;
    89     57       cp->tps = tps;
    90     58       cp->affine_valid = 0;
    91     59       if (allocation_incr < 64)
    92     60   	allocation_incr = 64;
    93     61       cp->allocation_incr = allocation_incr;
    94     62       cp->allocated_items = allocation_incr;
................................................................................
   292    260   	free (cp->z1);
   293    261       if (cp->z2 != NULL)
   294    262   	free (cp->z2);
   295    263       if (cp->status != NULL)
   296    264   	free (cp->status);
   297    265   }
   298    266   
   299         -static int
   300         -blob_encode_3d (double *E, double *N, double *Z, int order,
   301         -		unsigned char **blob, int *blob_sz)
          267  +GAIACP_DECLARE int
          268  +gaiaAffineFromControlPoints (GaiaControlPointsPtr cp_handle)
   302    269   {
   303         -/* creating a BLOB-Polynomial object - 3D */
   304         -    int i;
   305         -    int max;
   306         -    unsigned char *xblob = NULL;
   307         -    unsigned char *ptr;
   308         -    int xblob_sz;
   309         -    int endian_arch = gaiaEndianArch ();
   310         -
   311         -    *blob = NULL;
   312         -    *blob_sz = 0;
   313         -
   314         -    if (order == 2)
   315         -	max = 10;
   316         -    else if (order == 3)
   317         -	max = 20;
   318         -    else
   319         -	max = 4;
   320         -    xblob_sz = 11 + (max * (3 * (sizeof (double) + 1)));
   321         -
   322         -    xblob = malloc (xblob_sz);
   323         -    if (xblob == NULL)
   324         -	return 0;
   325         -    ptr = xblob;
   326         -/* encoding the BLOB */
   327         -    *ptr = POLYNOMIAL_MAGIC_START;	/* START signature */
   328         -    *(ptr + 1) = 1;		/* LITTLE ENDIAN */
   329         -    *(ptr + 2) = POLYNOMIAL_3D;
   330         -    *(ptr + 3) = POLYNOMIAL_MAGIC_DELIMITER;
   331         -    *(ptr + 4) = order;
   332         -    *(ptr + 5) = POLYNOMIAL_MAGIC_DELIMITER;
   333         -    gaiaExport32 (ptr + 6, 0, 1, endian_arch);
   334         -    ptr = xblob + 10;
   335         -    for (i = 0; i < max; i++)
   336         -      {
   337         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   338         -	  gaiaExport64 (ptr, E[i], 1, endian_arch);
   339         -	  ptr += sizeof (double);
   340         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   341         -	  gaiaExport64 (ptr, N[i], 1, endian_arch);
   342         -	  ptr += sizeof (double);
   343         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   344         -	  gaiaExport64 (ptr, Z[i], 1, endian_arch);
   345         -	  ptr += sizeof (double);
   346         -      }
   347         -    *ptr = POLYNOMIAL_MAGIC_END;
   348         -
   349         -    *blob = xblob;
   350         -    *blob_sz = xblob_sz;
   351         -    return 1;
   352         -}
   353         -
   354         -static int
   355         -blob_encode_2d (double *E, double *N, unsigned char order,
   356         -		unsigned char **blob, int *blob_sz)
   357         -{
   358         -/* creating a BLOB-Polynomial object - 2D */
   359         -    int i;
   360         -    int max;
   361         -    unsigned char *xblob = NULL;
   362         -    unsigned char *ptr;
   363         -    int xblob_sz;
   364         -    int endian_arch = gaiaEndianArch ();
   365         -
   366         -    *blob = NULL;
   367         -    *blob_sz = 0;
   368         -
   369         -    if (order == 2)
   370         -	max = 6;
   371         -    else if (order == 3)
   372         -	max = 10;
   373         -    else
   374         -	max = 3;
   375         -    xblob_sz = 11 + (max * (2 * (sizeof (double) + 1)));
   376         -
   377         -    xblob = malloc (xblob_sz);
   378         -    if (xblob == NULL)
   379         -	return 0;
   380         -    ptr = xblob;
   381         -/* encoding the BLOB */
   382         -    *ptr = POLYNOMIAL_MAGIC_START;	/* START signature */
   383         -    *(ptr + 1) = 1;		/* LITTLE ENDIAN */
   384         -    *(ptr + 2) = POLYNOMIAL_2D;
   385         -    *(ptr + 3) = POLYNOMIAL_MAGIC_DELIMITER;
   386         -    *(ptr + 4) = order;
   387         -    *(ptr + 5) = POLYNOMIAL_MAGIC_DELIMITER;
   388         -    gaiaExport32 (ptr + 6, 0, 1, endian_arch);
   389         -    ptr = xblob + 10;
   390         -    for (i = 0; i < max; i++)
   391         -      {
   392         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   393         -	  gaiaExport64 (ptr, E[i], 1, endian_arch);
   394         -	  ptr += sizeof (double);
   395         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   396         -	  gaiaExport64 (ptr, N[i], 1, endian_arch);
   397         -	  ptr += sizeof (double);
   398         -      }
   399         -    *ptr = POLYNOMIAL_MAGIC_END;
   400         -
   401         -    *blob = xblob;
   402         -    *blob_sz = xblob_sz;
   403         -    return 1;
   404         -}
   405         -
   406         -static int
   407         -blob_encode_tps (double *E, double *N, struct Control_Points *cp,
   408         -		 unsigned char **blob, int *blob_sz)
   409         -{
   410         -/* creating a BLOB-Polynomial object - 2D */
   411         -    int i;
   412         -    unsigned char *xblob = NULL;
   413         -    unsigned char *ptr;
   414         -    int xblob_sz;
   415         -    int endian_arch = gaiaEndianArch ();
   416         -
   417         -    *blob = NULL;
   418         -    *blob_sz = 0;
   419         -
   420         -    xblob_sz = 11 + ((cp->count + 3) * (2 * (sizeof (double) + 1)));
   421         -    xblob_sz += (cp->count * (4 * (sizeof (double) + 1)));
   422         -
   423         -    xblob = malloc (xblob_sz);
   424         -    if (xblob == NULL)
   425         -	return 0;
   426         -    ptr = xblob;
   427         -/* encoding the BLOB */
   428         -    *ptr = POLYNOMIAL_MAGIC_START;	/* START signature */
   429         -    *(ptr + 1) = 1;		/* LITTLE ENDIAN */
   430         -    *(ptr + 2) = THIN_PLATE_SPLINE;
   431         -    *(ptr + 3) = POLYNOMIAL_MAGIC_DELIMITER;
   432         -    *(ptr + 4) = 1;
   433         -    *(ptr + 5) = POLYNOMIAL_MAGIC_DELIMITER;
   434         -    gaiaExport32 (ptr + 6, cp->count, 1, endian_arch);
   435         -    ptr = xblob + 10;
   436         -    for (i = 0; i < cp->count + 3; i++)
   437         -      {
   438         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   439         -	  gaiaExport64 (ptr, E[i], 1, endian_arch);
   440         -	  ptr += sizeof (double);
   441         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   442         -	  gaiaExport64 (ptr, N[i], 1, endian_arch);
   443         -	  ptr += sizeof (double);
   444         -      }
   445         -    for (i = 0; i < cp->count; i++)
   446         -      {
   447         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   448         -	  gaiaExport64 (ptr, cp->e1[i], 1, endian_arch);
   449         -	  ptr += sizeof (double);
   450         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   451         -	  gaiaExport64 (ptr, cp->n1[i], 1, endian_arch);
   452         -	  ptr += sizeof (double);
   453         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   454         -	  gaiaExport64 (ptr, cp->e2[i], 1, endian_arch);
   455         -	  ptr += sizeof (double);
   456         -	  *ptr++ = POLYNOMIAL_MAGIC_DELIMITER;
   457         -	  gaiaExport64 (ptr, cp->n2[i], 1, endian_arch);
   458         -	  ptr += sizeof (double);
   459         -      }
   460         -    *ptr = POLYNOMIAL_MAGIC_END;
   461         -
   462         -    *blob = xblob;
   463         -    *blob_sz = xblob_sz;
   464         -    return 1;
   465         -}
   466         -
   467         -static int
   468         -blob_decode (struct cp_coeffs *coeffs, const unsigned char *blob, int blob_sz)
   469         -{
   470         -/* decoding a BLOB-Polynomial coeffs object */
   471         -    int endian;
   472         -    int endian_arch = gaiaEndianArch ();
   473         -    unsigned char type;
   474         -    unsigned char order;
   475         -    int count;
   476         -    int i;
   477         -    int max;
   478         -    int xblob_sz;
   479         -    const unsigned char *ptr = blob;
   480         -
   481         -    coeffs->Etps = NULL;
   482         -    coeffs->Ntps = NULL;
   483         -    coeffs->grass_cp.count = 0;
   484         -    coeffs->grass_cp.e1 = NULL;
   485         -    coeffs->grass_cp.n1 = NULL;
   486         -    coeffs->grass_cp.e2 = NULL;
   487         -    coeffs->grass_cp.n2 = NULL;
   488         -    coeffs->grass_cp.status = NULL;
   489         -    if (blob == NULL)
   490         -	return 0;
   491         -    if (blob_sz < 11)
   492         -	return 0;
   493         -
   494         -    if (*ptr != POLYNOMIAL_MAGIC_START)
   495         -	return 0;
   496         -    if (*(ptr + 1) == 1)
   497         -	endian = 1;
   498         -    else if (*(ptr + 1) == 0)
   499         -	endian = 0;
   500         -    else
   501         -	return 0;
   502         -    type = *(ptr + 2);
   503         -    order = *(ptr + 4);
   504         -    coeffs->type = type;
   505         -    coeffs->order = order;
   506         -    if (order < 1 || order > 3)
   507         -	return 0;
   508         -    if (type == THIN_PLATE_SPLINE)
   509         -	max = 0;
   510         -    else if (type == POLYNOMIAL_2D)
   511         -      {
   512         -	  if (order == 2)
   513         -	      max = 6;
   514         -	  else if (order == 3)
   515         -	      max = 10;
   516         -	  else
   517         -	      max = 3;
   518         -      }
   519         -    else if (type == POLYNOMIAL_3D)
   520         -      {
   521         -	  if (order == 2)
   522         -	      max = 10;
   523         -	  else if (order == 3)
   524         -	      max = 20;
   525         -	  else
   526         -	      max = 4;
   527         -      }
   528         -    else
   529         -	return 0;
   530         -    count = gaiaImport32 (ptr + 6, endian, endian_arch);
   531         -    if (type == POLYNOMIAL_3D)
   532         -	xblob_sz = 11 + (max * (3 * (sizeof (double) + 1)));
   533         -    else
   534         -	xblob_sz = 11 + (max * (2 * (sizeof (double) + 1)));
   535         -    if (type == THIN_PLATE_SPLINE)
   536         -      {
   537         -	  xblob_sz += ((count + 3) * (2 * (sizeof (double) + 1)));
   538         -	  xblob_sz += (count * (4 * (sizeof (double) + 1)));
   539         -      }
   540         -    if (blob_sz != xblob_sz)
   541         -	return 0;
   542         -
   543         -    ptr = blob + 11;
   544         -    for (i = 0; i < max; i++)
   545         -      {
   546         -	  coeffs->E[i] = gaiaImport64 (ptr, endian, endian_arch);
   547         -	  ptr += sizeof (double) + 1;
   548         -	  coeffs->N[i] = gaiaImport64 (ptr, endian, endian_arch);
   549         -	  ptr += sizeof (double) + 1;
   550         -	  if (type == POLYNOMIAL_3D)
   551         -	    {
   552         -		coeffs->Z[i] = gaiaImport64 (ptr, endian, endian_arch);
   553         -		ptr += sizeof (double) + 1;
   554         -	    }
   555         -      }
   556         -
   557         -    if (type == THIN_PLATE_SPLINE)
   558         -      {
   559         -	  /* extracting the Control Points for Grass TPS code */
   560         -	  coeffs->Etps = malloc (sizeof (double) * (3 + count));
   561         -	  coeffs->Ntps = malloc (sizeof (double) * (3 + count));
   562         -	  coeffs->grass_cp.count = count;
   563         -	  coeffs->grass_cp.e1 = malloc (sizeof (double) * count);
   564         -	  coeffs->grass_cp.n1 = malloc (sizeof (double) * count);
   565         -	  coeffs->grass_cp.e2 = malloc (sizeof (double) * count);
   566         -	  coeffs->grass_cp.n2 = malloc (sizeof (double) * count);
   567         -	  coeffs->grass_cp.status = malloc (sizeof (int) * count);
   568         -	  for (i = 0; i < count + 3; i++)
   569         -	    {
   570         -		coeffs->Etps[i] = gaiaImport64 (ptr, endian, endian_arch);
   571         -		ptr += sizeof (double) + 1;
   572         -		coeffs->Ntps[i] = gaiaImport64 (ptr, endian, endian_arch);
   573         -		ptr += sizeof (double) + 1;
   574         -	    }
   575         -	  for (i = 0; i < count; i++)
   576         -	    {
   577         -		coeffs->grass_cp.e1[i] =
   578         -		    gaiaImport64 (ptr, endian, endian_arch);
   579         -		ptr += sizeof (double) + 1;
   580         -		coeffs->grass_cp.n1[i] =
   581         -		    gaiaImport64 (ptr, endian, endian_arch);
   582         -		ptr += sizeof (double) + 1;
   583         -		coeffs->grass_cp.e2[i] =
   584         -		    gaiaImport64 (ptr, endian, endian_arch);
   585         -		ptr += sizeof (double) + 1;
   586         -		coeffs->grass_cp.n2[i] =
   587         -		    gaiaImport64 (ptr, endian, endian_arch);
   588         -		ptr += sizeof (double) + 1;
   589         -		coeffs->grass_cp.status[i] = 1;
   590         -	    }
   591         -      }
   592         -    return 1;
   593         -}
   594         -
   595         -
   596         -GAIACP_DECLARE int
   597         -gaiaCreatePolynomialCoeffs (GaiaControlPointsPtr cp_handle,
   598         -			    unsigned char **blob, int *blob_sz)
   599         -{
   600         -/*
   601         - * computes the Control Points and return a BLOB-serialized 
   602         - * Polynomial coeffs object
   603         -*/
   604         -    unsigned char *xblob;
   605         -    int xblob_sz;
          270  +/* creating an Affine Transform from the Control Points */
   606    271       struct Control_Points cp;
   607    272       struct Control_Points_3D cp3;
   608    273       int ret = 0;
   609         -    int ret2;
   610    274       int use3d;
   611    275       int orthorot = 0;
   612    276       int order = 1;
   613    277       int order_pnts[2][3] = { {3, 6, 10}, {4, 10, 20} };
   614    278   
   615    279       double E12[20];
   616    280       double N12[20];
................................................................................
   618    282       double E21[20];
   619    283       double N21[20];
   620    284       double Z21[20];
   621    285       double *E12_t = NULL;
   622    286       double *N12_t = NULL;
   623    287       double *E21_t = NULL;
   624    288       double *N21_t = NULL;
          289  +
   625    290       struct gaia_control_points *gaia_cp =
   626    291   	(struct gaia_control_points *) cp_handle;
          292  +    if (gaia_cp == NULL)
          293  +	return 0;
   627    294   
   628         -    *blob = NULL;
   629         -    *blob_sz = 0;
   630    295       if (gaia_cp == NULL)
   631    296   	return 0;
   632    297   
   633    298       cp.count = 0;
   634    299       cp.e1 = NULL;
   635    300       cp.e2 = NULL;
   636    301       cp.n1 = NULL;
................................................................................
   643    308       cp3.n1 = NULL;
   644    309       cp3.n2 = NULL;
   645    310       cp3.z1 = NULL;
   646    311       cp3.z2 = NULL;
   647    312       cp3.status = NULL;
   648    313   
   649    314       use3d = gaia_cp->has3d;
   650         -    order = gaia_cp->order;
   651    315       if (use3d)
   652    316         {
   653    317   	  /* 3D control points */
   654    318   	  copy_control_points_3d (gaia_cp, &cp3);
   655    319   	  ret =
   656         -	      gcp_CRS_compute_georef_equations_3d (&cp3, E12, N12, Z12, E21,
   657         -						   N21, Z21, order);
          320  +	      CRS_compute_georef_equations_3d (&cp3, E12, N12, Z12, E21, N21,
          321  +					       Z21, order);
   658    322         }
   659    323       else
   660    324         {
   661    325   	  /* 2D control points */
   662    326   	  copy_control_points_2d (gaia_cp, &cp);
   663    327   	  if (gaia_cp->tps)
   664    328   	      ret =
   665         -		  gcp_I_compute_georef_equations_tps (&cp, &E12_t, &N12_t,
   666         -						      &E21_t, &N21_t);
          329  +		  I_compute_georef_equations_tps (&cp, &E12_t, &N12_t, &E21_t,
          330  +						  &N21_t);
   667    331   	  else
   668         -	      ret =
   669         -		  gcp_I_compute_georef_equations (&cp, E12, N12, E21, N21,
   670         -						  order);
          332  +	      ret = I_compute_georef_equations (&cp, E12, N12, E21, N21, order);
   671    333         }
          334  +fprintf(stderr, "ret=%d tps=%d\n", ret, gaia_cp->tps);
   672    335   
   673    336       switch (ret)
   674    337         {
   675    338         case 0:
   676    339   	  fprintf (stderr,
   677    340   		   "Not enough active control points for current order, %d are required.\n",
   678    341   		   (orthorot ? 3 : order_pnts[use3d != 0][order - 1]));
................................................................................
   688    351         case -3:
   689    352   	  fprintf (stderr, "Invalid order\n");
   690    353   	  break;
   691    354         default:
   692    355   	  break;
   693    356         }
   694    357   
   695         -    if (ret > 0)
   696         -      {
   697         -	  if (use3d)
   698         -	      ret2 = blob_encode_3d (E12, N12, Z12, order, &xblob, &xblob_sz);
   699         -	  else
   700         -	    {
   701         -		if (gaia_cp->tps)
   702         -		    ret2 =
   703         -			blob_encode_tps (E12_t, N12_t, &cp, &xblob, &xblob_sz);
   704         -		else
   705         -		    ret2 = blob_encode_2d (E12, N12, order, &xblob, &xblob_sz);
   706         -	    }
   707         -      }
   708         -
   709    358       if (use3d)
   710    359   	free_control_points_3d (&cp3);
   711    360       else
   712    361   	free_control_points_2d (&cp);
          362  +
          363  +    if (ret > 0)
          364  +      {
          365  +	  if (use3d)
          366  +	    {
          367  +		gaia_cp->a = E12[1];
          368  +		gaia_cp->b = E12[2];
          369  +		gaia_cp->c = E12[3];
          370  +		gaia_cp->d = N12[1];
          371  +		gaia_cp->e = N12[2];
          372  +		gaia_cp->f = N12[3];
          373  +		gaia_cp->g = Z12[1];
          374  +		gaia_cp->h = Z12[2];
          375  +		gaia_cp->i = Z12[3];
          376  +		gaia_cp->xoff = E12[0];
          377  +		gaia_cp->yoff = N12[0];
          378  +		gaia_cp->zoff = Z12[0];
          379  +	    }
          380  +	  else
          381  +	    {
          382  +		if (gaia_cp->tps)
          383  +		  {
          384  +		      gaia_cp->a = E12_t[1];
          385  +		      gaia_cp->b = E12_t[2];
          386  +		      gaia_cp->d = N12_t[1];
          387  +		      gaia_cp->e = N12_t[2];
          388  +		      gaia_cp->xoff = E12_t[0];
          389  +		      gaia_cp->yoff = N12_t[0];
          390  +		      gaia_cp->affine_valid = 1;
          391  +fprintf(stderr, "pl\n");
          392  +		  }
          393  +		else
          394  +		  {
          395  +		      gaia_cp->a = E12[1];
          396  +		      gaia_cp->b = E12[2];
          397  +		      gaia_cp->d = N12[1];
          398  +		      gaia_cp->e = N12[2];
          399  +		      gaia_cp->xoff = E12[0];
          400  +		      gaia_cp->yoff = N12[0];
          401  +		      gaia_cp->affine_valid = 1;
          402  +		  }
          403  +	    }
          404  +      }
          405  +
   713    406       if (E12_t != NULL)
   714    407   	free (E12_t);
   715    408       if (N12_t != NULL)
   716    409   	free (N12_t);
   717    410       if (E21_t != NULL)
   718    411   	free (E21_t);
   719    412       if (N21_t != NULL)
   720    413   	free (N21_t);
   721    414   
   722         -    if (ret > 0 && ret2)
   723         -      {
   724         -	  *blob = xblob;
   725         -	  *blob_sz = xblob_sz;
   726         -	  return 1;
   727         -      }
   728         -    return 0;
   729         -}
   730         -
   731         -GAIACP_DECLARE int
   732         -gaiaPolynomialIsValid (const unsigned char *blob, int blob_sz)
   733         -{
   734         -/* checking a BLOB-Polynomial coeffs object for validity */
   735         -    unsigned char type;
   736         -    unsigned char order;
   737         -    int i;
   738         -    int max;
   739         -    int xblob_sz;
   740         -    int endian;
   741         -    int endian_arch = gaiaEndianArch ();
   742         -    int count;
   743         -    const unsigned char *ptr = blob;
   744         -    if (blob == NULL)
   745         -	return 0;
   746         -    if (blob_sz < 11)
   747         -	return 0;
   748         -
   749         -    if (*ptr != POLYNOMIAL_MAGIC_START)
   750         -	return 0;
   751         -    if (*(ptr + 1) == 1)
   752         -	endian = 1;
   753         -    else if (*(ptr + 1) == 0)
   754         -	endian = 0;
   755         -    else
   756         -	return 0;
   757         -    type = *(ptr + 2);
   758         -    order = *(ptr + 4);
   759         -    if (order > 3)
   760         -	return 0;
   761         -    if (type == THIN_PLATE_SPLINE)
   762         -	max = 0;
   763         -    else if (type == POLYNOMIAL_2D)
   764         -      {
   765         -	  if (order == 2)
   766         -	      max = 6;
   767         -	  else if (order == 3)
   768         -	      max = 10;
   769         -	  else
   770         -	      max = 3;
   771         -      }
   772         -    else if (type == POLYNOMIAL_3D)
   773         -      {
   774         -	  if (order == 2)
   775         -	      max = 10;
   776         -	  else if (order == 3)
   777         -	      max = 20;
   778         -	  else
   779         -	      max = 4;
   780         -      }
   781         -    else
   782         -	return 0;
   783         -    count = gaiaImport32 (ptr + 6, endian, endian_arch);
   784         -    if (type == POLYNOMIAL_3D)
   785         -	xblob_sz = 11 + (max * (3 * (sizeof (double) + 1)));
   786         -    else
   787         -	xblob_sz = 11 + (max * (2 * (sizeof (double) + 1)));
   788         -    if (type == THIN_PLATE_SPLINE)
   789         -      {
   790         -	  xblob_sz += ((count + 3) * (2 * (sizeof (double) + 1)));
   791         -	  xblob_sz += (count * (4 * (sizeof (double) + 1)));
   792         -      }
   793         -    if (blob_sz != xblob_sz)
   794         -	return 0;
   795         -
   796         -    ptr = blob + 10;
   797         -    for (i = 0; i < max; i++)
   798         -      {
   799         -	  if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   800         -	      return 0;
   801         -	  ptr++;
   802         -	  ptr += sizeof (double);
   803         -	  if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   804         -	      return 0;
   805         -	  ptr++;
   806         -	  ptr += sizeof (double);
   807         -	  if (type == POLYNOMIAL_3D)
   808         -	    {
   809         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   810         -		    return 0;
   811         -		ptr++;
   812         -		ptr += sizeof (double);
   813         -	    }
   814         -      }
   815         -    if (type == THIN_PLATE_SPLINE)
   816         -      {
   817         -	  for (i = 0; i < count + 3; i++)
   818         -	    {
   819         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   820         -		    return 0;
   821         -		ptr++;
   822         -		ptr += sizeof (double);
   823         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   824         -		    return 0;
   825         -		ptr++;
   826         -		ptr += sizeof (double);
   827         -	    }
   828         -	  for (i = 0; i < count; i++)
   829         -	    {
   830         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   831         -		    return 0;
   832         -		ptr++;
   833         -		ptr += sizeof (double);
   834         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   835         -		    return 0;
   836         -		ptr++;
   837         -		ptr += sizeof (double);
   838         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   839         -		    return 0;
   840         -		ptr++;
   841         -		ptr += sizeof (double);
   842         -		if (*ptr != POLYNOMIAL_MAGIC_DELIMITER)
   843         -		    return 0;
   844         -		ptr++;
   845         -		ptr += sizeof (double);
   846         -	    }
   847         -      }
   848         -    if (*ptr != POLYNOMIAL_MAGIC_END)
   849         -	return 0;
   850         -    return 1;
   851         -}
   852         -
   853         -static void
   854         -clean_tps_coeffs (struct cp_coeffs *cp)
   855         -{
   856         -/* memory cleanup - TPS coefficients */
   857         -    if (cp->Etps != NULL)
   858         -	free (cp->Etps);
   859         -    if (cp->Ntps != NULL)
   860         -	free (cp->Ntps);
   861         -}
   862         -
   863         -GAIACP_DECLARE char *
   864         -gaiaPolynomialAsText (const unsigned char *blob, int blob_sz)
   865         -{
   866         -/* printing a BLOB-Polynomial coeffs object as a text string */
   867         -    char *text = NULL;
   868         -    struct cp_coeffs coeffs;
   869         -    if (!gaiaPolynomialIsValid (blob, blob_sz))
   870         -	return NULL;
   871         -    if (!blob_decode (&coeffs, blob, blob_sz))
   872         -	return NULL;
   873         -
   874         -    free_control_points_2d (&(coeffs.grass_cp));
   875         -/* printing the Polynommial coeffs as text */
   876         -    if (coeffs.type == POLYNOMIAL_3D)
   877         -      {
   878         -	  if (coeffs.order == 3)
   879         -	      text =
   880         -		  sqlite3_mprintf
   881         -		  ("E{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   882         -		   "N{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   883         -		   "Z{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}",
   884         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.E[3],
   885         -		   coeffs.E[4], coeffs.E[5], coeffs.E[6], coeffs.E[6],
   886         -		   coeffs.E[7], coeffs.E[8], coeffs.E[9], coeffs.E[10],
   887         -		   coeffs.E[11], coeffs.E[12], coeffs.E[13], coeffs.E[14],
   888         -		   coeffs.E[15], coeffs.E[16], coeffs.E[16], coeffs.E[17],
   889         -		   coeffs.E[18], coeffs.E[19], coeffs.N[0], coeffs.N[1],
   890         -		   coeffs.N[2], coeffs.N[3], coeffs.N[4], coeffs.N[5],
   891         -		   coeffs.N[6], coeffs.N[6], coeffs.N[7], coeffs.N[8],
   892         -		   coeffs.N[9], coeffs.N[10], coeffs.N[11], coeffs.N[12],
   893         -		   coeffs.N[13], coeffs.N[14], coeffs.N[15], coeffs.N[16],
   894         -		   coeffs.N[16], coeffs.N[17], coeffs.N[18], coeffs.N[19],
   895         -		   coeffs.Z[0], coeffs.Z[1], coeffs.Z[2], coeffs.Z[3],
   896         -		   coeffs.Z[4], coeffs.Z[5], coeffs.Z[6], coeffs.Z[6],
   897         -		   coeffs.Z[7], coeffs.Z[8], coeffs.Z[9], coeffs.Z[10],
   898         -		   coeffs.Z[11], coeffs.Z[12], coeffs.Z[13], coeffs.Z[14],
   899         -		   coeffs.Z[15], coeffs.Z[16], coeffs.Z[16], coeffs.Z[17],
   900         -		   coeffs.Z[18], coeffs.Z[19]);
   901         -	  else if (coeffs.order == 2)
   902         -	      text =
   903         -		  sqlite3_mprintf
   904         -		  ("E{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   905         -		   "N{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   906         -		   "Z{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}",
   907         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.E[3],
   908         -		   coeffs.E[4], coeffs.E[5], coeffs.E[6], coeffs.E[6],
   909         -		   coeffs.E[7], coeffs.E[8], coeffs.E[9], coeffs.N[0],
   910         -		   coeffs.N[1], coeffs.N[2], coeffs.N[3], coeffs.N[4],
   911         -		   coeffs.N[5], coeffs.N[6], coeffs.N[6], coeffs.N[7],
   912         -		   coeffs.N[8], coeffs.N[9], coeffs.Z[0], coeffs.Z[1],
   913         -		   coeffs.Z[2], coeffs.Z[3], coeffs.Z[4], coeffs.Z[5],
   914         -		   coeffs.Z[6], coeffs.Z[6], coeffs.Z[7], coeffs.Z[8],
   915         -		   coeffs.Z[9]);
   916         -	  else
   917         -	      text =
   918         -		  sqlite3_mprintf
   919         -		  ("E{%1.10f,%1.10f,%1.10f,%1.10f}, N{%1.10f,%1.10f,%1.10f,%1.10f}, Z{%1.10f,%1.10f,%1.10f,%1.10f}",
   920         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.E[3],
   921         -		   coeffs.N[0], coeffs.N[1], coeffs.N[2], coeffs.N[3],
   922         -		   coeffs.Z[0], coeffs.Z[1], coeffs.Z[2], coeffs.Z[3]);
   923         -      }
   924         -    else
   925         -      {
   926         -	  if (coeffs.order == 3)
   927         -	      text =
   928         -		  sqlite3_mprintf
   929         -		  ("E{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   930         -		   "N{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}",
   931         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.E[3],
   932         -		   coeffs.E[4], coeffs.E[5], coeffs.E[6], coeffs.E[6],
   933         -		   coeffs.E[7], coeffs.E[8], coeffs.E[9], coeffs.N[0],
   934         -		   coeffs.N[1], coeffs.N[2], coeffs.N[3], coeffs.N[4],
   935         -		   coeffs.N[5], coeffs.N[6], coeffs.N[6], coeffs.N[7],
   936         -		   coeffs.N[8], coeffs.N[9]);
   937         -	  else if (coeffs.order == 2)
   938         -	      text =
   939         -		  sqlite3_mprintf
   940         -		  ("E{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}, "
   941         -		   "N{%1.10f,%1.10f,%1.10f,%1.10f,%1.10f,%1.10f}",
   942         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.E[3],
   943         -		   coeffs.E[4], coeffs.E[5], coeffs.N[0], coeffs.N[1],
   944         -		   coeffs.N[2], coeffs.N[3], coeffs.N[4], coeffs.N[5]);
   945         -	  else
   946         -	      text =
   947         -		  sqlite3_mprintf
   948         -		  ("E{%1.10f,%1.10f,%1.10f}, N{%1.10f,%1.10f,%1.10f}",
   949         -		   coeffs.E[0], coeffs.E[1], coeffs.E[2], coeffs.N[0],
   950         -		   coeffs.N[1], coeffs.N[2]);
   951         -      }
   952         -    clean_tps_coeffs (&coeffs);
   953         -    return text;
   954         -}
   955         -
   956         -static void
   957         -gaia_point_transform3D (struct cp_coeffs *coeffs, double *x, double *y,
   958         -			double *z)
   959         -{
   960         -/* Affine Transform 3D */
   961         -    double x0 = *x;
   962         -    double y0 = *y;
   963         -    double z0 = *z;
   964         -    double x1;
   965         -    double y1;
   966         -    double z1;
   967         -    if (coeffs->type == THIN_PLATE_SPLINE)
   968         -      {
   969         -	  gcp_I_georef_tps (x0, y0, &x1, &y1, coeffs->Etps, coeffs->Ntps,
   970         -			    &(coeffs->grass_cp), 1);
   971         -	  z1 = z0;
   972         -      }
   973         -    else if (coeffs->type == POLYNOMIAL_2D)
   974         -      {
   975         -	  gcp_I_georef (x0, y0, &x1, &y1, coeffs->E, coeffs->N, coeffs->order);
   976         -	  z1 = z0;
   977         -      }
   978         -    else
   979         -	gcp_CRS_georef_3d (x0, y0, z0, &x1, &y1, &z1, coeffs->E, coeffs->N,
   980         -			   coeffs->Z, coeffs->order);
   981         -    *x = x1;
   982         -    *y = y1;
   983         -    *z = z1;
   984         -}
   985         -
   986         -
   987         -static void
   988         -gaia_point_transform2D (struct cp_coeffs *coeffs, double *x, double *y)
   989         -{
   990         -/* Affine Transform 2D */
   991         -    double x0 = *x;
   992         -    double y0 = *y;
   993         -    double x1;
   994         -    double y1;
   995         -    if (coeffs->type == THIN_PLATE_SPLINE)
   996         -	gcp_I_georef_tps (x0, y0, &x1, &y1, coeffs->Etps, coeffs->Ntps,
   997         -			  &(coeffs->grass_cp), 1);
   998         -    else
   999         -	gcp_I_georef (x0, y0, &x1, &y1, coeffs->E, coeffs->N, coeffs->order);
  1000         -    *x = x1;
  1001         -    *y = y1;
  1002         -}
  1003         -
  1004         -GAIACP_DECLARE gaiaGeomCollPtr
  1005         -gaiaPolynomialTransformGeometry (gaiaGeomCollPtr geom,
  1006         -				 const unsigned char *blob, int blob_sz)
  1007         -{
  1008         -/* transforming a Geometry by applying Polynomial coefficients */
  1009         -    int iv;
  1010         -    int ib;
  1011         -    double x;
  1012         -    double y;
  1013         -    double z;
  1014         -    double m;
  1015         -    gaiaPointPtr point;
  1016         -    gaiaLinestringPtr line;
  1017         -    gaiaLinestringPtr new_line;
  1018         -    gaiaPolygonPtr polyg;
  1019         -    gaiaPolygonPtr new_polyg;
  1020         -    gaiaGeomCollPtr new_geom;
  1021         -    gaiaRingPtr i_ring;
  1022         -    gaiaRingPtr o_ring;
  1023         -    struct cp_coeffs coeffs;
  1024         -    if (!gaiaPolynomialIsValid (blob, blob_sz))
  1025         -	return NULL;
  1026         -    if (!blob_decode (&coeffs, blob, blob_sz))
  1027         -	return NULL;
  1028         -    if (geom == NULL)
  1029         -      {
  1030         -	  free_control_points_2d (&(coeffs.grass_cp));
  1031         -	  return NULL;
  1032         -      }
  1033         -
  1034         -/* creating the output Geometry */
  1035         -    if (geom->DimensionModel == GAIA_XY_Z)
  1036         -	new_geom = gaiaAllocGeomCollXYZ ();
  1037         -    else if (geom->DimensionModel == GAIA_XY_M)
  1038         -	new_geom = gaiaAllocGeomCollXYM ();
  1039         -    else if (geom->DimensionModel == GAIA_XY_Z_M)
  1040         -	new_geom = gaiaAllocGeomCollXYZM ();
  1041         -    else
  1042         -	new_geom = gaiaAllocGeomColl ();
  1043         -    new_geom->Srid = geom->Srid;
  1044         -    new_geom->DeclaredType = geom->DeclaredType;
  1045         -
  1046         -/* cloning and transforming all individual items */
  1047         -    point = geom->FirstPoint;
  1048         -    while (point)
  1049         -      {
  1050         -	  /* copying POINTs */
  1051         -	  if (geom->DimensionModel == GAIA_XY_Z)
  1052         -	    {
  1053         -		x = point->X;
  1054         -		y = point->Y;
  1055         -		z = point->Z;
  1056         -		gaia_point_transform3D (&coeffs, &x, &y, &z);
  1057         -		gaiaAddPointToGeomCollXYZ (new_geom, x, y, z);
  1058         -	    }
  1059         -	  else if (geom->DimensionModel == GAIA_XY_M)
  1060         -	    {
  1061         -		x = point->X;
  1062         -		y = point->Y;
  1063         -		m = point->M;
  1064         -		gaia_point_transform2D (&coeffs, &x, &y);
  1065         -		gaiaAddPointToGeomCollXYM (new_geom, x, y, m);
  1066         -	    }
  1067         -	  else if (geom->DimensionModel == GAIA_XY_Z_M)
  1068         -	    {
  1069         -		x = point->X;
  1070         -		y = point->Y;
  1071         -		z = point->Z;
  1072         -		m = point->M;
  1073         -		gaia_point_transform3D (&coeffs, &x, &y, &z);
  1074         -		gaiaAddPointToGeomCollXYZM (new_geom, x, y, z, m);
  1075         -	    }
  1076         -	  else
  1077         -	    {
  1078         -		x = point->X;
  1079         -		y = point->Y;
  1080         -		gaia_point_transform2D (&coeffs, &x, &y);
  1081         -		gaiaAddPointToGeomColl (new_geom, x, y);
  1082         -	    }
  1083         -	  point = point->Next;
  1084         -      }
  1085         -
  1086         -    line = geom->FirstLinestring;
  1087         -    while (line)
  1088         -      {
  1089         -	  /* copying LINESTRINGs */
  1090         -	  new_line = gaiaAddLinestringToGeomColl (new_geom, line->Points);
  1091         -	  for (iv = 0; iv < line->Points; iv++)
  1092         -	    {
  1093         -		z = 0.0;
  1094         -		m = 0.0;
  1095         -		if (line->DimensionModel == GAIA_XY_Z)
  1096         -		  {
  1097         -		      gaiaGetPointXYZ (line->Coords, iv, &x, &y, &z);
  1098         -		  }
  1099         -		else if (line->DimensionModel == GAIA_XY_M)
  1100         -		  {
  1101         -		      gaiaGetPointXYM (line->Coords, iv, &x, &y, &m);
  1102         -		  }
  1103         -		else if (line->DimensionModel == GAIA_XY_Z_M)
  1104         -		  {
  1105         -		      gaiaGetPointXYZM (line->Coords, iv, &x, &y, &z, &m);
  1106         -		  }
  1107         -		else
  1108         -		  {
  1109         -		      gaiaGetPoint (line->Coords, iv, &x, &y);
  1110         -		  }
  1111         -		if (new_line->DimensionModel == GAIA_XY_Z
  1112         -		    || new_line->DimensionModel == GAIA_XY_Z_M)
  1113         -		    gaia_point_transform3D (&coeffs, &x, &y, &z);
  1114         -		else
  1115         -		    gaia_point_transform2D (&coeffs, &x, &y);
  1116         -		if (new_line->DimensionModel == GAIA_XY_Z)
  1117         -		  {
  1118         -		      gaiaSetPointXYZ (new_line->Coords, iv, x, y, z);
  1119         -		  }
  1120         -		else if (new_line->DimensionModel == GAIA_XY_M)
  1121         -		  {
  1122         -		      gaiaSetPointXYM (new_line->Coords, iv, x, y, m);
  1123         -		  }
  1124         -		else if (new_line->DimensionModel == GAIA_XY_Z_M)
  1125         -		  {
  1126         -		      gaiaSetPointXYZM (new_line->Coords, iv, x, y, z, m);
  1127         -		  }
  1128         -		else
  1129         -		  {
  1130         -		      gaiaSetPoint (new_line->Coords, iv, x, y);
  1131         -		  }
  1132         -	    }
  1133         -	  line = line->Next;
  1134         -      }
  1135         -
  1136         -    polyg = geom->FirstPolygon;
  1137         -    while (polyg)
  1138         -      {
  1139         -	  /* copying POLYGONs */
  1140         -	  i_ring = polyg->Exterior;
  1141         -	  new_polyg =
  1142         -	      gaiaAddPolygonToGeomColl (new_geom, i_ring->Points,
  1143         -					polyg->NumInteriors);
  1144         -	  o_ring = new_polyg->Exterior;
  1145         -	  /* copying points for the EXTERIOR RING */
  1146         -	  for (iv = 0; iv < o_ring->Points; iv++)
  1147         -	    {
  1148         -		z = 0.0;
  1149         -		m = 0.0;
  1150         -		if (i_ring->DimensionModel == GAIA_XY_Z)
  1151         -		  {
  1152         -		      gaiaGetPointXYZ (i_ring->Coords, iv, &x, &y, &z);
  1153         -		  }
  1154         -		else if (i_ring->DimensionModel == GAIA_XY_M)
  1155         -		  {
  1156         -		      gaiaGetPointXYM (i_ring->Coords, iv, &x, &y, &m);
  1157         -		  }
  1158         -		else if (i_ring->DimensionModel == GAIA_XY_Z_M)
  1159         -		  {
  1160         -		      gaiaGetPointXYZM (i_ring->Coords, iv, &x, &y, &z, &m);
  1161         -		  }
  1162         -		else
  1163         -		  {
  1164         -		      gaiaGetPoint (i_ring->Coords, iv, &x, &y);
  1165         -		  }
  1166         -		if (o_ring->DimensionModel == GAIA_XY_Z
  1167         -		    || o_ring->DimensionModel == GAIA_XY_Z_M)
  1168         -		    gaia_point_transform3D (&coeffs, &x, &y, &z);
  1169         -		else
  1170         -		    gaia_point_transform2D (&coeffs, &x, &y);
  1171         -		if (o_ring->DimensionModel == GAIA_XY_Z)
  1172         -		  {
  1173         -		      gaiaSetPointXYZ (o_ring->Coords, iv, x, y, z);
  1174         -		  }
  1175         -		else if (o_ring->DimensionModel == GAIA_XY_M)
  1176         -		  {
  1177         -		      gaiaSetPointXYM (o_ring->Coords, iv, x, y, m);
  1178         -		  }
  1179         -		else if (o_ring->DimensionModel == GAIA_XY_Z_M)
  1180         -		  {
  1181         -		      gaiaSetPointXYZM (o_ring->Coords, iv, x, y, z, m);
  1182         -		  }
  1183         -		else
  1184         -		  {
  1185         -		      gaiaSetPoint (o_ring->Coords, iv, x, y);
  1186         -		  }
  1187         -	    }
  1188         -	  for (ib = 0; ib < new_polyg->NumInteriors; ib++)
  1189         -	    {
  1190         -		/* copying each INTERIOR RING [if any] */
  1191         -		i_ring = polyg->Interiors + ib;
  1192         -		o_ring = gaiaAddInteriorRing (new_polyg, ib, i_ring->Points);
  1193         -		for (iv = 0; iv < o_ring->Points; iv++)
  1194         -		  {
  1195         -		      z = 0.0;
  1196         -		      m = 0.0;
  1197         -		      if (i_ring->DimensionModel == GAIA_XY_Z)
  1198         -			{
  1199         -			    gaiaGetPointXYZ (i_ring->Coords, iv, &x, &y, &z);
  1200         -			}
  1201         -		      else if (i_ring->DimensionModel == GAIA_XY_M)
  1202         -			{
  1203         -			    gaiaGetPointXYM (i_ring->Coords, iv, &x, &y, &m);
  1204         -			}
  1205         -		      else if (i_ring->DimensionModel == GAIA_XY_Z_M)
  1206         -			{
  1207         -			    gaiaGetPointXYZM (i_ring->Coords, iv, &x, &y, &z,
  1208         -					      &m);
  1209         -			}
  1210         -		      else
  1211         -			{
  1212         -			    gaiaGetPoint (i_ring->Coords, iv, &x, &y);
  1213         -			}
  1214         -		      if (o_ring->DimensionModel == GAIA_XY_Z
  1215         -			  || o_ring->DimensionModel == GAIA_XY_Z_M)
  1216         -			  gaia_point_transform3D (&coeffs, &x, &y, &z);
  1217         -		      else
  1218         -			  gaia_point_transform2D (&coeffs, &x, &y);
  1219         -		      if (o_ring->DimensionModel == GAIA_XY_Z)
  1220         -			{
  1221         -			    gaiaSetPointXYZ (o_ring->Coords, iv, x, y, z);
  1222         -			}
  1223         -		      else if (o_ring->DimensionModel == GAIA_XY_M)
  1224         -			{
  1225         -			    gaiaSetPointXYM (o_ring->Coords, iv, x, y, m);
  1226         -			}
  1227         -		      else if (o_ring->DimensionModel == GAIA_XY_Z_M)
  1228         -			{
  1229         -			    gaiaSetPointXYZM (o_ring->Coords, iv, x, y, z, m);
  1230         -			}
  1231         -		      else
  1232         -			{
  1233         -			    gaiaSetPoint (o_ring->Coords, iv, x, y);
  1234         -			}
  1235         -		  }
  1236         -	    }
  1237         -	  polyg = polyg->Next;
  1238         -      }
  1239         -    free_control_points_2d (&(coeffs.grass_cp));
  1240         -    clean_tps_coeffs (&coeffs);
  1241         -    return new_geom;
  1242         -}
  1243         -
  1244         -GAIACP_DECLARE int
  1245         -gaiaPolynomialToMatrix (const unsigned char *iblob, int iblob_sz,
  1246         -			unsigned char **oblob, int *oblob_sz)
  1247         -{
  1248         -/*
  1249         -* converting a BLOB-Polynomial coeffs object into a
  1250         -* BLOB Affine Transformation matrix */
  1251         -    double a = 1.0;
  1252         -    double b = 0.0;
  1253         -    double c = 0.0;
  1254         -    double d = 0.0;
  1255         -    double e = 1.0;
  1256         -    double f = 0.0;
  1257         -    double g = 0.0;
  1258         -    double h = 0.0;
  1259         -    double i = 1.0;
  1260         -    double xoff = 0.0;
  1261         -    double yoff = 0.0;
  1262         -    double zoff = 0.0;
  1263         -    struct cp_coeffs coeffs;
  1264         -
  1265         -    *oblob = NULL;
  1266         -    *oblob_sz = 0;
  1267         -    if (!gaiaPolynomialIsValid (iblob, iblob_sz))
  1268         -	return 0;
  1269         -    if (!blob_decode (&coeffs, iblob, iblob_sz))
  1270         -	return 0;
  1271         -
  1272         -    if (coeffs.type == THIN_PLATE_SPLINE)
  1273         -      {
  1274         -	  free_control_points_2d (&(coeffs.grass_cp));
  1275         -	  clean_tps_coeffs (&coeffs);
  1276         -	  return 0;		/* Thin Plate Spline coefficients can't be converted */
  1277         -      }
  1278         -    if (coeffs.order != 1)
  1279         -	return 0;		/* only 1st order coefficients can be converted */
  1280         -
  1281         -/* converting */
  1282         -    if (coeffs.type == POLYNOMIAL_3D)
  1283         -      {
  1284         -	  a = coeffs.E[1];
  1285         -	  b = coeffs.E[2];
  1286         -	  c = coeffs.E[3];
  1287         -	  d = coeffs.N[1];
  1288         -	  e = coeffs.N[2];
  1289         -	  f = coeffs.N[3];
  1290         -	  g = coeffs.Z[1];
  1291         -	  h = coeffs.Z[2];
  1292         -	  i = coeffs.Z[3];
  1293         -	  xoff = coeffs.E[0];
  1294         -	  yoff = coeffs.N[0];
  1295         -	  zoff = coeffs.Z[0];
  1296         -      }
  1297         -    else
  1298         -      {
  1299         -	  a = coeffs.E[1];
  1300         -	  b = coeffs.E[2];
  1301         -	  d = coeffs.N[1];
  1302         -	  e = coeffs.N[2];
  1303         -	  xoff = coeffs.E[0];
  1304         -	  yoff = coeffs.N[0];
  1305         -      }
  1306         -    if (gaia_matrix_create
  1307         -	(a, b, c, d, e, f, g, h, i, xoff, yoff, zoff, oblob, oblob_sz))
          415  +    if (ret > 0)
  1308    416   	return 1;
  1309    417       return 0;
  1310    418   }
  1311    419   
  1312         -#endif /* end including GCO */
          420  +#endif	/* end including CONTROL_POINTS */

Changes to src/control_points/grass_crs.h.

    27     27   
    28     28    You should have received a copy of the GNU General Public License
    29     29    along with this program; if not, write to the Free Software
    30     30    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    31     31    
    32     32   */
    33     33   
    34         -#ifndef DOXYGEN_SHOULD_SKIP_THIS
    35         -#define GCP_PRIVATE __attribute__ ((visibility("hidden")))
    36         -#endif
    37         -
    38     34   /* STRUCTURE FOR USE INTERNALLY WITH THESE FUNCTIONS.  THESE FUNCTIONS EXPECT
    39     35      SQUARE MATRICES SO ONLY ONE VARIABLE IS GIVEN (N) FOR THE MATRIX SIZE */
    40     36   
    41     37   struct MATRIX
    42     38   {
    43     39       int n;			/* SIZE OF THIS MATRIX (N x N) */
    44     40       double *v;
................................................................................
    77     73       double *z1;
    78     74       double *e2;
    79     75       double *n2;
    80     76       double *z2;
    81     77       int *status;
    82     78   };
    83     79   
    84         -GCP_PRIVATE int
    85         -gcp_CRS_compute_georef_equations_3d (struct Control_Points_3D *,
           80  +int CRS_compute_georef_equations_3d (struct Control_Points_3D *,
    86     81   				     double *, double *, double *,
    87     82   				     double *, double *, double *, int);
    88     83   
    89         -GCP_PRIVATE int
    90         -gcp_I_compute_georef_equations (struct Control_Points *cp, double E12[],
           84  +int I_compute_georef_equations (struct Control_Points *cp, double E12[],
    91     85   				double N12[], double E21[], double N21[],
    92     86   				int order);
    93     87   
    94         -GCP_PRIVATE int
    95         -gcp_I_compute_georef_equations_tps (struct Control_Points *cp,
           88  +int I_compute_georef_equations_tps (struct Control_Points *cp,
    96     89   				    double **E12tps, double **N12tps,
    97     90   				    double **E21tps, double **N21tps);
    98         -
    99         -GCP_PRIVATE int
   100         -gcp_I_georef (double e1, double n1, double *e, double *n, double E[],
   101         -	      double N[], int order);
   102         -
   103         -GCP_PRIVATE int
   104         -gcp_CRS_georef_3d (double e1, double n1, double z1, double *e,
   105         -		   double *n, double *z, double E[], double N[],
   106         -		   double Z[], int order);
   107         -
   108         -GCP_PRIVATE int
   109         -gcp_I_georef_tps (double e1, double n1, double *e, double *n, double *E,
   110         -		  double *N, struct Control_Points *cp, int fwd);

Changes to src/control_points/grass_crs3d.c.

    38     38   
    39     39   #if defined(_WIN32) && !defined(__MINGW32__)
    40     40   #include "config-msvc.h"
    41     41   #else
    42     42   #include "config.h"
    43     43   #endif
    44     44   
    45         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
           45  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
    46     46   
    47     47   /* original code from Grass GIS starts here */
    48     48   
    49     49   /***********************************************************************
    50     50   
    51     51      crs3d.c
    52     52   
................................................................................
    77     77   
    78     78   /***********************************************************************
    79     79   
    80     80     TRANSFORM A SINGLE COORDINATE PAIR.
    81     81   
    82     82   ************************************************************************/
    83     83   
    84         -GCP_PRIVATE int
    85         -gcp_CRS_georef_3d (double e1,	/* EASTING TO BE TRANSFORMED */
    86         -		   double n1,	/* NORTHING TO BE TRANSFORMED */
    87         -		   double z1,	/* HEIGHT TO BE TRANSFORMED */
    88         -		   double *e,	/* EASTING, TRANSFORMED */
    89         -		   double *n,	/* NORTHING, TRANSFORMED */
    90         -		   double *z,	/* HEIGHT, TRANSFORMED */
    91         -		   double E[],	/* EASTING COEFFICIENTS */
    92         -		   double N[],	/* NORTHING COEFFICIENTS */
    93         -		   double Z[],	/* HEIGHT COEFFICIENTS */
    94         -		   int order	/* ORDER OF TRANSFORMATION TO BE PERFORMED, MUST MATCH THE
           84  +int
           85  +CRS_georef_3d (double e1,	/* EASTING TO BE TRANSFORMED */
           86  +	       double n1,	/* NORTHING TO BE TRANSFORMED */
           87  +	       double z1,	/* HEIGHT TO BE TRANSFORMED */
           88  +	       double *e,	/* EASTING, TRANSFORMED */
           89  +	       double *n,	/* NORTHING, TRANSFORMED */
           90  +	       double *z,	/* HEIGHT, TRANSFORMED */
           91  +	       double E[],	/* EASTING COEFFICIENTS */
           92  +	       double N[],	/* NORTHING COEFFICIENTS */
           93  +	       double Z[],	/* HEIGHT COEFFICIENTS */
           94  +	       int order	/* ORDER OF TRANSFORMATION TO BE PERFORMED, MUST MATCH THE
    95     95   				   ORDER USED TO CALCULATE THE COEFFICIENTS */
    96     96       )
    97     97   {
    98     98       double e2, n2, z2, en, ez, nz,
    99     99   	e3, n3, z3, e2n, e2z, en2, ez2, n2z, nz2, enz;
   100    100   
   101    101       switch (order)
................................................................................
   169    169   /***********************************************************************
   170    170   
   171    171     COMPUTE THE FORWARD AND BACKWARD GEOREFFERENCING COEFFICIENTS
   172    172     BASED ON A SET OF CONTROL POINTS
   173    173   
   174    174   ************************************************************************/
   175    175   
   176         -GCP_PRIVATE int
   177         -gcp_CRS_compute_georef_equations_3d (struct Control_Points_3D *cp,
   178         -				     double E12[], double N12[], double Z12[],
   179         -				     double E21[], double N21[], double Z21[],
   180         -				     int order)
          176  +int
          177  +CRS_compute_georef_equations_3d (struct Control_Points_3D *cp,
          178  +				 double E12[], double N12[], double Z12[],
          179  +				 double E21[], double N21[], double Z21[],
          180  +				 int order)
   181    181   {
   182    182       double *tempptr;
   183    183       int status;
   184    184   
   185    185       if (order < 1 || order > MAXORDER)
   186    186   	return MPARMERR;
   187    187   
   188    188       /* CALCULATE THE FORWARD TRANSFORMATION COEFFICIENTS */
          189  +
   189    190       status = calccoef (cp, E12, N12, Z12, order);
   190    191   
   191    192       if (status != MSUCCESS)
   192    193   	return status;
   193    194   
   194    195       /* SWITCH THE 1 AND 2 EASTING, NORTHING, AND HEIGHT ARRAYS */
   195    196   
................................................................................
   572    573   	  N[i - 1] = b[i - 1] / M (i, i);
   573    574   	  Z[i - 1] = c[i - 1] / M (i, i);
   574    575         }
   575    576   
   576    577       return MSUCCESS;
   577    578   }
   578    579   
   579         -#endif /* end including GCP */
          580  +#endif	/* end including CONTROL_POINTS */

Changes to src/control_points/grass_georef.c.

    26     26   
    27     27    You should have received a copy of the GNU General Public License
    28     28    along with this program; if not, write to the Free Software
    29     29    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    30     30    
    31     31   */
    32     32   
    33         -#include <stdio.h>
    34     33   #include <stdlib.h>
    35     34   #include <math.h>
    36     35   
    37     36   #if defined(_WIN32) && !defined(__MINGW32__)
    38     37   #include "config-msvc.h"
    39     38   #else
    40     39   #include "config.h"
    41     40   #endif
    42     41   
    43         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
           42  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
    44     43   
    45     44   /* original code from Grass GIS starts here */
    46     45   
    47     46   /****************************************************************************
    48     47    *
    49     48    * MODULE:       imagery library
    50     49    * AUTHOR(S):    Original author(s) name(s) unknown - written by CERL
................................................................................
    91     90   
    92     91   /***********************************************************************
    93     92   
    94     93     TRANSFORM A SINGLE COORDINATE PAIR.
    95     94   
    96     95   ************************************************************************/
    97     96   
    98         -GCP_PRIVATE int
    99         -gcp_I_georef (double e1,	/* EASTING TO BE TRANSFORMED */
   100         -	      double n1,	/* NORTHING TO BE TRANSFORMED */
   101         -	      double *e,	/* EASTING, TRANSFORMED */
   102         -	      double *n,	/* NORTHING, TRANSFORMED */
   103         -	      double E[],	/* EASTING COEFFICIENTS */
   104         -	      double N[],	/* NORTHING COEFFICIENTS */
   105         -	      int order		/* ORDER OF TRANSFORMATION TO BE PERFORMED, MUST MATCH THE
           97  +int
           98  +I_georef (double e1,		/* EASTING TO BE TRANSFORMED */
           99  +	  double n1,		/* NORTHING TO BE TRANSFORMED */
          100  +	  double *e,		/* EASTING, TRANSFORMED */
          101  +	  double *n,		/* NORTHING, TRANSFORMED */
          102  +	  double E[],		/* EASTING COEFFICIENTS */
          103  +	  double N[],		/* NORTHING COEFFICIENTS */
          104  +	  int order		/* ORDER OF TRANSFORMATION TO BE PERFORMED, MUST MATCH THE
   106    105   				   ORDER USED TO CALCULATE THE COEFFICIENTS */
   107    106       )
   108    107   {
   109    108       double e3, e2n, en2, n3, e2, en, n2;
   110    109   
   111    110       switch (order)
   112    111         {
................................................................................
   153    152   /***********************************************************************
   154    153   
   155    154     COMPUTE THE FORWARD AND BACKWARD GEOREFFERENCING COEFFICIENTS
   156    155     BASED ON A SET OF CONTROL POINTS
   157    156   
   158    157   ************************************************************************/
   159    158   
   160         -GCP_PRIVATE int
   161         -gcp_I_compute_georef_equations (struct Control_Points *cp, double E12[],
   162         -				double N12[], double E21[], double N21[],
   163         -				int order)
          159  +int
          160  +I_compute_georef_equations (struct Control_Points *cp, double E12[],
          161  +			    double N12[], double E21[], double N21[], int order)
   164    162   {
   165    163       double *tempptr;
   166    164       int status;
   167    165   
   168    166       if (order < 1 || order > MAXORDER)
   169    167   	return MPARMERR;
   170    168   
................................................................................
   483    481   	  E[i - 1] = a[i - 1] / M (i, i);
   484    482   	  N[i - 1] = b[i - 1] / M (i, i);
   485    483         }
   486    484   
   487    485       return MSUCCESS;
   488    486   }
   489    487   
   490         -#endif /* end including GCP */
          488  +#endif	/* end including CONTROL_POINTS */

Changes to src/control_points/grass_georef_tps.c.

    36     36   
    37     37   #if defined(_WIN32) && !defined(__MINGW32__)
    38     38   #include "config-msvc.h"
    39     39   #else
    40     40   #include "config.h"
    41     41   #endif
    42     42   
    43         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
           43  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
    44     44   
    45     45   /* original code from Grass GIS starts here */
    46     46   
    47     47   /****************************************************************************
    48     48    *
    49     49    * MODULE:       imagery library
    50     50    * AUTHOR(S):    Markus Metz
................................................................................
    83     83   
    84     84   /***********************************************************************
    85     85   
    86     86     TRANSFORM A SINGLE COORDINATE PAIR.
    87     87   
    88     88   ************************************************************************/
    89     89   
    90         -GCP_PRIVATE int
    91         -gcp_I_georef_tps (double e1,	/* EASTING TO BE TRANSFORMED */
    92         -		  double n1,	/* NORTHING TO BE TRANSFORMED */
    93         -		  double *e,	/* EASTING, TRANSFORMED */
    94         -		  double *n,	/* NORTHING, TRANSFORMED */
    95         -		  double *E,	/* EASTING COEFFICIENTS */
    96         -		  double *N,	/* NORTHING COEFFICIENTS */
    97         -		  struct Control_Points *cp, int fwd)
           90  +int
           91  +I_georef_tps (double e1,	/* EASTING TO BE TRANSFORMED */
           92  +	      double n1,	/* NORTHING TO BE TRANSFORMED */
           93  +	      double *e,	/* EASTING, TRANSFORMED */
           94  +	      double *n,	/* NORTHING, TRANSFORMED */
           95  +	      double *E,	/* EASTING COEFFICIENTS */
           96  +	      double *N,	/* NORTHING COEFFICIENTS */
           97  +	      struct Control_Points *cp, int fwd)
    98     98   {
    99     99       int i, j;
   100    100       double dist, *pe, *pn;
   101    101   
   102    102       if (fwd)
   103    103         {
   104    104   	  pe = cp->e1;
................................................................................
   109    109   	  pe = cp->e2;
   110    110   	  pn = cp->n2;
   111    111         }
   112    112   
   113    113       /* global affine (1st order poly) */
   114    114       *e = E[0] + e1 * E[1] + n1 * E[2];
   115    115       *n = N[0] + e1 * N[1] + n1 * N[2];
          116  +
   116    117   
   117    118       for (i = 0, j = 0; i < cp->count; i++)
   118    119         {
   119    120   	  if (cp->status[i] > 0)
   120    121   	    {
   121    122   
   122    123   		dist = tps_base_func (e1, n1, pe[i], pn[i]);
................................................................................
   133    134   /***********************************************************************
   134    135   
   135    136     COMPUTE THE FORWARD AND BACKWARD GEOREFFERENCING COEFFICIENTS
   136    137     BASED ON A SET OF CONTROL POINTS
   137    138   
   138    139   ************************************************************************/
   139    140   
   140         -GCP_PRIVATE int
   141         -gcp_I_compute_georef_equations_tps (struct Control_Points *cp,
   142         -				    double **E12tps, double **N12tps,
   143         -				    double **E21tps, double **N21tps)
          141  +int
          142  +I_compute_georef_equations_tps (struct Control_Points *cp,
          143  +				double **E12tps, double **N12tps,
          144  +				double **E21tps, double **N21tps)
   144    145   {
   145    146       double *tempptr;
   146    147       int numactive;		/* NUMBER OF ACTIVE CONTROL POINTS */
   147    148       int status, i;
   148    149       double xmax, xmin, ymax, ymin;
   149    150       double delx, dely;
   150    151       double xx, yy;
................................................................................
   533    534   	return 0.0;
   534    535   
   535    536       dist = (x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1);
   536    537   
   537    538       return dist * log (dist) * 0.5;
   538    539   }
   539    540   
   540         -#endif /* end including GCO */
          541  +#endif	/* end including CONTROL_POINTS */

Changes to src/gaiageo/gg_matrix.c.

    54     54   #include "config.h"
    55     55   #endif
    56     56   
    57     57   #include <spatialite/sqlite.h>
    58     58   
    59     59   #include <spatialite/gaiageo.h>
    60     60   #include <spatialite/gaiamatrix.h>
    61         -#include <spatialite_private.h>
    62     61   
    63     62   #define MATRIX_MAGIC_START		0x00
    64     63   #define MATRIX_MAGIC_DELIMITER	0x3a
    65     64   #define MATRIX_MAGIC_END		0xb3
    66     65   
    67     66   struct at_matrix
    68     67   {
................................................................................
   663    662   			}
   664    663   		  }
   665    664   	    }
   666    665   	  polyg = polyg->Next;
   667    666         }
   668    667       return new_geom;
   669    668   }
   670         -
   671         -static double
   672         -matrix_determinant (struct at_matrix *matrix)
   673         -{
   674         -/* computing the Determinant for a 4x4 Matrix */
   675         -    double m00 = matrix->xx;
   676         -    double m01 = matrix->xy;
   677         -    double m02 = matrix->xz;
   678         -    double m03 = matrix->xoff;
   679         -    double m10 = matrix->yx;
   680         -    double m11 = matrix->yy;
   681         -    double m12 = matrix->yz;
   682         -    double m13 = matrix->yoff;
   683         -    double m20 = matrix->zx;
   684         -    double m21 = matrix->zy;
   685         -    double m22 = matrix->zz;
   686         -    double m23 = matrix->zoff;
   687         -    double m30 = matrix->w1;
   688         -    double m31 = matrix->w2;
   689         -    double m32 = matrix->w3;
   690         -    double m33 = matrix->w4;
   691         -    double value =
   692         -	m03 * m12 * m21 * m30 - m02 * m13 * m21 * m30 - m03 * m11 * m22 * m30 +
   693         -	m01 * m13 * m22 * m30 + m02 * m11 * m23 * m30 - m01 * m12 * m23 * m30 -
   694         -	m03 * m12 * m20 * m31 + m02 * m13 * m20 * m31 + m03 * m10 * m22 * m31 -
   695         -	m00 * m13 * m22 * m31 - m02 * m10 * m23 * m31 + m00 * m12 * m23 * m31 +
   696         -	m03 * m11 * m20 * m32 - m01 * m13 * m20 * m32 - m03 * m10 * m21 * m32 +
   697         -	m00 * m13 * m21 * m32 + m01 * m10 * m23 * m32 - m00 * m11 * m23 * m32 -
   698         -	m02 * m11 * m20 * m33 + m01 * m12 * m20 * m33 + m02 * m10 * m21 * m33 -
   699         -	m00 * m12 * m21 * m33 - m01 * m10 * m22 * m33 + m00 * m11 * m22 * m33;
   700         -    return value;
   701         -}
   702         -
   703         -GAIAMATRIX_DECLARE double
   704         -gaia_matrix_determinant (const unsigned char *blob, int blob_sz)
   705         -{
   706         -/* computing the Determinant from a BLOB-AMT object */
   707         -    double det;
   708         -    struct at_matrix matrix;
   709         -    if (!gaia_matrix_is_valid (blob, blob_sz))
   710         -	return 0.0;
   711         -    if (!blob_matrix_decode (&matrix, blob, blob_sz))
   712         -	return 0.0;
   713         -
   714         -/* computing the Determinant */
   715         -    det = matrix_determinant (&matrix);
   716         -    return det;
   717         -}
   718         -
   719         -
   720         -static void
   721         -matrix_invert (struct at_matrix *matrix, double determinant)
   722         -{
   723         -/* inverting a Matrix */
   724         -    double m00 = matrix->xx;
   725         -    double m01 = matrix->xy;
   726         -    double m02 = matrix->xz;
   727         -    double m03 = matrix->xoff;
   728         -    double m10 = matrix->yx;
   729         -    double m11 = matrix->yy;
   730         -    double m12 = matrix->yz;
   731         -    double m13 = matrix->yoff;
   732         -    double m20 = matrix->zx;
   733         -    double m21 = matrix->zy;
   734         -    double m22 = matrix->zz;
   735         -    double m23 = matrix->zoff;
   736         -    double m30 = matrix->w1;
   737         -    double m31 = matrix->w2;
   738         -    double m32 = matrix->w3;
   739         -    double m33 = matrix->w4;
   740         -    double scale = 1.0 / determinant;
   741         -    double r00 =
   742         -	m12 * m23 * m31 - m13 * m22 * m31 + m13 * m21 * m32 - m11 * m23 * m32 -
   743         -	m12 * m21 * m33 + m11 * m22 * m33;
   744         -    double r01 =
   745         -	m03 * m22 * m31 - m02 * m23 * m31 - m03 * m21 * m32 + m01 * m23 * m32 +
   746         -	m02 * m21 * m33 - m01 * m22 * m33;
   747         -    double r02 =
   748         -	m02 * m13 * m31 - m03 * m12 * m31 + m03 * m11 * m32 - m01 * m13 * m32 -
   749         -	m02 * m11 * m33 + m01 * m12 * m33;
   750         -    double r03 =
   751         -	m03 * m12 * m21 - m02 * m13 * m21 - m03 * m11 * m22 + m01 * m13 * m22 +
   752         -	m02 * m11 * m23 - m01 * m12 * m23;
   753         -    double r10 =
   754         -	m13 * m22 * m30 - m12 * m23 * m30 - m13 * m20 * m32 + m10 * m23 * m32 +
   755         -	m12 * m20 * m33 - m10 * m22 * m33;
   756         -    double r11 =
   757         -	m02 * m23 * m30 - m03 * m22 * m30 + m03 * m20 * m32 - m00 * m23 * m32 -
   758         -	m02 * m20 * m33 + m00 * m22 * m33;
   759         -    double r12 =
   760         -	m03 * m12 * m30 - m02 * m13 * m30 - m03 * m10 * m32 + m00 * m13 * m32 +
   761         -	m02 * m10 * m33 - m00 * m12 * m33;
   762         -    double r13 =
   763         -	m02 * m13 * m20 - m03 * m12 * m20 + m03 * m10 * m22 - m00 * m13 * m22 -
   764         -	m02 * m10 * m23 + m00 * m12 * m23;
   765         -    double r20 =
   766         -	m11 * m23 * m30 - m13 * m21 * m30 + m13 * m20 * m31 - m10 * m23 * m31 -
   767         -	m11 * m20 * m33 + m10 * m21 * m33;
   768         -    double r21 =
   769         -	m03 * m21 * m30 - m01 * m23 * m30 - m03 * m20 * m31 + m00 * m23 * m31 +
   770         -	m01 * m20 * m33 - m00 * m21 * m33;
   771         -    double r22 =
   772         -	m01 * m13 * m30 - m03 * m11 * m30 + m03 * m10 * m31 - m00 * m13 * m31 -
   773         -	m01 * m10 * m33 + m00 * m11 * m33;
   774         -    double r23 =
   775         -	m03 * m11 * m20 - m01 * m13 * m20 - m03 * m10 * m21 + m00 * m13 * m21 +
   776         -	m01 * m10 * m23 - m00 * m11 * m23;
   777         -    double r30 =
   778         -	m12 * m21 * m30 - m11 * m22 * m30 - m12 * m20 * m31 + m10 * m22 * m31 +
   779         -	m11 * m20 * m32 - m10 * m21 * m32;
   780         -    double r31 =
   781         -	m01 * m22 * m30 - m02 * m21 * m30 + m02 * m20 * m31 - m00 * m22 * m31 -
   782         -	m01 * m20 * m32 + m00 * m21 * m32;
   783         -    double r32 =
   784         -	m02 * m11 * m30 - m01 * m12 * m30 - m02 * m10 * m31 + m00 * m12 * m31 +
   785         -	m01 * m10 * m32 - m00 * m11 * m32;
   786         -    double r33 =
   787         -	m01 * m12 * m20 - m02 * m11 * m20 + m02 * m10 * m21 - m00 * m12 * m21 -
   788         -	m01 * m10 * m22 + m00 * m11 * m22;
   789         -    matrix->xx = r00 * scale;
   790         -    matrix->xy = r01 * scale;
   791         -    matrix->xz = r02 * scale;
   792         -    matrix->xoff = r03 * scale;
   793         -    matrix->yx = r10 * scale;
   794         -    matrix->yy = r11 * scale;
   795         -    matrix->yz = r12 * scale;
   796         -    matrix->yoff = r13 * scale;
   797         -    matrix->zx = r20 * scale;
   798         -    matrix->zy = r21 * scale;
   799         -    matrix->zz = r22 * scale;
   800         -    matrix->zoff = r23 * scale;
   801         -    matrix->w1 = r30 * scale;
   802         -    matrix->w2 = r31 * scale;
   803         -    matrix->w3 = r32 * scale;
   804         -    matrix->w4 = r33 * scale;
   805         -}
   806         -
   807         -GAIAMATRIX_DECLARE int
   808         -gaia_matrix_invert (const unsigned char *iblob, int iblob_sz,
   809         -		    unsigned char **oblob, int *oblob_sz)
   810         -{
   811         -/*
   812         -* creating a BLOB-serialized Affine Transform Matrix
   813         -* by Inverting another Matrix
   814         -*/
   815         -    double det;
   816         -    struct at_matrix matrix;
   817         -
   818         -    *oblob = NULL;
   819         -    *oblob_sz = 0;
   820         -    if (!gaia_matrix_is_valid (iblob, iblob_sz))
   821         -	return 0;
   822         -    if (!blob_matrix_decode (&matrix, iblob, iblob_sz))
   823         -	return 0;
   824         -    det = matrix_determinant (&matrix);
   825         -    if (det == 0.0)
   826         -	return 0;
   827         -
   828         -/* creating the Inverse Matrix */
   829         -    matrix_invert (&matrix, det);
   830         -    return blob_matrix_encode (&matrix, oblob, oblob_sz);
   831         -}

Changes to src/gaiageo/gg_wkb.c.

    54     54   #else
    55     55   #include "config.h"
    56     56   #endif
    57     57   
    58     58   #include <spatialite/sqlite.h>
    59     59   
    60     60   #include <spatialite/gaiageo.h>
    61         -#include <spatialite/geopackage.h>
    62     61   
    63     62   static void
    64     63   ParseWkbPoint (gaiaGeomCollPtr geo)
    65     64   {
    66     65   /* decodes a POINT from WKB */
    67     66       double x;
    68     67       double y;
................................................................................
  1068   1067   	    default:
  1069   1068   		break;
  1070   1069   	    };
  1071   1070         }
  1072   1071   }
  1073   1072   
  1074   1073   GAIAGEO_DECLARE gaiaGeomCollPtr
  1075         -gaiaFromSpatiaLiteBlobWkbEx (const unsigned char *blob, unsigned int size,
  1076         -			     int gpkg_amphibious)
         1074  +gaiaFromSpatiaLiteBlobWkb (const unsigned char *blob, unsigned int size)
  1077   1075   {
  1078   1076   /* decoding from SpatiaLite BLOB to GEOMETRY */
  1079   1077       int type;
  1080   1078       int little_endian;
  1081   1079       int endian_arch = gaiaEndianArch ();
  1082   1080       gaiaGeomCollPtr geo = NULL;
  1083         -
  1084         -    if (gpkg_amphibious)
  1085         -      {
  1086         -#ifdef ENABLE_GEOPACKAGE	/* GEOPACKAGE enabled: supporting GPKG geometries */
  1087         -	  if (gaiaIsValidGPB (blob, size))
  1088         -	    {
  1089         -		geo = gaiaFromGeoPackageGeometryBlob (blob, size);
  1090         -		if (geo != NULL)
  1091         -		    return geo;
  1092         -	    }
  1093         -#else
  1094         -	  ;
  1095         -#endif /* end GEOPACKAGE: supporting GPKG geometries */
  1096         -      }
  1097         -
  1098   1081       if (size < 45)
  1099   1082   	return NULL;		/* cannot be an internal BLOB WKB geometry */
  1100   1083       if (*(blob + 0) != GAIA_MARK_START)
  1101   1084   	return NULL;		/* failed to recognize START signature */
  1102   1085       if (*(blob + (size - 1)) != GAIA_MARK_END)
  1103   1086   	return NULL;		/* failed to recognize END signature */
  1104   1087       if (*(blob + 38) != GAIA_MARK_MBR)
................................................................................
  1301   1284         default:
  1302   1285   	  geo->DeclaredType = GAIA_UNKNOWN;
  1303   1286   	  break;
  1304   1287         };
  1305   1288       return geo;
  1306   1289   }
  1307   1290   
  1308         -GAIAGEO_DECLARE gaiaGeomCollPtr
  1309         -gaiaFromSpatiaLiteBlobWkb (const unsigned char *blob, unsigned int size)
  1310         -{
  1311         -/* 
  1312         -* decoding from SpatiaLite BLOB to GEOMETRY 
  1313         -* convenience method - always disabling GPKG Amphibious Mode
  1314         -*/
  1315         -    return gaiaFromSpatiaLiteBlobWkbEx (blob, size, 0);
  1316         -}
  1317         -
  1318   1291   GAIAGEO_DECLARE gaiaGeomCollPtr
  1319   1292   gaiaFromSpatiaLiteBlobMbr (const unsigned char *blob, unsigned int size)
  1320   1293   {
  1321   1294   /* decoding from SpatiaLite BLOB to GEOMETRY [MBR only] */
  1322   1295       int little_endian;
  1323   1296       int endian_arch = gaiaEndianArch ();
  1324   1297       double minx;

Changes to src/gaiageo/gg_wkt.c.

   161    161       sqlite3_free (buf_x);
   162    162       sqlite3_free (buf_y);
   163    163       gaiaAppendToOutBuffer (out_buf, buf);
   164    164       sqlite3_free (buf);
   165    165   }
   166    166   
   167    167   static void
   168         -gaiaOutPoint (gaiaOutBufferPtr out_buf, gaiaPointPtr point, int precision)
          168  +gaiaOutPoint (gaiaOutBufferPtr out_buf, gaiaPointPtr point)
   169    169   {
   170    170   /* formats a WKT POINT */
   171    171       char *buf_x;
   172    172       char *buf_y;
   173    173       char *buf;
   174         -    if (precision < 0)
   175         -	buf_x = sqlite3_mprintf ("%1.6f", point->X);
   176         -    else
   177         -	buf_x = sqlite3_mprintf ("%.*f", precision, point->X);
          174  +    buf_x = sqlite3_mprintf ("%1.6f", point->X);
   178    175       gaiaOutClean (buf_x);
   179         -    if (precision < 0)
   180         -	buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   181         -    else
   182         -	buf_y = sqlite3_mprintf ("%.*f", precision, point->Y);
          176  +    buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   183    177       gaiaOutClean (buf_y);
   184    178       buf = sqlite3_mprintf ("%s %s", buf_x, buf_y);
   185    179       sqlite3_free (buf_x);
   186    180       sqlite3_free (buf_y);
   187    181       gaiaAppendToOutBuffer (out_buf, buf);
   188    182       sqlite3_free (buf);
   189    183   }
   190    184   
   191    185   GAIAGEO_DECLARE void
   192         -gaiaOutPointZex (gaiaOutBufferPtr out_buf, gaiaPointPtr point, int precision)
          186  +gaiaOutPointZ (gaiaOutBufferPtr out_buf, gaiaPointPtr point)
   193    187   {
   194    188   /* formats a WKT POINTZ */
   195    189       char *buf_x;
   196    190       char *buf_y;
   197    191       char *buf_z;
   198    192       char *buf;
   199         -    if (precision < 0)
   200         -	buf_x = sqlite3_mprintf ("%1.6f", point->X);
   201         -    else
   202         -	buf_x = sqlite3_mprintf ("%.*f", precision, point->X);
          193  +    buf_x = sqlite3_mprintf ("%1.6f", point->X);
   203    194       gaiaOutClean (buf_x);
   204         -    if (precision < 0)
   205         -	buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   206         -    else
   207         -	buf_y = sqlite3_mprintf ("%.*f", precision, point->Y);
          195  +    buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   208    196       gaiaOutClean (buf_y);
   209         -    if (precision < 0)
   210         -	buf_z = sqlite3_mprintf ("%1.6f", point->Z);
   211         -    else
   212         -	buf_z = sqlite3_mprintf ("%.*f", precision, point->Z);
          197  +    buf_z = sqlite3_mprintf ("%1.6f", point->Z);
   213    198       gaiaOutClean (buf_z);
   214    199       buf = sqlite3_mprintf ("%s %s %s", buf_x, buf_y, buf_z);
   215    200       sqlite3_free (buf_x);
   216    201       sqlite3_free (buf_y);
   217    202       sqlite3_free (buf_z);
   218    203       gaiaAppendToOutBuffer (out_buf, buf);
   219    204       sqlite3_free (buf);
   220    205   }
   221    206   
   222         -GAIAGEO_DECLARE void
   223         -gaiaOutPointZ (gaiaOutBufferPtr out_buf, gaiaPointPtr point)
   224         -{
   225         -/* 
   226         -* formats a WKT POINTZ 
   227         -* convenience method - default decimal precision
   228         -*/
   229         -    gaiaOutPointZex (out_buf, point, -1);
   230         -}
   231         -
   232    207   static void
   233         -gaiaOutPointM (gaiaOutBufferPtr out_buf, gaiaPointPtr point, int precision)
          208  +gaiaOutPointM (gaiaOutBufferPtr out_buf, gaiaPointPtr point)
   234    209   {
   235    210   /* formats a WKT POINTM */
   236    211       char *buf_x;
   237    212       char *buf_y;
   238    213       char *buf_m;
   239    214       char *buf;
   240         -    if (precision < 0)
   241         -	buf_x = sqlite3_mprintf ("%1.6f", point->X);
   242         -    else
   243         -	buf_x = sqlite3_mprintf ("%.*f", precision, point->X);
          215  +    buf_x = sqlite3_mprintf ("%1.6f", point->X);
   244    216       gaiaOutClean (buf_x);
   245         -    if (precision < 0)
   246         -	buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   247         -    else
   248         -	buf_y = sqlite3_mprintf ("%.*f", precision, point->Y);
          217  +    buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   249    218       gaiaOutClean (buf_y);
   250         -    if (precision < 0)
   251         -	buf_m = sqlite3_mprintf ("%1.6f", point->M);
   252         -    else
   253         -	buf_m = sqlite3_mprintf ("%.*f", precision, point->M);
          219  +    buf_m = sqlite3_mprintf ("%1.6f", point->M);
   254    220       gaiaOutClean (buf_m);
   255    221       buf = sqlite3_mprintf ("%s %s %s", buf_x, buf_y, buf_m);
   256    222       sqlite3_free (buf_x);
   257    223       sqlite3_free (buf_y);
   258    224       sqlite3_free (buf_m);
   259    225       gaiaAppendToOutBuffer (out_buf, buf);
   260    226       sqlite3_free (buf);
   261    227   }
   262    228   
   263    229   static void
   264         -gaiaOutPointZM (gaiaOutBufferPtr out_buf, gaiaPointPtr point, int precision)
          230  +gaiaOutPointZM (gaiaOutBufferPtr out_buf, gaiaPointPtr point)
   265    231   {
   266    232   /* formats a WKT POINTZM */
   267    233       char *buf_x;
   268    234       char *buf_y;
   269    235       char *buf_z;
   270    236       char *buf_m;
   271    237       char *buf;
   272         -    if (precision < 0)
   273         -	buf_x = sqlite3_mprintf ("%1.6f", point->X);
   274         -    else
   275         -	buf_x = sqlite3_mprintf ("%.*f", precision, point->X);
          238  +    buf_x = sqlite3_mprintf ("%1.6f", point->X);
   276    239       gaiaOutClean (buf_x);
   277         -    if (precision < 0)
   278         -	buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   279         -    else
   280         -	buf_y = sqlite3_mprintf ("%.*f", precision, point->Y);
          240  +    buf_y = sqlite3_mprintf ("%1.6f", point->Y);
   281    241       gaiaOutClean (buf_y);
   282         -    if (precision < 0)
   283         -	buf_z = sqlite3_mprintf ("%1.6f", point->Z);
   284         -    else
   285         -	buf_z = sqlite3_mprintf ("%.*f", precision, point->Z);
          242  +    buf_z = sqlite3_mprintf ("%1.6f", point->Z);
   286    243       gaiaOutClean (buf_z);
   287         -    if (precision < 0)
   288         -	buf_m = sqlite3_mprintf ("%1.6f", point->M);
   289         -    else
   290         -	buf_m = sqlite3_mprintf ("%.*f", precision, point->M);
          244  +    buf_m = sqlite3_mprintf ("%1.6f", point->M);
   291    245       gaiaOutClean (buf_m);
   292    246       buf = sqlite3_mprintf ("%s %s %s %s", buf_x, buf_y, buf_z, buf_m);
   293    247       sqlite3_free (buf_x);
   294    248       sqlite3_free (buf_y);
   295    249       sqlite3_free (buf_z);
   296    250       sqlite3_free (buf_m);
   297    251       gaiaAppendToOutBuffer (out_buf, buf);
................................................................................
   429    383   	  sqlite3_free (buf_y);
   430    384   	  gaiaAppendToOutBuffer (out_buf, buf);
   431    385   	  sqlite3_free (buf);
   432    386         }
   433    387   }
   434    388   
   435    389   static void
   436         -gaiaOutLinestring (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line,
   437         -		   int precision)
          390  +gaiaOutLinestring (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line)
   438    391   {
   439    392   /* formats a WKT LINESTRING */
   440    393       char *buf_x;
   441    394       char *buf_y;
   442    395       char *buf;
   443    396       double x;
   444    397       double y;
   445    398       int iv;
   446    399       for (iv = 0; iv < line->Points; iv++)
   447    400         {
   448    401   	  gaiaGetPoint (line->Coords, iv, &x, &y);
   449         -	  if (precision < 0)
   450         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   451         -	  else
   452         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          402  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   453    403   	  gaiaOutClean (buf_x);
   454         -	  if (precision < 0)
   455         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   456         -	  else
   457         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          404  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   458    405   	  gaiaOutClean (buf_y);
   459    406   	  if (iv > 0)
   460    407   	      buf = sqlite3_mprintf (", %s %s", buf_x, buf_y);
   461    408   	  else
   462    409   	      buf = sqlite3_mprintf ("%s %s", buf_x, buf_y);
   463    410   	  sqlite3_free (buf_x);
   464    411   	  sqlite3_free (buf_y);
   465    412   	  gaiaAppendToOutBuffer (out_buf, buf);
   466    413   	  sqlite3_free (buf);
   467    414         }
   468    415   }
   469    416   
   470    417   GAIAGEO_DECLARE void
   471         -gaiaOutLinestringZex (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line,
   472         -		      int precision)
          418  +gaiaOutLinestringZ (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line)
   473    419   {
   474    420   /* formats a WKT LINESTRINGZ */
   475    421       char *buf_x;
   476    422       char *buf_y;
   477    423       char *buf_z;
   478    424       char *buf;
   479    425       double x;
   480    426       double y;
   481    427       double z;
   482    428       int iv;
   483    429       for (iv = 0; iv < line->Points; iv++)
   484    430         {
   485    431   	  gaiaGetPointXYZ (line->Coords, iv, &x, &y, &z);
   486         -	  if (precision < 0)
   487         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   488         -	  else
   489         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          432  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   490    433   	  gaiaOutClean (buf_x);
   491         -	  if (precision < 0)
   492         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   493         -	  else
   494         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          434  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   495    435   	  gaiaOutClean (buf_y);
   496         -	  if (precision < 0)
   497         -	      buf_z = sqlite3_mprintf ("%1.6f", z);
   498         -	  else
   499         -	      buf_z = sqlite3_mprintf ("%.*f", precision, z);
          436  +	  buf_z = sqlite3_mprintf ("%1.6f", z);
   500    437   	  gaiaOutClean (buf_z);
   501    438   	  if (iv > 0)
   502    439   	      buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_z);
   503    440   	  else
   504    441   	      buf = sqlite3_mprintf ("%s %s %s", buf_x, buf_y, buf_z);
   505    442   	  sqlite3_free (buf_x);
   506    443   	  sqlite3_free (buf_y);
   507    444   	  sqlite3_free (buf_z);
   508    445   	  gaiaAppendToOutBuffer (out_buf, buf);
   509    446   	  sqlite3_free (buf);
   510    447         }
   511    448   }
   512    449   
   513         -GAIAGEO_DECLARE void
   514         -gaiaOutLinestringZ (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line)
   515         -{
   516         -/*
   517         -* formats a WKT LINESTRINGZ 
   518         -* convenience method - default decimal precision
   519         -*/
   520         -    gaiaOutLinestringZex (out_buf, line, -1);
   521         -}
   522         -
   523    450   static void
   524         -gaiaOutLinestringM (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line,
   525         -		    int precision)
          451  +gaiaOutLinestringM (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line)
   526    452   {
   527    453   /* formats a WKT LINESTRINGM */
   528    454       char *buf_x;
   529    455       char *buf_y;
   530    456       char *buf_m;
   531    457       char *buf;
   532    458       double x;
   533    459       double y;
   534    460       double m;
   535    461       int iv;
   536    462       for (iv = 0; iv < line->Points; iv++)
   537    463         {
   538    464   	  gaiaGetPointXYM (line->Coords, iv, &x, &y, &m);
   539         -	  if (precision < 0)
   540         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   541         -	  else
   542         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          465  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   543    466   	  gaiaOutClean (buf_x);
   544         -	  if (precision < 0)
   545         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   546         -	  else
   547         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          467  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   548    468   	  gaiaOutClean (buf_y);
   549         -	  if (precision < 0)
   550         -	      buf_m = sqlite3_mprintf ("%1.6f", m);
   551         -	  else
   552         -	      buf_m = sqlite3_mprintf ("%.*f", precision, m);
          469  +	  buf_m = sqlite3_mprintf ("%1.6f", m);
   553    470   	  gaiaOutClean (buf_m);
   554    471   	  if (iv > 0)
   555    472   	      buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_m);
   556    473   	  else
   557    474   	      buf = sqlite3_mprintf ("%s %s %s", buf_x, buf_y, buf_m);
   558    475   	  sqlite3_free (buf_x);
   559    476   	  sqlite3_free (buf_y);
................................................................................
   560    477   	  sqlite3_free (buf_m);
   561    478   	  gaiaAppendToOutBuffer (out_buf, buf);
   562    479   	  sqlite3_free (buf);
   563    480         }
   564    481   }
   565    482   
   566    483   static void
   567         -gaiaOutLinestringZM (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line,
   568         -		     int precision)
          484  +gaiaOutLinestringZM (gaiaOutBufferPtr out_buf, gaiaLinestringPtr line)
   569    485   {
   570    486   /* formats a WKT LINESTRINGZM */
   571    487       char *buf_x;
   572    488       char *buf_y;
   573    489       char *buf_z;
   574    490       char *buf_m;
   575    491       char *buf;
................................................................................
   577    493       double y;
   578    494       double z;
   579    495       double m;
   580    496       int iv;
   581    497       for (iv = 0; iv < line->Points; iv++)
   582    498         {
   583    499   	  gaiaGetPointXYZM (line->Coords, iv, &x, &y, &z, &m);
   584         -	  if (precision < 0)
   585         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   586         -	  else
   587         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          500  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   588    501   	  gaiaOutClean (buf_x);
   589         -	  if (precision < 0)
   590         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   591         -	  else
   592         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          502  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   593    503   	  gaiaOutClean (buf_y);
   594         -	  if (precision < 0)
   595         -	      buf_z = sqlite3_mprintf ("%1.6f", z);
   596         -	  else
   597         -	      buf_z = sqlite3_mprintf ("%.*f", precision, z);
          504  +	  buf_z = sqlite3_mprintf ("%1.6f", z);
   598    505   	  gaiaOutClean (buf_z);
   599         -	  if (precision < 0)
   600         -	      buf_m = sqlite3_mprintf ("%1.6f", m);
   601         -	  else
   602         -	      buf_m = sqlite3_mprintf ("%.*f", precision, m);
          506  +	  buf_m = sqlite3_mprintf ("%1.6f", m);
   603    507   	  gaiaOutClean (buf_m);
   604    508   	  if (iv > 0)
   605    509   	      buf =
   606    510   		  sqlite3_mprintf (", %s %s %s %s", buf_x, buf_y, buf_z, buf_m);
   607    511   	  else
   608    512   	      buf = sqlite3_mprintf ("%s %s %s %s", buf_x, buf_y, buf_z, buf_m);
   609    513   	  sqlite3_free (buf_x);
................................................................................
   832    736   		gaiaAppendToOutBuffer (out_buf, buf);
   833    737   		sqlite3_free (buf);
   834    738   	    }
   835    739         }
   836    740   }
   837    741   
   838    742   static void
   839         -gaiaOutPolygon (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg, int precision)
          743  +gaiaOutPolygon (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg)
   840    744   {
   841    745   /* formats a WKT POLYGON */
   842    746       char *buf_x;
   843    747       char *buf_y;
   844    748       char *buf;
   845    749       int ib;
   846    750       int iv;
   847    751       double x;
   848    752       double y;
   849    753       gaiaRingPtr ring = polyg->Exterior;
   850    754       for (iv = 0; iv < ring->Points; iv++)
   851    755         {
   852    756   	  gaiaGetPoint (ring->Coords, iv, &x, &y);
   853         -	  if (precision < 0)
   854         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   855         -	  else
   856         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          757  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   857    758   	  gaiaOutClean (buf_x);
   858         -	  if (precision < 0)
   859         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   860         -	  else
   861         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          759  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   862    760   	  gaiaOutClean (buf_y);
   863    761   	  if (iv == 0)
   864    762   	      buf = sqlite3_mprintf ("(%s %s", buf_x, buf_y);
   865    763   	  else if (iv == (ring->Points - 1))
   866    764   	      buf = sqlite3_mprintf (", %s %s)", buf_x, buf_y);
   867    765   	  else
   868    766   	      buf = sqlite3_mprintf (", %s %s", buf_x, buf_y);
................................................................................
   873    771         }
   874    772       for (ib = 0; ib < polyg->NumInteriors; ib++)
   875    773         {
   876    774   	  ring = polyg->Interiors + ib;
   877    775   	  for (iv = 0; iv < ring->Points; iv++)
   878    776   	    {
   879    777   		gaiaGetPoint (ring->Coords, iv, &x, &y);
   880         -		if (precision < 0)
   881         -		    buf_x = sqlite3_mprintf ("%1.6f", x);
   882         -		else
   883         -		    buf_x = sqlite3_mprintf ("%.*f", precision, x);
          778  +		buf_x = sqlite3_mprintf ("%1.6f", x);
   884    779   		gaiaOutClean (buf_x);
   885         -		if (precision < 0)
   886         -		    buf_y = sqlite3_mprintf ("%1.6f", y);
   887         -		else
   888         -		    buf_y = sqlite3_mprintf ("%.*f", precision, y);
          780  +		buf_y = sqlite3_mprintf ("%1.6f", y);
   889    781   		gaiaOutClean (buf_y);
   890    782   		if (iv == 0)
   891    783   		    buf = sqlite3_mprintf (", (%s %s", buf_x, buf_y);
   892    784   		else if (iv == (ring->Points - 1))
   893    785   		    buf = sqlite3_mprintf (", %s %s)", buf_x, buf_y);
   894    786   		else
   895    787   		    buf = sqlite3_mprintf (", %s %s", buf_x, buf_y);
................................................................................
   898    790   		gaiaAppendToOutBuffer (out_buf, buf);
   899    791   		sqlite3_free (buf);
   900    792   	    }
   901    793         }
   902    794   }
   903    795   
   904    796   GAIAGEO_DECLARE void
   905         -gaiaOutPolygonZex (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg,
   906         -		   int precision)
          797  +gaiaOutPolygonZ (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg)
   907    798   {
   908    799   /* formats a WKT POLYGONZ */
   909    800       char *buf_x;
   910    801       char *buf_y;
   911    802       char *buf_z;
   912    803       char *buf;
   913    804       int ib;
................................................................................
   915    806       double x;
   916    807       double y;
   917    808       double z;
   918    809       gaiaRingPtr ring = polyg->Exterior;
   919    810       for (iv = 0; iv < ring->Points; iv++)
   920    811         {
   921    812   	  gaiaGetPointXYZ (ring->Coords, iv, &x, &y, &z);
   922         -	  if (precision < 0)
   923         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
   924         -	  else
   925         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          813  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
   926    814   	  gaiaOutClean (buf_x);
   927         -	  if (precision < 0)
   928         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
   929         -	  else
   930         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          815  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
   931    816   	  gaiaOutClean (buf_y);
   932         -	  if (precision < 0)
   933         -	      buf_z = sqlite3_mprintf ("%1.6f", z);
   934         -	  else
   935         -	      buf_z = sqlite3_mprintf ("%.*f", precision, z);
          817  +	  buf_z = sqlite3_mprintf ("%1.6f", z);
   936    818   	  gaiaOutClean (buf_z);
   937    819   	  if (iv == 0)
   938    820   	      buf = sqlite3_mprintf ("(%s %s %s", buf_x, buf_y, buf_z);
   939    821   	  else if (iv == (ring->Points - 1))
   940    822   	      buf = sqlite3_mprintf (", %s %s %s)", buf_x, buf_y, buf_z);
   941    823   	  else
   942    824   	      buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_z);
................................................................................
   948    830         }
   949    831       for (ib = 0; ib < polyg->NumInteriors; ib++)
   950    832         {
   951    833   	  ring = polyg->Interiors + ib;
   952    834   	  for (iv = 0; iv < ring->Points; iv++)
   953    835   	    {
   954    836   		gaiaGetPointXYZ (ring->Coords, iv, &x, &y, &z);
   955         -		if (precision < 0)
   956         -		    buf_x = sqlite3_mprintf ("%1.6f", x);
   957         -		else
   958         -		    buf_x = sqlite3_mprintf ("%.*f", precision, x);
          837  +		buf_x = sqlite3_mprintf ("%1.6f", x);
   959    838   		gaiaOutClean (buf_x);
   960         -		if (precision < 0)
   961         -		    buf_y = sqlite3_mprintf ("%1.6f", y);
   962         -		else
   963         -		    buf_y = sqlite3_mprintf ("%.*f", precision, y);
          839  +		buf_y = sqlite3_mprintf ("%1.6f", y);
   964    840   		gaiaOutClean (buf_y);
   965         -		if (precision < 0)
   966         -		    buf_z = sqlite3_mprintf ("%1.6f", z);
   967         -		else
   968         -		    buf_z = sqlite3_mprintf ("%.*f", precision, z);
          841  +		buf_z = sqlite3_mprintf ("%1.6f", z);
   969    842   		gaiaOutClean (buf_z);
   970    843   		if (iv == 0)
   971    844   		    buf = sqlite3_mprintf (", (%s %s %s", buf_x, buf_y, buf_z);
   972    845   		else if (iv == (ring->Points - 1))
   973    846   		    buf = sqlite3_mprintf (", %s %s %s)", buf_x, buf_y, buf_z);
   974    847   		else
   975    848   		    buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_z);
................................................................................
   978    851   		sqlite3_free (buf_z);
   979    852   		gaiaAppendToOutBuffer (out_buf, buf);
   980    853   		sqlite3_free (buf);
   981    854   	    }
   982    855         }
   983    856   }
   984    857   
   985         -GAIAGEO_DECLARE void
   986         -gaiaOutPolygonZ (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg)
   987         -{
   988         -/* 
   989         -* formats a WKT POLYGONZ
   990         -* convenience method - default decimal precision
   991         -*/
   992         -    gaiaOutPolygonZex (out_buf, polyg, -1);
   993         -}
   994         -
   995    858   static void
   996         -gaiaOutPolygonM (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg, int precision)
          859  +gaiaOutPolygonM (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg)
   997    860   {
   998    861   /* formats a WKT POLYGONM */
   999    862       char *buf_x;
  1000    863       char *buf_y;
  1001    864       char *buf_m;
  1002    865       char *buf;
  1003    866       int ib;
................................................................................
  1005    868       double x;
  1006    869       double y;
  1007    870       double m;
  1008    871       gaiaRingPtr ring = polyg->Exterior;
  1009    872       for (iv = 0; iv < ring->Points; iv++)
  1010    873         {
  1011    874   	  gaiaGetPointXYM (ring->Coords, iv, &x, &y, &m);
  1012         -	  if (precision < 0)
  1013         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
  1014         -	  else
  1015         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          875  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
  1016    876   	  gaiaOutClean (buf_x);
  1017         -	  if (precision < 0)
  1018         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
  1019         -	  else
  1020         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          877  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
  1021    878   	  gaiaOutClean (buf_y);
  1022         -	  if (precision < 0)
  1023         -	      buf_m = sqlite3_mprintf ("%1.6f", m);
  1024         -	  else
  1025         -	      buf_m = sqlite3_mprintf ("%.*f", precision, m);
          879  +	  buf_m = sqlite3_mprintf ("%1.6f", m);
  1026    880   	  gaiaOutClean (buf_m);
  1027    881   	  if (iv == 0)
  1028    882   	      buf = sqlite3_mprintf ("(%s %s %s", buf_x, buf_y, buf_m);
  1029    883   	  else if (iv == (ring->Points - 1))
  1030    884   	      buf = sqlite3_mprintf (", %s %s %s)", buf_x, buf_y, buf_m);
  1031    885   	  else
  1032    886   	      buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_m);
................................................................................
  1038    892         }
  1039    893       for (ib = 0; ib < polyg->NumInteriors; ib++)
  1040    894         {
  1041    895   	  ring = polyg->Interiors + ib;
  1042    896   	  for (iv = 0; iv < ring->Points; iv++)
  1043    897   	    {
  1044    898   		gaiaGetPointXYM (ring->Coords, iv, &x, &y, &m);
  1045         -		if (precision < 0)
  1046         -		    buf_x = sqlite3_mprintf ("%1.6f", x);
  1047         -		else
  1048         -		    buf_x = sqlite3_mprintf ("%.*f", precision, x);
          899  +		buf_x = sqlite3_mprintf ("%1.6f", x);
  1049    900   		gaiaOutClean (buf_x);
  1050         -		if (precision < 0)
  1051         -		    buf_y = sqlite3_mprintf ("%1.6f", y);
  1052         -		else
  1053         -		    buf_y = sqlite3_mprintf ("%.*f", precision, y);
          901  +		buf_y = sqlite3_mprintf ("%1.6f", y);
  1054    902   		gaiaOutClean (buf_y);
  1055         -		if (precision < 0)
  1056         -		    buf_m = sqlite3_mprintf ("%1.6f", m);
  1057         -		else
  1058         -		    buf_m = sqlite3_mprintf ("%.*f", precision, m);
          903  +		buf_m = sqlite3_mprintf ("%1.6f", m);
  1059    904   		gaiaOutClean (buf_m);
  1060    905   		if (iv == 0)
  1061    906   		    buf = sqlite3_mprintf (", (%s %s %s", buf_x, buf_y, buf_m);
  1062    907   		else if (iv == (ring->Points - 1))
  1063    908   		    buf = sqlite3_mprintf (", %s %s %s)", buf_x, buf_y, buf_m);
  1064    909   		else
  1065    910   		    buf = sqlite3_mprintf (", %s %s %s", buf_x, buf_y, buf_m);
................................................................................
  1069    914   		gaiaAppendToOutBuffer (out_buf, buf);
  1070    915   		sqlite3_free (buf);
  1071    916   	    }
  1072    917         }
  1073    918   }
  1074    919   
  1075    920   static void
  1076         -gaiaOutPolygonZM (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg, int precision)
          921  +gaiaOutPolygonZM (gaiaOutBufferPtr out_buf, gaiaPolygonPtr polyg)
  1077    922   {
  1078    923   /* formats a WKT POLYGONZM */
  1079    924       char *buf_x;
  1080    925       char *buf_y;
  1081    926       char *buf_z;
  1082    927       char *buf_m;
  1083    928       char *buf;
................................................................................
  1087    932       double y;
  1088    933       double z;
  1089    934       double m;
  1090    935       gaiaRingPtr ring = polyg->Exterior;
  1091    936       for (iv = 0; iv < ring->Points; iv++)
  1092    937         {
  1093    938   	  gaiaGetPointXYZM (ring->Coords, iv, &x, &y, &z, &m);
  1094         -	  if (precision < 0)
  1095         -	      buf_x = sqlite3_mprintf ("%1.6f", x);
  1096         -	  else
  1097         -	      buf_x = sqlite3_mprintf ("%.*f", precision, x);
          939  +	  buf_x = sqlite3_mprintf ("%1.6f", x);
  1098    940   	  gaiaOutClean (buf_x);
  1099         -	  if (precision < 0)
  1100         -	      buf_y = sqlite3_mprintf ("%1.6f", y);
  1101         -	  else
  1102         -	      buf_y = sqlite3_mprintf ("%.*f", precision, y);
          941  +	  buf_y = sqlite3_mprintf ("%1.6f", y);
  1103    942   	  gaiaOutClean (buf_y);
  1104         -	  if (precision < 0)
  1105         -	      buf_z = sqlite3_mprintf ("%1.6f", z);
  1106         -	  else
  1107         -	      buf_z = sqlite3_mprintf ("%.*f", precision, z);
          943  +	  buf_z = sqlite3_mprintf ("%1.6f", z);
  1108    944   	  gaiaOutClean (buf_z);
  1109         -	  if (precision < 0)
  1110         -	      buf_m = sqlite3_mprintf ("%1.6f", m);
  1111         -	  else
  1112         -	      buf_m = sqlite3_mprintf ("%.*f", precision, m);
          945  +	  buf_m = sqlite3_mprintf ("%1.6f", m);
  1113    946   	  gaiaOutClean (buf_m);
  1114    947   	  if (iv == 0)
  1115    948   	      buf =
  1116    949   		  sqlite3_mprintf ("(%s %s %s %s", buf_x, buf_y, buf_z, buf_m);
  1117    950   	  else if (iv == (ring->Points - 1))
  1118    951   	      buf =
  1119    952   		  sqlite3_mprintf (", %s %s %s %s)", buf_x, buf_y, buf_z,
................................................................................
  1130    963         }
  1131    964       for (ib = 0; ib < polyg->NumInteriors; ib++)
  1132    965         {
  1133    966   	  ring = polyg->Interiors + ib;
  1134    967   	  for (iv = 0; iv < ring->Points; iv++)
  1135    968   	    {
  1136    969   		gaiaGetPointXYZM (ring->Coords, iv, &x, &y, &z, &m);
  1137         -		if (precision < 0)
  1138         -		    buf_x = sqlite3_mprintf ("%1.6f", x);
  1139         -		else
  1140         -		    buf_x = sqlite3_mprintf ("%.*f", precision, x);
          970  +		buf_x = sqlite3_mprintf ("%1.6f", x);
  1141    971   		gaiaOutClean (buf_x);
  1142         -		if (precision < 0)
  1143         -		    buf_y = sqlite3_mprintf ("%1.6f", y);
  1144         -		else
  1145         -		    buf_y = sqlite3_mprintf ("%.*f", precision, y);
          972  +		buf_y = sqlite3_mprintf ("%1.6f", y);
  1146    973   		gaiaOutClean (buf_y);
  1147         -		if (precision < 0)
  1148         -		    buf_z = sqlite3_mprintf ("%1.6f", z);
  1149         -		else
  1150         -		    buf_z = sqlite3_mprintf ("%.*f", precision, z);
          974  +		buf_z = sqlite3_mprintf ("%1.6f", z);
  1151    975   		gaiaOutClean (buf_z);
  1152         -		if (precision < 0)
  1153         -		    buf_m = sqlite3_mprintf ("%1.6f", m);
  1154         -		else
  1155         -		    buf_m = sqlite3_mprintf ("%.*f", precision, m);
          976  +		buf_m = sqlite3_mprintf ("%1.6f", m);
  1156    977   		gaiaOutClean (buf_m);
  1157    978   		if (iv == 0)
  1158    979   		    buf =
  1159    980   			sqlite3_mprintf (", (%s %s %s %s", buf_x, buf_y, buf_z,
  1160    981   					 buf_m);
  1161    982   		else if (iv == (ring->Points - 1))
  1162    983   		    buf =
................................................................................
  1430   1251   		gaiaAppendToOutBuffer (out_buf, buf);
  1431   1252   		sqlite3_free (buf);
  1432   1253   	    }
  1433   1254         }
  1434   1255   }
  1435   1256   
  1436   1257   GAIAGEO_DECLARE void
  1437         -gaiaOutWktEx (gaiaOutBufferPtr out_buf, gaiaGeomCollPtr geom, int precision)
         1258  +gaiaOutWkt (gaiaOutBufferPtr out_buf, gaiaGeomCollPtr geom)
  1438   1259   {
  1439   1260   /* prints the WKT representation of current geometry */
  1440   1261       int pts = 0;
  1441   1262       int lns = 0;
  1442   1263       int pgs = 0;
  1443   1264       gaiaPointPtr point;
  1444   1265       gaiaLinestringPtr line;
................................................................................
  1475   1296   	  point = geom->FirstPoint;
  1476   1297   	  while (point)
  1477   1298   	    {
  1478   1299   		if (point->DimensionModel == GAIA_XY_Z)
  1479   1300   		  {
  1480   1301   		      /* processing POINTZ */
  1481   1302   		      gaiaAppendToOutBuffer (out_buf, "POINT Z(");
  1482         -		      gaiaOutPointZex (out_buf, point, precision);
         1303  +		      gaiaOutPointZ (out_buf, point);
  1483   1304   		  }
  1484   1305   		else if (point->DimensionModel == GAIA_XY_M)
  1485   1306   		  {
  1486   1307   		      /* processing POINTM */
  1487   1308   		      gaiaAppendToOutBuffer (out_buf, "POINT M(");
  1488         -		      gaiaOutPointM (out_buf, point, precision);
         1309  +		      gaiaOutPointM (out_buf, point);
  1489   1310   		  }
  1490   1311   		else if (point->DimensionModel == GAIA_XY_Z_M)
  1491   1312   		  {
  1492   1313   		      /* processing POINTZM */
  1493   1314   		      gaiaAppendToOutBuffer (out_buf, "POINT ZM(");
  1494         -		      gaiaOutPointZM (out_buf, point, precision);
         1315  +		      gaiaOutPointZM (out_buf, point);
  1495   1316   		  }
  1496   1317   		else
  1497   1318   		  {
  1498   1319   		      /* processing POINT */
  1499   1320   		      gaiaAppendToOutBuffer (out_buf, "POINT(");
  1500         -		      gaiaOutPoint (out_buf, point, precision);
         1321  +		      gaiaOutPoint (out_buf, point);
  1501   1322   		  }
  1502   1323   		gaiaAppendToOutBuffer (out_buf, ")");
  1503   1324   		point = point->Next;
  1504   1325   	    }
  1505   1326   	  line = geom->FirstLinestring;
  1506   1327   	  while (line)
  1507   1328   	    {
  1508   1329   		if (line->DimensionModel == GAIA_XY_Z)
  1509   1330   		  {
  1510   1331   		      /* processing LINESTRINGZ */
  1511   1332   		      gaiaAppendToOutBuffer (out_buf, "LINESTRING Z(");
  1512         -		      gaiaOutLinestringZex (out_buf, line, precision);
         1333  +		      gaiaOutLinestringZ (out_buf, line);
  1513   1334   		  }
  1514   1335   		else if (line->DimensionModel == GAIA_XY_M)
  1515   1336   		  {
  1516   1337   		      /* processing LINESTRINGM */
  1517   1338   		      gaiaAppendToOutBuffer (out_buf, "LINESTRING M(");
  1518         -		      gaiaOutLinestringM (out_buf, line, precision);
         1339  +		      gaiaOutLinestringM (out_buf, line);
  1519   1340   		  }
  1520   1341   		else if (line->DimensionModel == GAIA_XY_Z_M)
  1521   1342   		  {
  1522   1343   		      /* processing LINESTRINGZM */
  1523   1344   		      gaiaAppendToOutBuffer (out_buf, "LINESTRING ZM(");
  1524         -		      gaiaOutLinestringZM (out_buf, line, precision);
         1345  +		      gaiaOutLinestringZM (out_buf, line);
  1525   1346   		  }
  1526   1347   		else
  1527   1348   		  {
  1528   1349   		      /* processing LINESTRING */
  1529   1350   		      gaiaAppendToOutBuffer (out_buf, "LINESTRING(");
  1530         -		      gaiaOutLinestring (out_buf, line, precision);
         1351  +		      gaiaOutLinestring (out_buf, line);
  1531   1352   		  }
  1532   1353   		gaiaAppendToOutBuffer (out_buf, ")");
  1533   1354   		line = line->Next;
  1534   1355   	    }
  1535   1356   	  polyg = geom->FirstPolygon;
  1536   1357   	  while (polyg)
  1537   1358   	    {
  1538   1359   		if (polyg->DimensionModel == GAIA_XY_Z)
  1539   1360   		  {
  1540   1361   		      /* processing POLYGONZ */
  1541   1362   		      gaiaAppendToOutBuffer (out_buf, "POLYGON Z(");
  1542         -		      gaiaOutPolygonZex (out_buf, polyg, precision);
         1363  +		      gaiaOutPolygonZ (out_buf, polyg);
  1543   1364   		  }
  1544   1365   		else if (polyg->DimensionModel == GAIA_XY_M)
  1545   1366   		  {
  1546   1367   		      /* processing POLYGONM */
  1547   1368   		      gaiaAppendToOutBuffer (out_buf, "POLYGON M(");
  1548         -		      gaiaOutPolygonM (out_buf, polyg, precision);
         1369  +		      gaiaOutPolygonM (out_buf, polyg);
  1549   1370   		  }
  1550   1371   		else if (polyg->DimensionModel == GAIA_XY_Z_M)
  1551   1372   		  {
  1552   1373   		      /* processing POLYGONZM */
  1553   1374   		      gaiaAppendToOutBuffer (out_buf, "POLYGON ZM(");
  1554         -		      gaiaOutPolygonZM (out_buf, polyg, precision);
         1375  +		      gaiaOutPolygonZM (out_buf, polyg);
  1555   1376   		  }
  1556   1377   		else
  1557   1378   		  {
  1558   1379   		      /* processing POLYGON */
  1559   1380   		      gaiaAppendToOutBuffer (out_buf, "POLYGON(");
  1560         -		      gaiaOutPolygon (out_buf, polyg, precision);
         1381  +		      gaiaOutPolygon (out_buf, polyg);
  1561   1382   		  }
  1562   1383   		gaiaAppendToOutBuffer (out_buf, ")");
  1563   1384   		polyg = polyg->Next;
  1564   1385   	    }
  1565   1386         }
  1566   1387       else
  1567   1388         {
................................................................................
  1581   1402   		point = geom->FirstPoint;
  1582   1403   		while (point)
  1583   1404   		  {
  1584   1405   		      if (point->DimensionModel == GAIA_XY_Z)
  1585   1406   			{
  1586   1407   			    if (point != geom->FirstPoint)
  1587   1408   				gaiaAppendToOutBuffer (out_buf, ", ");
  1588         -			    gaiaOutPointZex (out_buf, point, precision);
         1409  +			    gaiaOutPointZ (out_buf, point);
  1589   1410   			}
  1590   1411   		      else if (point->DimensionModel == GAIA_XY_M)
  1591   1412   			{
  1592   1413   			    if (point != geom->FirstPoint)
  1593   1414   				gaiaAppendToOutBuffer (out_buf, ", ");
  1594         -			    gaiaOutPointM (out_buf, point, precision);
         1415  +			    gaiaOutPointM (out_buf, point);
  1595   1416   			}
  1596   1417   		      else if (point->DimensionModel == GAIA_XY_Z_M)
  1597   1418   			{
  1598   1419   			    if (point != geom->FirstPoint)
  1599   1420   				gaiaAppendToOutBuffer (out_buf, ", ");
  1600         -			    gaiaOutPointZM (out_buf, point, precision);
         1421  +			    gaiaOutPointZM (out_buf, point);
  1601   1422   			}
  1602   1423   		      else
  1603   1424   			{
  1604   1425   			    if (point != geom->FirstPoint)
  1605   1426   				gaiaAppendToOutBuffer (out_buf, ", ");
  1606         -			    gaiaOutPoint (out_buf, point, precision);
         1427  +			    gaiaOutPoint (out_buf, point);
  1607   1428   			}
  1608   1429   		      point = point->Next;
  1609   1430   		  }
  1610   1431   		gaiaAppendToOutBuffer (out_buf, ")");
  1611   1432   	    }
  1612   1433   	  else if (pts == 0 && lns > 0 && pgs == 0
  1613   1434   		   && geom->DeclaredType == GAIA_MULTILINESTRING)
................................................................................
  1626   1447   		  {
  1627   1448   		      if (line != geom->FirstLinestring)
  1628   1449   			  gaiaAppendToOutBuffer (out_buf, ", (");
  1629   1450   		      else
  1630   1451   			  gaiaAppendToOutBuffer (out_buf, "(");
  1631   1452   		      if (line->DimensionModel == GAIA_XY_Z)
  1632   1453   			{
  1633         -			    gaiaOutLinestringZex (out_buf, line, precision);
         1454  +			    gaiaOutLinestringZ (out_buf, line);
  1634   1455   			    gaiaAppendToOutBuffer (out_buf, ")");
  1635   1456   			}
  1636   1457   		      else if (line->DimensionModel == GAIA_XY_M)
  1637   1458   			{
  1638         -			    gaiaOutLinestringM (out_buf, line, precision);
         1459  +			    gaiaOutLinestringM (out_buf, line);
  1639   1460   			    gaiaAppendToOutBuffer (out_buf, ")");
  1640   1461   			}
  1641   1462   		      else if (line->DimensionModel == GAIA_XY_Z_M)
  1642   1463   			{
  1643         -			    gaiaOutLinestringZM (out_buf, line, precision);
         1464  +			    gaiaOutLinestringZM (out_buf, line);
  1644   1465   			    gaiaAppendToOutBuffer (out_buf, ")");
  1645   1466   			}
  1646   1467   		      else
  1647   1468   			{
  1648         -			    gaiaOutLinestring (out_buf, line, precision);
         1469  +			    gaiaOutLinestring (out_buf, line);
  1649   1470   			    gaiaAppendToOutBuffer (out_buf, ")");
  1650   1471   			}
  1651   1472   		      line = line->Next;
  1652   1473   		  }
  1653   1474   		gaiaAppendToOutBuffer (out_buf, ")");
  1654   1475   	    }
  1655   1476   	  else if (pts == 0 && lns == 0 && pgs > 0
................................................................................
  1669   1490   		  {
  1670   1491   		      if (polyg != geom->FirstPolygon)
  1671   1492   			  gaiaAppendToOutBuffer (out_buf, ", (");
  1672   1493   		      else
  1673   1494   			  gaiaAppendToOutBuffer (out_buf, "(");
  1674   1495   		      if (polyg->DimensionModel == GAIA_XY_Z)
  1675   1496   			{
  1676         -			    gaiaOutPolygonZex (out_buf, polyg, precision);
         1497  +			    gaiaOutPolygonZ (out_buf, polyg);
  1677   1498   			    gaiaAppendToOutBuffer (out_buf, ")");
  1678   1499   			}
  1679   1500   		      else if (polyg->DimensionModel == GAIA_XY_M)
  1680   1501   			{
  1681         -			    gaiaOutPolygonM (out_buf, polyg, precision);
         1502  +			    gaiaOutPolygonM (out_buf, polyg);
  1682   1503   			    gaiaAppendToOutBuffer (out_buf, ")");
  1683   1504   			}
  1684   1505   		      else if (polyg->DimensionModel == GAIA_XY_Z_M)
  1685   1506   			{
  1686         -			    gaiaOutPolygonZM (out_buf, polyg, precision);
         1507  +			    gaiaOutPolygonZM (out_buf, polyg);
  1687   1508   			    gaiaAppendToOutBuffer (out_buf, ")");
  1688   1509   			}
  1689   1510   		      else
  1690   1511   			{
  1691         -			    gaiaOutPolygon (out_buf, polyg, precision);
         1512  +			    gaiaOutPolygon (out_buf, polyg);
  1692   1513   			    gaiaAppendToOutBuffer (out_buf, ")");
  1693   1514   			}
  1694   1515   		      polyg = polyg->Next;
  1695   1516   		  }
  1696   1517   		gaiaAppendToOutBuffer (out_buf, ")");
  1697   1518   	    }
  1698   1519   	  else
................................................................................
  1713   1534   		      /* processing POINTs */
  1714   1535   		      if (ie > 0)
  1715   1536   			  gaiaAppendToOutBuffer (out_buf, ", ");
  1716   1537   		      ie++;
  1717   1538   		      if (point->DimensionModel == GAIA_XY_Z)
  1718   1539   			{
  1719   1540   			    gaiaAppendToOutBuffer (out_buf, "POINT Z(");
  1720         -			    gaiaOutPointZex (out_buf, point, precision);
         1541  +			    gaiaOutPointZ (out_buf, point);
  1721   1542   			}
  1722   1543   		      else if (point->DimensionModel == GAIA_XY_M)
  1723   1544   			{
  1724   1545   			    gaiaAppendToOutBuffer (out_buf, "POINT M(");
  1725         -			    gaiaOutPointM (out_buf, point, precision);
         1546  +			    gaiaOutPointM (out_buf, point);
  1726   1547   			}
  1727   1548   		      else if (point->DimensionModel == GAIA_XY_Z_M)
  1728   1549   			{
  1729   1550   			    gaiaAppendToOutBuffer (out_buf, "POINT ZM(");
  1730         -			    gaiaOutPointZM (out_buf, point, precision);
         1551  +			    gaiaOutPointZM (out_buf, point);
  1731   1552   			}
  1732   1553   		      else
  1733   1554   			{
  1734   1555   			    gaiaAppendToOutBuffer (out_buf, "POINT(");
  1735         -			    gaiaOutPoint (out_buf, point, precision);
         1556  +			    gaiaOutPoint (out_buf, point);
  1736   1557   			}
  1737   1558   		      gaiaAppendToOutBuffer (out_buf, ")");
  1738   1559   		      point = point->Next;
  1739   1560   		  }
  1740   1561   		line = geom->FirstLinestring;
  1741   1562   		while (line)
  1742   1563   		  {
................................................................................
  1743   1564   		      /* processing LINESTRINGs */
  1744   1565   		      if (ie > 0)
  1745   1566   			  gaiaAppendToOutBuffer (out_buf, ", ");
  1746   1567   		      ie++;
  1747   1568   		      if (line->DimensionModel == GAIA_XY_Z)
  1748   1569   			{
  1749   1570   			    gaiaAppendToOutBuffer (out_buf, "LINESTRING Z(");
  1750         -			    gaiaOutLinestringZex (out_buf, line, precision);
         1571  +			    gaiaOutLinestringZ (out_buf, line);
  1751   1572   			}
  1752   1573   		      else if (line->DimensionModel == GAIA_XY_M)
  1753   1574   			{
  1754   1575   			    gaiaAppendToOutBuffer (out_buf, "LINESTRING M(");
  1755         -			    gaiaOutLinestringM (out_buf, line, precision);
         1576  +			    gaiaOutLinestringM (out_buf, line);
  1756   1577   			}
  1757   1578   		      else if (line->DimensionModel == GAIA_XY_Z_M)
  1758   1579   			{
  1759   1580   			    gaiaAppendToOutBuffer (out_buf, "LINESTRING ZM(");
  1760         -			    gaiaOutLinestringZM (out_buf, line, precision);
         1581  +			    gaiaOutLinestringZM (out_buf, line);
  1761   1582   			}
  1762   1583   		      else
  1763   1584   			{
  1764   1585   			    gaiaAppendToOutBuffer (out_buf, "LINESTRING(");
  1765         -			    gaiaOutLinestring (out_buf, line, precision);
         1586  +			    gaiaOutLinestring (out_buf, line);
  1766   1587   			}
  1767   1588   		      gaiaAppendToOutBuffer (out_buf, ")");
  1768   1589   		      line = line->Next;
  1769   1590   		  }
  1770   1591   		polyg = geom->FirstPolygon;
  1771   1592   		while (polyg)
  1772   1593   		  {
................................................................................
  1773   1594   		      /* processing POLYGONs */
  1774   1595   		      if (ie > 0)
  1775   1596   			  gaiaAppendToOutBuffer (out_buf, ", ");
  1776   1597   		      ie++;
  1777   1598   		      if (polyg->DimensionModel == GAIA_XY_Z)
  1778   1599   			{
  1779   1600   			    gaiaAppendToOutBuffer (out_buf, "POLYGON Z(");
  1780         -			    gaiaOutPolygonZex (out_buf, polyg, precision);
         1601  +			    gaiaOutPolygonZ (out_buf, polyg);
  1781   1602   			}
  1782   1603   		      else if (polyg->DimensionModel == GAIA_XY_M)
  1783   1604   			{
  1784   1605   			    gaiaAppendToOutBuffer (out_buf, "POLYGON M(");
  1785         -			    gaiaOutPolygonM (out_buf, polyg, precision);
         1606  +			    gaiaOutPolygonM (out_buf, polyg);
  1786   1607   			}
  1787   1608   		      else if (polyg->DimensionModel == GAIA_XY_Z_M)
  1788   1609   			{
  1789   1610   			    gaiaAppendToOutBuffer (out_buf, "POLYGON ZM(");
  1790         -			    gaiaOutPolygonZM (out_buf, polyg, precision);
         1611  +			    gaiaOutPolygonZM (out_buf, polyg);
  1791   1612   			}
  1792   1613   		      else
  1793   1614   			{
  1794   1615   			    gaiaAppendToOutBuffer (out_buf, "POLYGON(");
  1795         -			    gaiaOutPolygon (out_buf, polyg, precision);
         1616  +			    gaiaOutPolygon (out_buf, polyg);
  1796   1617   			}
  1797   1618   		      gaiaAppendToOutBuffer (out_buf, ")");
  1798   1619   		      polyg = polyg->Next;
  1799   1620   		  }
  1800   1621   		gaiaAppendToOutBuffer (out_buf, ")");
  1801   1622   	    }
  1802   1623         }
  1803   1624   }
  1804   1625   
  1805         -GAIAGEO_DECLARE void
  1806         -gaiaOutWkt (gaiaOutBufferPtr out_buf, gaiaGeomCollPtr geom)
  1807         -{
  1808         -/* 
  1809         -* prints the WKT representation of current geometry 
  1810         -* convenience method - default decimal precision
  1811         -*/
  1812         -    gaiaOutWktEx (out_buf, geom, -1);
  1813         -}
  1814         -
  1815   1626   GAIAGEO_DECLARE void
  1816   1627   gaiaOutWktStrict (gaiaOutBufferPtr out_buf, gaiaGeomCollPtr geom, int precision)
  1817   1628   {
  1818   1629   /* 
  1819   1630    * prints the WKT representation of current geometry 
  1820   1631    * strictly conformant 2D WKT implementation
  1821   1632   */

Changes to src/headers/spatialite/control_points.h.

    61     61   #endif
    62     62   
    63     63   #ifdef __cplusplus
    64     64   extern "C"
    65     65   {
    66     66   #endif
    67     67   
    68         -/**
    69         - Typedef for GaiaControPoints object (opaque, hidden)
    70         -
    71         - \sa GaiaControlPointsPtr
    72         - */
    73     68       typedef struct opaque_control_points GaiaControlPoints;
    74         -/**
    75         - Typedef for GaiaControPointsPtr object pointer (opaque, hidden)
    76         -
    77         - \sa GaiaControlPoints
    78         - */
    79     69       typedef GaiaControlPoints *GaiaControlPointsPtr;
    80         -
    81         -/**
    82         - Typedef for GaiaPolynomialCoeffs object (opaque, hidden)
    83         -
    84         - \sa GaiaPolynomialCoeffsPtr
    85         - */
    86         -    typedef struct priv_polynomial_coeffs GaiaPolynomialCoeffs;
    87         -/**
    88         - Typedef for GaiaPolynomialCoeffsPtr object pointer (opaque, hidden)
    89         -
    90         - \sa GaiaPolynomialCoeffs
    91         - */
    92         -    typedef GaiaPolynomialCoeffs *GaiaPolynomialCoeffsPtr;
    93         -
    94     70   
    95     71   /* function prototypes */
    96     72   
    97     73   /**
    98     74    Creates a Control Points container (opaque object)
    99     75   
   100     76    \param allocation_incr how many Control Points should be allocated
   101     77    every time that necessity arises to increment the internal storage
   102     78    \param has3d true if the Control Points are all expected to be 3D
   103         - \param order polynomial order: 1 or 2 or 3
   104     79    \param tps true if the solution method must be Thin Plate Spline
   105     80   
   106     81    \return the handle of the container object, or NULL on failure
   107     82   
   108     83    \sa gaiaFreeControlPoints, gaiaAddControlPoint3D, gaiaAddControlPoint2D,
   109     84     gaiaAffineFromControlPoints
   110     85   
   111     86    \note you must properly destroy the container object when it 
   112     87    isn't any longer used.
   113     88    */
   114     89       GAIACP_DECLARE GaiaControlPointsPtr gaiaCreateControlPoints (int
   115     90   								 allocation_incr,
   116     91   								 int has3d,
   117         -								 int order,
   118     92   								 int tps);
   119     93   
   120     94   /**
   121     95    Destroys a Control Points container (opaque object)
   122     96   
   123     97    \param cp_handle the handle identifying the container object  
   124     98    (returned by a previous call to gaiaCreateControlPoints).
................................................................................
   135    109    \param x0 X coordinate of the first Point.
   136    110    \param y0 Y coordinate of the first Point.
   137    111    \param z0 Z coordinate of the first Point.
   138    112    \param x1 X coordinate of the second Point.
   139    113    \param y1 Y coordinate of the second Point.
   140    114    \param z1 Z coordinate of the second Point.
   141    115    
   142         - \return 0 on failure: any other different value on success.
          116  + \return true on succes, false on failure
   143    117   
   144    118    \sa gaiaCreateControlPoints, gaiaAddControlPoint2D
   145    119    */
   146    120       GAIACP_DECLARE int gaiaAddControlPoint3D (GaiaControlPointsPtr cp_handle,
   147    121   					      double x0, double y0, double z0,
   148    122   					      double x1, double y1, double z1);
   149    123   
................................................................................
   153    127    \param cp_handle the handle identifying the container object  
   154    128    (returned by a previous call to gaiaCreateControlPoints).
   155    129    \param x0 X coordinate of the first Point.
   156    130    \param y0 Y coordinate of the first Point.
   157    131    \param x1 X coordinate of the second Point.
   158    132    \param y1 Y coordinate of the second Point.
   159    133    
   160         - \return 0 on failure: any other different value on success.
          134  + \return true on succes, false on failure
   161    135   
   162    136    \sa gaiaCreateControlPoints, gaiaAddControlPoint3D
   163    137    */
   164    138       GAIACP_DECLARE int gaiaAddControlPoint2D (GaiaControlPointsPtr cp_handle,
   165    139   					      double x0, double y0, double x1,
   166    140   					      double y1);
   167    141   
   168    142   /**
   169    143    Resolves a Control Point set by computing an Affine Transform Matrix
   170    144   
   171    145    \param cp_handle the handle identifying the container object  
   172    146    (returned by a previous call to gaiaCreateControlPoints).
   173         - \param blob on completion this variable will contain a BLOB-encoded
   174         -  Polynomial coeffs object
   175         - \param blob_sz on completion this variable will contain the BLOB's size
   176         -  (in bytes)
          147  + 
          148  + \return true on succes, false on failure
   177    149   
   178         - \return 0 on failure: any other different value on success.
   179         -
   180         - \sa gaiaCreateControlPoints, gaiaPolynomialIsValid, gaiaPolynomialAsText,
   181         -  gaiaPolynomialTransformGeometry
          150  + \sa gaiaCreateControlPoints
   182    151    */
   183         -    GAIACP_DECLARE int gaiaCreatePolynomialCoeffs (GaiaControlPointsPtr
   184         -						   cp_handle,
   185         -						   unsigned char **blob,
   186         -						   int *blob_sz);
   187         -
   188         -/**
   189         - Testing a BLOB-Polynomial for validity
   190         - \param blob pointer to a BLOB-encoded Polynomial coeffs object
   191         - \param blob_sz BLOB's size (in bytes)
   192         -
   193         - \return TRUE if the BLOB really is of the BLOB-Polynomial type; FALSE if not.
   194         -
   195         - \sa gaiaCreatePolynomialCoeffs, gaiaPolynomialAsText
   196         - */
   197         -    GAIACP_DECLARE int gaiaPolynomialIsValid (const unsigned char *blob,
   198         -					      int blob_sz);
   199         -
   200         -/**
   201         - Printing a textual represention from a BLOB-Matrix
   202         - \param blob pointer to a BLOB-encoded Polynomial coeffs object
   203         - \param blob_sz BLOB's size (in bytes)
   204         -
   205         - \return a text string; NULL on failure.
   206         -
   207         - \sa gaiaCreateControlPoints, gaiaPolynomialIsValid, 
   208         - gaiaPolynomialTransformGeometry
   209         -  
   210         - \note you are responsible to destroy (before or after) any text
   211         -  string returned by this function by calling sqlite3_free().
   212         - */
   213         -    GAIACP_DECLARE char *gaiaPolynomialAsText (const unsigned char *blob,
   214         -					       int blob_sz);
   215         -
   216         -/**
   217         - Transforming a Geometry accordingly to an Affine Transform Matrix
   218         - \param geom the input Geometry
   219         - \param blob pointer to a BLOB-encoded Polynomial coeffs object 
   220         - \param blob_sz BLOB's size (in bytes)
   221         -
   222         - \return 0 pointer to the transformed Geometry or NULL on failure.
   223         -
   224         - \sa gaiaCreateControlPoints, gaiaPolynomialIsValid, 
   225         - gaiaPolynomialAsText
   226         -
   227         - \note you are responsible to destroy (before or after) any Geometry
   228         -  returned by this function.
   229         - */
   230         -    GAIACP_DECLARE gaiaGeomCollPtr
   231         -	gaiaPolynomialTransformGeometry (gaiaGeomCollPtr geom,
   232         -					 const unsigned char *blob,
   233         -					 int blob_sz);
   234         -
   235         -/**
   236         - Converts a Polynomial coeffs object into an Affine Transsform Matrix
   237         -
   238         - \param iblob pointer to a BLOB-encoded Polynomial coeffs object 
   239         - \param iblob_sz BLOB's size (in bytes)
   240         - \param oblob on completion this variable will contain a BLOB-encoded
   241         -  Affine Transform Matrix object
   242         - \param oblob_sz on completion this variable will contain the BLOB's size
   243         -  (in bytes)
   244         -
   245         - \return 0 on failure: any other different value on success.
   246         -
   247         - \sa gaiaCreateControlPoints, gaiaPolynomialIsValid, gaiaPolynomialAsText,
   248         -  gaiaPolynomialTransformGeometry, gaiaPolynomialToMatrix
   249         - */
   250         -    GAIACP_DECLARE int gaiaPolynomialToMatrix (const unsigned char *iblob,
   251         -					       int iblob_sz,
   252         -					       unsigned char **oblob,
   253         -					       int *oblob_sz);
          152  +    GAIACP_DECLARE int gaiaAffineFromControlPoints (GaiaControlPointsPtr
          153  +						    cp_handle);
   254    154   
   255    155   #ifdef __cplusplus
   256    156   }
   257    157   #endif
   258    158   
   259    159   #endif				/* _GAIACP_H */

Changes to src/headers/spatialite/gaiamatrix.h.

   126    126     affine transform Matrix
   127    127    \param blob_sz on completion this variable will contain the BLOB's size
   128    128     (in bytes)
   129    129   
   130    130    \return 0 on failure: any other different value on success.
   131    131   
   132    132    \sa gaia_matrix_create, gaia_matrix_is_valid, gaia_matrix_as_text, 
   133         -  gaia_matrix_create_multiply, gaia_matrix_transform_geometry,
   134         -  gaia_matrix_invert
          133  +  gaia_matrix_create_multiply, gaia_matrix_transform_geometry
   135    134   
   136    135    \note you are responsible to destroy (before or after) any BLOB
   137    136     returned by this function.
   138    137    */
   139    138       GAIAMATRIX_DECLARE int gaia_matrix_multiply (const unsigned char *iblob1,
   140    139   						 int iblob1_sz,
   141    140   						 const unsigned char *iblob2,
................................................................................
   213    212    */
   214    213       GAIAMATRIX_DECLARE char *gaia_matrix_as_text (const unsigned char *blob,
   215    214   						  int blob_sz);
   216    215   
   217    216   /**
   218    217    Transforming a Geometry accordingly to an Affine Transform Matrix
   219    218    \param geom the input Geometry
   220         - \param blob pointer to a BLOB-encoded Matrix 
   221         - \param blob_sz BLOB's size (in bytes)
          219  + \param iblob pointer to a BLOB-encoded Matrix 
          220  + \param iblob_sz BLOB's size (in bytes)
   222    221   
   223         - \return pointer to the transformed Geometry or NULL on failure.
          222  + \return 0 pointer to the transformed Geometry or NULL on failure.
   224    223   
   225    224    \sa gaia_matrix_create, gaia_matrix_is_valid, gaia_matrix_as_text, 
   226    225     gaia_matrix_multiply, gaia_matrix_create_multiply
   227    226   
   228    227    \note you are responsible to destroy (before or after) any Geometry
   229    228     returned by this function.
   230    229    */
   231    230       GAIAMATRIX_DECLARE gaiaGeomCollPtr
   232    231   	gaia_matrix_transform_geometry (gaiaGeomCollPtr geom,
   233    232   					const unsigned char *blob, int blob_sz);
   234    233   
   235         -/**
   236         - Computing the Determinant from an Affine Transform Matrix
   237         - \param blob pointer to a BLOB-encoded Matrix 
   238         - \param blob_sz BLOB's size (in bytes)
   239         -
   240         - \return the Determinant of the Matix; 0.0 on invalid args.
   241         -
   242         - \sa gaia_matrix_create, gaia_matrix_is_valid, gaia_matrix_invert
   243         - \note you are responsible to destroy (before or after) any Geometry
   244         -  returned by this function.
   245         - */
   246         -    GAIAMATRIX_DECLARE double
   247         -	gaia_matrix_determinant (const unsigned char *blob, int blob_sz);
   248         -
   249         -/**
   250         - Creating a BLOB-Matrix by applying a further trasformation to a previous BLOB-Matrix
   251         - \param iblob pointer to a BLOB-encoded Matrix
   252         - \param iblob_sz BLOB's size (in bytes)
   253         - \param blob on completion this variable will contain a BLOB-encoded
   254         -  affine transform Matrix (Inverse)
   255         - \param blob_sz on completion this variable will contain the BLOB's size
   256         -  (in bytes)
   257         -
   258         - \return 0 on failure: any other different value on success.
   259         - Note that not all Matrices can be Inverted, only those having
   260         - a valid Determinant.
   261         -
   262         - \sa gaia_matrix_create, gaia_matrix_is_valid, gaia_matrix_multiply, 
   263         - gaia_matrix_determinant
   264         -
   265         - \note you are responsible to destroy (before or after) any BLOB
   266         -  returned by this function.
   267         - */
   268         -    GAIAMATRIX_DECLARE int gaia_matrix_invert (const unsigned char
   269         -					       *iblob, int iblob_sz,
   270         -					       unsigned char **blob,
   271         -					       int *blob_sz);
   272         -
   273    234   #ifdef __cplusplus
   274    235   }
   275    236   #endif
   276    237   
   277    238   #endif				/* _GAIAMATRIX_H */

Changes to src/headers/spatialite/gg_formats.h.

   440    440    Creates a Geometry object from the corresponding BLOB-Geometry 
   441    441   
   442    442    \param blob pointer to BLOB-Geometry
   443    443    \param size the BLOB's size
   444    444   
   445    445    \return the pointer to the newly created Geometry object: NULL on failure
   446    446   
   447         - \sa gaiaFreeGeomColl, gaiaToSpatiaLiteBlobWkb, gaiaToCompressedBlobWkb,
   448         - gaiaFromSpatiaLiteBlobWkbEx
          447  + \sa gaiaFreeGeomColl, gaiaToSpatiaLiteBlobWkb, gaiaToCompressedBlobWkb
   449    448   
   450    449    \note you are responsible to destroy (before or after) any allocated Geometry,
   451    450    unless you've passed ownership of the Geometry object to some further object:
   452    451    in this case destroying the higher order object will implicitly destroy any 
   453    452    contained child object. 
   454    453    */
   455    454       GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromSpatiaLiteBlobWkb (const unsigned
   456    455   							       char *blob,
   457    456   							       unsigned int
   458    457   							       size);
   459    458   
   460         -/**
   461         - Creates a Geometry object from the corresponding BLOB-Geometry 
   462         -
   463         - \param blob pointer to BLOB-Geometry
   464         - \param size the BLOB's size
   465         - \param gpkg_amphibious is set to TRUE will indifferenctly accept
   466         -  either SpatiaLite Geometry-BLOBs or GPKG Geometry-BLOBs
   467         -
   468         - \return the pointer to the newly created Geometry object: NULL on failure
   469         -
   470         - \sa gaiaFreeGeomColl, gaiaToSpatiaLiteBlobWkb, gaiaToCompressedBlobWkb
   471         -
   472         - \note you are responsible to destroy (before or after) any allocated Geometry,
   473         - unless you've passed ownership of the Geometry object to some further object:
   474         - in this case destroying the higher order object will implicitly destroy any 
   475         - contained child object. 
   476         - */
   477         -    GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromSpatiaLiteBlobWkbEx (const unsigned
   478         -								 char *blob,
   479         -								 unsigned int
   480         -								 size,
   481         -								 int
   482         -								 gpkg_amphibious);
   483         -
   484    459   /**
   485    460    Creates a BLOB-Geometry corresponding to a Geometry object
   486    461   
   487    462    \param geom pointer to the Geometry object.
   488    463    \param result on completion will containt a pointer to BLOB-Geometry:
   489    464    NULL on failure.
   490    465    \param size on completion this variable will contain the BLOB's size (in bytes)
................................................................................
   771    746   
   772    747   /**
   773    748    Encodes a Geometry object into WKT notation
   774    749   
   775    750    \param out_buf pointer to dynamically growing Text buffer
   776    751    \param geom pointer to Geometry object
   777    752   
   778         - \sa gaiaParseWkt, gaiaOutWktStrict, gaiaParseEWKT, gaiaToEWKT,
   779         - gaiaOutWktEx
          753  + \sa gaiaParseWkt, gaiaOutWktStrict, gaiaParseEWKT, gaiaToEWKT
   780    754   
   781    755    \note this function will apply 3D WKT encoding as internally intended by
   782    756    SpatiaLite: not necessarily intended by other OGC-like implementations.
   783    757    \n Anyway, 2D WKT is surely standard and safely interoperable.
   784    758    */
   785    759       GAIAGEO_DECLARE void gaiaOutWkt (gaiaOutBufferPtr out_buf,
   786    760   				     gaiaGeomCollPtr geom);
   787    761   
   788         -/**
   789         - Encodes a Geometry object into WKT notation
   790         -
   791         - \param out_buf pointer to dynamically growing Text buffer
   792         - \param geom pointer to Geometry object
   793         - \param precision decimal digits to be used for coordinates
   794         -
   795         - \sa gaiaParseWkt, gaiaOutWktStrict, gaiaParseEWKT, gaiaToEWKT
   796         -
   797         - \note this function will apply 3D WKT encoding as internally intended by
   798         - SpatiaLite: not necessarily intended by other OGC-like implementations.
   799         - \n Anyway, 2D WKT is surely standard and safely interoperable.
   800         - */
   801         -    GAIAGEO_DECLARE void gaiaOutWktEx (gaiaOutBufferPtr out_buf,
   802         -				       gaiaGeomCollPtr geom, int precision);
   803         -
   804    762   /**
   805    763    Encodes a Geometry object into strict 2D WKT notation
   806    764   
   807    765    \param out_buf pointer to dynamically growing Text buffer
   808    766    \param geom pointer to Geometry object
   809    767    \param precision decimal digits to be used for coordinates
   810    768   
................................................................................
   849    807   
   850    808   /**
   851    809    Encodes a WKT 3D Point [XYZ]
   852    810   
   853    811    \param out_buf pointer to dynamically growing Text buffer
   854    812    \param point pointer to Point object
   855    813   
   856         - \sa gaiaOutLinestringZ, gaiaOutPolygonZ, gaiaOutPointZex
          814  + \sa gaiaOutLinestringZ, gaiaOutPolygonZ
   857    815    
   858    816    \remark mainly intended for internal usage.
   859    817    */
   860    818       GAIAGEO_DECLARE void gaiaOutPointZ (gaiaOutBufferPtr out_buf,
   861    819   					gaiaPointPtr point);
   862    820   
   863         -/**
   864         - Encodes a WKT 3D Point [XYZ]
   865         -
   866         - \param out_buf pointer to dynamically growing Text buffer
   867         - \param point pointer to Point object
   868         - \param precision decimal digits to be used for coordinates
   869         -
   870         - \sa gaiaOutLinestringZ, gaiaOutPolygonZ
   871         - 
   872         - \remark mainly intended for internal usage.
   873         - */
   874         -    GAIAGEO_DECLARE void gaiaOutPointZex (gaiaOutBufferPtr out_buf,
   875         -					  gaiaPointPtr point, int precision);
   876         -
   877    821   /**
   878    822    Encodes a WKT 3D Linestring [XYZ]
   879    823   
   880    824    \param out_buf pointer to dynamically growing Text buffer
   881    825    \param linestring pointer to Linestring object
   882    826   
   883         - \sa gaiaOutPointZ, gaiaOutPolygonZ, gaiaOutLinestringZex
          827  + \sa gaiaOutPointZ, gaiaOutPolygonZ
   884    828    
   885    829    \remark mainly intended for internal usage.
   886    830    */
   887    831       GAIAGEO_DECLARE void gaiaOutLinestringZ (gaiaOutBufferPtr out_buf,
   888    832   					     gaiaLinestringPtr linestring);
   889    833   
   890         -/**
   891         - Encodes a WKT 3D Linestring [XYZ]
   892         -
   893         - \param out_buf pointer to dynamically growing Text buffer
   894         - \param linestring pointer to Linestring object
   895         - \param precision decimal digits to be used for coordinates
   896         -
   897         - \sa gaiaOutPointZ, gaiaOutPolygonZ
   898         - 
   899         - \remark mainly intended for internal usage.
   900         - */
   901         -    GAIAGEO_DECLARE void gaiaOutLinestringZex (gaiaOutBufferPtr out_buf,
   902         -					       gaiaLinestringPtr linestring,
   903         -					       int precision);
   904         -
   905    834   /**
   906    835    Encodes a WKT 3D Polygon [XYZ]
   907    836   
   908    837    \param out_buf pointer to dynamically growing Text buffer
   909    838    \param polygon pointer to Point object
   910    839   
   911         - \sa gaiaOutPointZ, gaiaOutLinestringZ, gaiaOutPolygonZex
          840  + \sa gaiaOutPointZ, gaiaOutLinestringZ
   912    841    
   913    842    \remark mainly intended for internal usage.
   914    843    */
   915    844       GAIAGEO_DECLARE void gaiaOutPolygonZ (gaiaOutBufferPtr out_buf,
   916    845   					  gaiaPolygonPtr polygon);
   917         -
   918         -/**
   919         - Encodes a WKT 3D Polygon [XYZ]
   920         -
   921         - \param out_buf pointer to dynamically growing Text buffer
   922         - \param polygon pointer to Point object
   923         - \param precision decimal digits to be used for coordinates
   924         -
   925         - \sa gaiaOutPointZ, gaiaOutLinestringZ
   926         - 
   927         - \remark mainly intended for internal usage.
   928         - */
   929         -    GAIAGEO_DECLARE void gaiaOutPolygonZex (gaiaOutBufferPtr out_buf,
   930         -					    gaiaPolygonPtr polygon,
   931         -					    int precision);
   932         -
   933    846   /**
   934    847    Creates a Geometry object from KML notation
   935    848   
   936    849    \param in_buffer pointer to KML buffer
   937    850   
   938    851    \return the pointer to the newly created Geometry object: NULL on failure
   939    852   

Changes to src/headers/spatialite_private.h.

   126    126       };
   127    127   
   128    128   #define MAX_XMLSCHEMA_CACHE	16
   129    129   
   130    130       struct splite_internal_cache
   131    131       {
   132    132   	unsigned char magic1;
   133         -	int gpkg_amphibious_mode;
   134         -	int decimal_precision;
   135    133   	void *GEOS_handle;
   136    134   	void *PROJ_handle;
   137    135   	void *xmlParsingErrors;
   138    136   	void *xmlSchemaValidationErrors;
   139    137   	void *xmlXPathErrors;
   140    138   	struct splite_geos_cache_item cacheItem1;
   141    139   	struct splite_geos_cache_item cacheItem2;
................................................................................
   172    170       {
   173    171   	/* a struct to implement ATM_ControlPoints - aggregate function */
   174    172   	int count;
   175    173   	int allocation_incr;
   176    174   	int allocated_items;
   177    175   	int has3d;
   178    176   	int tps;
   179         -	int order;
   180    177   	/* point set A */
   181    178   	double *x0;
   182    179   	double *y0;
   183    180   	double *z0;
   184    181   	/* point set B */
   185    182   	double *x1;
   186    183   	double *y1;
................................................................................
   246    243   
   247    244       SPATIALITE_PRIVATE void initialize_epsg (int filter,
   248    245   					     struct epsg_defs **first,
   249    246   					     struct epsg_defs **last);
   250    247   
   251    248       SPATIALITE_PRIVATE void free_epsg (struct epsg_defs *first);
   252    249   
   253         -    SPATIALITE_PRIVATE int exists_spatial_ref_sys (void *handle);
   254         -
   255    250       SPATIALITE_PRIVATE int checkSpatialMetaData (const void *sqlite);
   256    251   
   257    252       SPATIALITE_PRIVATE int delaunay_triangle_check (void *pg);
   258    253   
   259    254       SPATIALITE_PRIVATE void *voronoj_build (int pgs, void *first,
   260    255   					    double extra_frame_size);
   261    256   
................................................................................
   324    319   						const char *table,
   325    320   						const char *column,
   326    321   						int stat_type, void *p_lyr);
   327    322   
   328    323       SPATIALITE_PRIVATE void getProjParams (void *p_sqlite, int srid,
   329    324   					   char **params);
   330    325   
   331         -    SPATIALITE_PRIVATE void getProjParamsEx (void *p_sqlite, int srid,
   332         -					     char **params,
   333         -					     int gpkg_amphibious_mode);
   334         -
   335    326       SPATIALITE_PRIVATE int getEllipsoidParams (void *p_sqlite, int srid,
   336    327   					       double *a, double *b,
   337    328   					       double *rf);
   338    329   
   339    330       SPATIALITE_PRIVATE void addVectorLayer (void *list, const char *layer_type,
   340    331   					    const char *table_name,
   341    332   					    const char *geometry_column,
................................................................................
   659    650       SPATIALITE_PRIVATE void gaiaAuxClonerAddOption (const void *cloner,
   660    651   						    const char *option);
   661    652   
   662    653       SPATIALITE_PRIVATE int gaiaAuxClonerCheckValidTarget (const void *cloner);
   663    654   
   664    655       SPATIALITE_PRIVATE int gaiaAuxClonerExecute (const void *cloner);
   665    656   
   666         -    SPATIALITE_PRIVATE int gaia_matrix_to_arrays (const unsigned char *blob,
   667         -						  int blob_sz, double *E,
   668         -						  double *N, double *Z);
   669         -
   670    657   #ifdef __cplusplus
   671    658   }
   672    659   #endif
   673    660   
   674    661   #endif				/* _SPATIALITE_PRIVATE_H */

Changes to src/spatialite/spatialite.c.

  7514   7514   / or NULL if any error is encountered
  7515   7515   */
  7516   7516       unsigned char *p_blob;
  7517   7517       int n_bytes;
  7518   7518       int len;
  7519   7519       gaiaOutBuffer out_buf;
  7520   7520       gaiaGeomCollPtr geo = NULL;
  7521         -    int decimal_precision = -1;
  7522         -    int gpkg_amphibious = 0;
  7523         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  7524   7521       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  7525         -    if (cache != NULL)
  7526         -      {
  7527         -	  decimal_precision = cache->decimal_precision;
  7528         -	  gpkg_amphibious = cache->gpkg_amphibious_mode;
  7529         -      }
  7530   7522       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  7531   7523         {
  7532   7524   	  sqlite3_result_null (context);
  7533   7525   	  return;
  7534   7526         }
  7535   7527       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  7536   7528       n_bytes = sqlite3_value_bytes (argv[0]);
  7537   7529       gaiaOutBufferInitialize (&out_buf);
  7538         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         7530  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  7539   7531       if (!geo)
  7540   7532   	sqlite3_result_null (context);
  7541   7533       else
  7542   7534         {
  7543         -	  if (decimal_precision >= 0)
  7544         -	      gaiaOutWktEx (&out_buf, geo, decimal_precision);
  7545         -	  else
  7546         -	      gaiaOutWkt (&out_buf, geo);
         7535  +	  gaiaOutWkt (&out_buf, geo);
  7547   7536   	  if (out_buf.Error || out_buf.Buffer == NULL)
  7548   7537   	      sqlite3_result_null (context);
  7549   7538   	  else
  7550   7539   	    {
  7551   7540   		len = out_buf.WriteOffset;
  7552   7541   		sqlite3_result_text (context, out_buf.Buffer, len, free);
  7553   7542   		out_buf.Buffer = NULL;
................................................................................
  7568   7557   */
  7569   7558       unsigned char *p_blob;
  7570   7559       int n_bytes;
  7571   7560       int len;
  7572   7561       int precision = 15;
  7573   7562       gaiaOutBuffer out_buf;
  7574   7563       gaiaGeomCollPtr geo = NULL;
  7575         -    int gpkg_amphibious = 0;
  7576         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  7577   7564       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  7578         -    if (cache != NULL)
  7579         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  7580   7565       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  7581   7566         {
  7582   7567   	  sqlite3_result_null (context);
  7583   7568   	  return;
  7584   7569         }
  7585   7570       if (argc == 2)
  7586   7571         {
................................................................................
  7590   7575   	    {
  7591   7576   		sqlite3_result_null (context);
  7592   7577   		return;
  7593   7578   	    }
  7594   7579         }
  7595   7580       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  7596   7581       n_bytes = sqlite3_value_bytes (argv[0]);
  7597         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         7582  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  7598   7583       gaiaOutBufferInitialize (&out_buf);
  7599   7584       if (!geo)
  7600   7585   	sqlite3_result_null (context);
  7601   7586       else
  7602   7587         {
  7603   7588   	  gaiaOutWktStrict (&out_buf, geo, precision);
  7604   7589   	  if (out_buf.Error || out_buf.Buffer == NULL)
................................................................................
  7634   7619      returns the corresponding SVG encoded value or NULL if any error is encountered
  7635   7620   */
  7636   7621       unsigned char *p_blob;
  7637   7622       int n_bytes;
  7638   7623       int len;
  7639   7624       gaiaOutBuffer out_buf;
  7640   7625       gaiaGeomCollPtr geo = NULL;
  7641         -    int gpkg_amphibious = 0;
  7642         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  7643   7626       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  7644         -    if (cache != NULL)
  7645         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  7646   7627       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  7647   7628         {
  7648   7629   	  sqlite3_result_null (context);
  7649   7630   	  return;
  7650   7631         }
  7651   7632       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  7652   7633       n_bytes = sqlite3_value_bytes (argv[0]);
  7653         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         7634  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  7654   7635       if (!geo)
  7655   7636         {
  7656   7637   	  sqlite3_result_null (context);
  7657   7638   	  return;
  7658   7639         }
  7659   7640       else
  7660   7641         {
................................................................................
  7713   7694   		    sqlite3_value_int (argv[2]));
  7714   7695       else
  7715   7696   	sqlite3_result_null (context);
  7716   7697   }
  7717   7698   
  7718   7699   /* END of Klaus Foerster AsSvg() implementation */
  7719   7700   
         7701  +SPATIALITE_PRIVATE void
         7702  +getProjParams (void *p_sqlite, int srid, char **proj_params)
         7703  +{
         7704  +/* retrives the PROJ params from SPATIAL_SYS_REF table, if possible */
         7705  +    sqlite3 *sqlite = (sqlite3 *) p_sqlite;
         7706  +    char *sql;
         7707  +    char **results;
         7708  +    int rows;
         7709  +    int columns;
         7710  +    int i;
         7711  +    int ret;
         7712  +    int len;
         7713  +    const char *proj4text;
         7714  +    char *errMsg = NULL;
         7715  +    *proj_params = NULL;
         7716  +    sql = sqlite3_mprintf
         7717  +	("SELECT proj4text FROM spatial_ref_sys WHERE srid = %d", srid);
         7718  +    ret = sqlite3_get_table (sqlite, sql, &results, &rows, &columns, &errMsg);
         7719  +    sqlite3_free (sql);
         7720  +    if (ret != SQLITE_OK)
         7721  +      {
         7722  +	  spatialite_e ("unknown SRID: %d\t<%s>\n", srid, errMsg);
         7723  +	  sqlite3_free (errMsg);
         7724  +	  return;
         7725  +      }
         7726  +    for (i = 1; i <= rows; i++)
         7727  +      {
         7728  +	  proj4text = results[(i * columns)];
         7729  +	  if (proj4text != NULL)
         7730  +	    {
         7731  +		len = strlen (proj4text);
         7732  +		*proj_params = malloc (len + 1);
         7733  +		strcpy (*proj_params, proj4text);
         7734  +	    }
         7735  +      }
         7736  +    if (*proj_params == NULL)
         7737  +	spatialite_e ("unknown SRID: %d\n", srid);
         7738  +    sqlite3_free_table (results);
         7739  +}
  7720   7740   
  7721   7741   #ifndef OMIT_PROJ		/* PROJ.4 is strictly required to support KML */
  7722   7742   static void
  7723   7743   fnct_AsKml1 (sqlite3_context * context, int argc, sqlite3_value ** argv)
  7724   7744   {
  7725   7745   /* SQL function:
  7726   7746   / AsKml(BLOB encoded geometry [, Integer precision])
................................................................................
  7735   7755       gaiaGeomCollPtr geo = NULL;
  7736   7756       gaiaGeomCollPtr geo_wgs84;
  7737   7757       char *proj_from;
  7738   7758       char *proj_to;
  7739   7759       int precision = 15;
  7740   7760       void *data = sqlite3_user_data (context);
  7741   7761       sqlite3 *sqlite = sqlite3_context_db_handle (context);
  7742         -    int gpkg_amphibious = 0;
  7743         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  7744   7762       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  7745         -    if (cache != NULL)
  7746         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  7747   7763       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  7748   7764         {
  7749   7765   	  sqlite3_result_null (context);
  7750   7766   	  return;
  7751   7767         }
  7752   7768       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  7753   7769       n_bytes = sqlite3_value_bytes (argv[0]);
................................................................................
  7758   7774   	  else
  7759   7775   	    {
  7760   7776   		sqlite3_result_null (context);
  7761   7777   		return;
  7762   7778   	    }
  7763   7779         }
  7764   7780       gaiaOutBufferInitialize (&out_buf);
  7765         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         7781  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  7766   7782       if (!geo)
  7767   7783   	sqlite3_result_null (context);
  7768   7784       else
  7769   7785         {
  7770   7786   	  if (geo->Srid == 4326)
  7771   7787   	      ;			/* already WGS84 */
  7772   7788   	  else if (geo->Srid <= 0)
................................................................................
  7844   7860       char dummy[128];
  7845   7861       char *xdummy;
  7846   7862       char *proj_from;
  7847   7863       char *proj_to;
  7848   7864       int precision = 15;
  7849   7865       void *data = sqlite3_user_data (context);
  7850   7866       sqlite3 *sqlite = sqlite3_context_db_handle (context);
  7851         -    int gpkg_amphibious = 0;
  7852         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  7853   7867       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  7854         -    if (cache != NULL)
  7855         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  7856   7868       switch (sqlite3_value_type (argv[0]))
  7857   7869         {
  7858   7870         case SQLITE_TEXT:
  7859   7871   	  name = (const char *) sqlite3_value_text (argv[0]);
  7860   7872   	  len = strlen (name);
  7861   7873   	  name_malloc = malloc (len + 1);
  7862   7874   	  strcpy (name_malloc, name);
................................................................................
  7933   7945   	      precision = sqlite3_value_int (argv[3]);
  7934   7946   	  else
  7935   7947   	    {
  7936   7948   		sqlite3_result_null (context);
  7937   7949   		goto stop;
  7938   7950   	    }
  7939   7951         }
  7940         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         7952  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  7941   7953       if (!geo)
  7942   7954   	sqlite3_result_null (context);
  7943   7955       else
  7944   7956         {
  7945   7957   	  if (geo->Srid == 4326)
  7946   7958   	      ;			/* already WGS84 */
  7947   7959   	  else if (geo->Srid == 0)
................................................................................
  8039   8051       unsigned char *p_blob;
  8040   8052       int n_bytes;
  8041   8053       int len;
  8042   8054       int version = 2;
  8043   8055       int precision = 15;
  8044   8056       gaiaOutBuffer out_buf;
  8045   8057       gaiaGeomCollPtr geo = NULL;
  8046         -    int gpkg_amphibious = 0;
  8047         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  8048   8058       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  8049         -    if (cache != NULL)
  8050         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  8051   8059       if (argc == 3)
  8052   8060         {
  8053   8061   	  if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
  8054   8062   	      version = sqlite3_value_int (argv[0]);
  8055   8063   	  else
  8056   8064   	    {
  8057   8065   		sqlite3_result_null (context);
................................................................................
  8101   8109   		sqlite3_result_null (context);
  8102   8110   		return;
  8103   8111   	    }
  8104   8112   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  8105   8113   	  n_bytes = sqlite3_value_bytes (argv[0]);
  8106   8114         }
  8107   8115       gaiaOutBufferInitialize (&out_buf);
  8108         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         8116  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  8109   8117       if (!geo)
  8110   8118   	sqlite3_result_null (context);
  8111   8119       else
  8112   8120         {
  8113   8121   	  /* produce GML-notation - actual work is done in gaiageo/gg_wkt.c */
  8114   8122   	  gaiaOutGml (&out_buf, version, precision, geo);
  8115   8123   	  if (out_buf.Error || out_buf.Buffer == NULL)
................................................................................
  8152   8160       unsigned char *p_blob;
  8153   8161       int n_bytes;
  8154   8162       int len;
  8155   8163       int precision = 15;
  8156   8164       int options = 0;
  8157   8165       gaiaOutBuffer out_buf;
  8158   8166       gaiaGeomCollPtr geo = NULL;
  8159         -    int gpkg_amphibious = 0;
  8160         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  8161   8167       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  8162         -    if (cache != NULL)
  8163         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  8164   8168       if (argc == 3)
  8165   8169         {
  8166   8170   	  if (sqlite3_value_type (argv[0]) == SQLITE_BLOB
  8167   8171   	      && sqlite3_value_type (argv[1]) == SQLITE_INTEGER
  8168   8172   	      && sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
  8169   8173   	    {
  8170   8174   		p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
................................................................................
  8204   8208   		sqlite3_result_null (context);
  8205   8209   		return;
  8206   8210   	    }
  8207   8211   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  8208   8212   	  n_bytes = sqlite3_value_bytes (argv[0]);
  8209   8213         }
  8210   8214       gaiaOutBufferInitialize (&out_buf);
  8211         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         8215  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  8212   8216       if (!geo)
  8213   8217   	sqlite3_result_null (context);
  8214   8218       else
  8215   8219         {
  8216   8220   	  /* produce GeoJSON-notation - actual work is done in gaiageo/gg_wkt.c */
  8217   8221   	  gaiaOutGeoJSON (&out_buf, geo, precision, options);
  8218   8222   	  if (out_buf.Error || out_buf.Buffer == NULL)
................................................................................
  8238   8242   / or NULL if any error is encountered
  8239   8243   */
  8240   8244       unsigned char *p_blob;
  8241   8245       int n_bytes;
  8242   8246       int len;
  8243   8247       unsigned char *p_result = NULL;
  8244   8248       gaiaGeomCollPtr geo = NULL;
  8245         -    int gpkg_amphibious = 0;
  8246         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  8247   8249       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  8248         -    if (cache != NULL)
  8249         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  8250   8250       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  8251   8251         {
  8252   8252   	  sqlite3_result_null (context);
  8253   8253   	  return;
  8254   8254         }
  8255   8255       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  8256   8256       n_bytes = sqlite3_value_bytes (argv[0]);
  8257         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         8257  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  8258   8258       if (!geo)
  8259   8259   	sqlite3_result_null (context);
  8260   8260       else
  8261   8261         {
  8262   8262   	  gaiaToWkb (geo, &p_result, &len);
  8263   8263   	  if (!p_result)
  8264   8264   	      sqlite3_result_null (context);
................................................................................
  8279   8279   */
  8280   8280       unsigned char *p_blob;
  8281   8281       int n_bytes;
  8282   8282       int len;
  8283   8283       unsigned char *p_result = NULL;
  8284   8284       gaiaGeomCollPtr geo = NULL;
  8285   8285       int coord_dims;
  8286         -    int gpkg_amphibious = 0;
  8287         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  8288   8286       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  8289         -    if (cache != NULL)
  8290         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  8291   8287       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  8292   8288         {
  8293   8289   	  sqlite3_result_null (context);
  8294   8290   	  return;
  8295   8291         }
  8296   8292       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  8297   8293       n_bytes = sqlite3_value_bytes (argv[0]);
................................................................................
  8309   8305       else
  8310   8306         {
  8311   8307   	  spatialite_e
  8312   8308   	      ("AsFGF() error: argument 2 [geom_coords] out of range [0,1,2,3]\n");
  8313   8309   	  sqlite3_result_null (context);
  8314   8310   	  return;
  8315   8311         }
  8316         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         8312  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  8317   8313       if (!geo)
  8318   8314   	sqlite3_result_null (context);
  8319   8315       else
  8320   8316         {
  8321   8317   	  gaiaToFgf (geo, &p_result, &len, coord_dims);
  8322   8318   	  if (!p_result)
  8323   8319   	      sqlite3_result_null (context);
................................................................................
  8925   8921   / aggregate function - STEP
  8926   8922   /
  8927   8923   */
  8928   8924       unsigned char *p_blob;
  8929   8925       int n_bytes;
  8930   8926       gaiaGeomCollPtr geom;
  8931   8927       gaiaDynamicLinePtr *p;
  8932         -    int gpkg_amphibious = 0;
  8933         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  8934   8928       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  8935         -    if (cache != NULL)
  8936         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  8937   8929       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  8938   8930         {
  8939   8931   	  sqlite3_result_null (context);
  8940   8932   	  return;
  8941   8933         }
  8942   8934       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  8943   8935       n_bytes = sqlite3_value_bytes (argv[0]);
  8944         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         8936  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  8945   8937       if (!geom)
  8946   8938   	return;
  8947   8939       p = sqlite3_aggregate_context (context, sizeof (gaiaDynamicLinePtr));
  8948   8940       if (!(*p))
  8949   8941         {
  8950   8942   	  /* this is the first row */
  8951   8943   	  *p = gaiaAllocDynamicLine ();
................................................................................
  9212   9204   */
  9213   9205       int len;
  9214   9206       unsigned char *p_blob;
  9215   9207       int n_bytes;
  9216   9208       unsigned char *p_result = NULL;
  9217   9209       gaiaGeomCollPtr geo1 = NULL;
  9218   9210       gaiaGeomCollPtr geo2 = NULL;
  9219         -    int gpkg_amphibious = 0;
  9220         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
  9221   9211       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
  9222         -    if (cache != NULL)
  9223         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
  9224   9212       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
  9225   9213         {
  9226   9214   	  sqlite3_result_null (context);
  9227   9215   	  goto stop;
  9228   9216         }
  9229   9217       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
  9230   9218       n_bytes = sqlite3_value_bytes (argv[0]);
  9231         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         9219  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  9232   9220       if (!geo1)
  9233   9221         {
  9234   9222   	  sqlite3_result_null (context);
  9235   9223   	  goto stop;
  9236   9224         }
  9237   9225       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
  9238   9226         {
................................................................................
  9244   9232       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
  9245   9233         {
  9246   9234   	  sqlite3_result_null (context);
  9247   9235   	  goto stop;
  9248   9236         }
  9249   9237       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
  9250   9238       n_bytes = sqlite3_value_bytes (argv[1]);
  9251         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
         9239  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
  9252   9240       if (!geo2)
  9253   9241         {
  9254   9242   	  sqlite3_result_null (context);
  9255   9243   	  goto stop;
  9256   9244         }
  9257   9245       gaiaMakeLine (geo1, geo2, &p_result, &len);
  9258   9246       if (!p_result)
................................................................................
 10275  10263   /
 10276  10264   */
 10277  10265       unsigned char *p_blob;
 10278  10266       int n_bytes;
 10279  10267       gaiaGeomCollPtr geom;
 10280  10268       gaiaGeomCollPtr result;
 10281  10269       gaiaGeomCollPtr *p;
 10282         -    int gpkg_amphibious = 0;
 10283         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 10284  10270       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 10285         -    if (cache != NULL)
 10286         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 10287  10271       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 10288  10272         {
 10289  10273   	  sqlite3_result_null (context);
 10290  10274   	  return;
 10291  10275         }
 10292  10276       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 10293  10277       n_bytes = sqlite3_value_bytes (argv[0]);
 10294         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        10278  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 10295  10279       if (!geom)
 10296  10280   	return;
 10297  10281       p = sqlite3_aggregate_context (context, sizeof (gaiaGeomCollPtr));
 10298  10282       if (!(*p))
 10299  10283         {
 10300  10284   	  /* this is the first row */
 10301  10285   	  *p = geom;
................................................................................
 10359  10343   / or NULL if any error is encountered
 10360  10344   */
 10361  10345       unsigned char *p_blob;
 10362  10346       int n_bytes;
 10363  10347       gaiaGeomCollPtr geo1 = NULL;
 10364  10348       gaiaGeomCollPtr geo2 = NULL;
 10365  10349       gaiaGeomCollPtr result;
 10366         -    int gpkg_amphibious = 0;
 10367         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 10368  10350       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 10369         -    if (cache != NULL)
 10370         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 10371  10351       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 10372  10352         {
 10373  10353   	  sqlite3_result_null (context);
 10374  10354   	  return;
 10375  10355         }
 10376  10356       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 10377  10357         {
 10378  10358   	  sqlite3_result_null (context);
 10379  10359   	  return;
 10380  10360         }
 10381  10361       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 10382  10362       n_bytes = sqlite3_value_bytes (argv[0]);
 10383         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        10363  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 10384  10364       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 10385  10365       n_bytes = sqlite3_value_bytes (argv[1]);
 10386         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        10366  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 10387  10367       if (!geo1 || !geo2)
 10388  10368   	sqlite3_result_null (context);
 10389  10369       else
 10390  10370         {
 10391  10371   	  void *data = sqlite3_user_data (context);
 10392  10372   	  if (data != NULL)
 10393  10373   	      result = gaiaMergeGeometries_r (data, geo1, geo2);
................................................................................
 10990  10970   / or NULL in any other case
 10991  10971   */
 10992  10972       unsigned char *p_blob;
 10993  10973       int n_bytes;
 10994  10974       int len;
 10995  10975       unsigned char *p_result = NULL;
 10996  10976       gaiaGeomCollPtr geo = NULL;
 10997         -    int gpkg_amphibious = 0;
 10998         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 10999  10977       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11000         -    if (cache != NULL)
 11001         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11002  10978       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11003  10979         {
 11004  10980   	  sqlite3_result_null (context);
 11005  10981   	  return;
 11006  10982         }
 11007  10983       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11008  10984       n_bytes = sqlite3_value_bytes (argv[0]);
 11009         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        10985  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11010  10986       if (!geo)
 11011  10987   	sqlite3_result_null (context);
 11012  10988       else
 11013  10989         {
 11014  10990   	  gaiaToCompressedBlobWkb (geo, &p_result, &len);
 11015  10991   	  sqlite3_result_blob (context, p_result, len, free);
 11016  10992         }
................................................................................
 11028  11004   / or NULL in any other case
 11029  11005   */
 11030  11006       unsigned char *p_blob;
 11031  11007       int n_bytes;
 11032  11008       int len;
 11033  11009       unsigned char *p_result = NULL;
 11034  11010       gaiaGeomCollPtr geo = NULL;
 11035         -    int gpkg_amphibious = 0;
 11036         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11037  11011       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11038         -    if (cache != NULL)
 11039         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11040  11012       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11041  11013         {
 11042  11014   	  sqlite3_result_null (context);
 11043  11015   	  return;
 11044  11016         }
 11045  11017       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11046  11018       n_bytes = sqlite3_value_bytes (argv[0]);
 11047         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11019  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11048  11020       if (!geo)
 11049  11021   	sqlite3_result_null (context);
 11050  11022       else
 11051  11023         {
 11052  11024   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 11053  11025   	  sqlite3_result_blob (context, p_result, len, free);
 11054  11026         }
................................................................................
 11072  11044   */
 11073  11045       unsigned char *p_blob;
 11074  11046       int n_bytes;
 11075  11047       int len;
 11076  11048       unsigned char *p_result = NULL;
 11077  11049       gaiaGeomCollPtr geo = NULL;
 11078  11050       gaiaGeomCollPtr sanitized = NULL;
 11079         -    int gpkg_amphibious = 0;
 11080         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11081  11051       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11082         -    if (cache != NULL)
 11083         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11084  11052       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11085  11053         {
 11086  11054   	  sqlite3_result_null (context);
 11087  11055   	  return;
 11088  11056         }
 11089  11057       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11090  11058       n_bytes = sqlite3_value_bytes (argv[0]);
 11091         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11059  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11092  11060       if (!geo)
 11093  11061   	sqlite3_result_null (context);
 11094  11062       else
 11095  11063         {
 11096  11064   	  sanitized = gaiaSanitize (geo);
 11097  11065   	  gaiaToSpatiaLiteBlobWkb (sanitized, &p_result, &len);
 11098  11066   	  sqlite3_result_blob (context, p_result, len, free);
................................................................................
 11204  11172       int len;
 11205  11173       unsigned char *p_result = NULL;
 11206  11174       int pts;
 11207  11175       int lns;
 11208  11176       int pgs;
 11209  11177       gaiaGeomCollPtr geo = NULL;
 11210  11178       gaiaGeomCollPtr geom2 = NULL;
 11211         -    int gpkg_amphibious = 0;
 11212         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11213  11179       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11214         -    if (cache != NULL)
 11215         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11216  11180       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11217  11181         {
 11218  11182   	  sqlite3_result_null (context);
 11219  11183   	  return;
 11220  11184         }
 11221  11185       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11222  11186       n_bytes = sqlite3_value_bytes (argv[0]);
 11223         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11187  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11224  11188       if (!geo)
 11225  11189   	sqlite3_result_null (context);
 11226  11190       else
 11227  11191         {
 11228  11192   	  cast_count (geo, &pts, &lns, &pgs);
 11229  11193   	  if (pts == 1 && lns == 0 && pgs == 0)
 11230  11194   	    {
................................................................................
 11256  11220       int len;
 11257  11221       unsigned char *p_result = NULL;
 11258  11222       int pts;
 11259  11223       int lns;
 11260  11224       int pgs;
 11261  11225       gaiaGeomCollPtr geo = NULL;
 11262  11226       gaiaGeomCollPtr geom2 = NULL;
 11263         -    int gpkg_amphibious = 0;
 11264         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11265  11227       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11266         -    if (cache != NULL)
 11267         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11268  11228       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11269  11229         {
 11270  11230   	  sqlite3_result_null (context);
 11271  11231   	  return;
 11272  11232         }
 11273  11233       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11274  11234       n_bytes = sqlite3_value_bytes (argv[0]);
 11275         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11235  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11276  11236       if (!geo)
 11277  11237   	sqlite3_result_null (context);
 11278  11238       else
 11279  11239         {
 11280  11240   	  cast_count (geo, &pts, &lns, &pgs);
 11281  11241   	  if (pts == 0 && lns == 1 && pgs == 0)
 11282  11242   	    {
................................................................................
 11307  11267       int len;
 11308  11268       unsigned char *p_result = NULL;
 11309  11269       int pts;
 11310  11270       int lns;
 11311  11271       int pgs;
 11312  11272       gaiaGeomCollPtr geo = NULL;
 11313  11273       gaiaGeomCollPtr geom2 = NULL;
 11314         -    int gpkg_amphibious = 0;
 11315         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11316  11274       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11317         -    if (cache != NULL)
 11318         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11319  11275       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11320  11276         {
 11321  11277   	  sqlite3_result_null (context);
 11322  11278   	  return;
 11323  11279         }
 11324  11280       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11325  11281       n_bytes = sqlite3_value_bytes (argv[0]);
 11326         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11282  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11327  11283       if (!geo)
 11328  11284   	sqlite3_result_null (context);
 11329  11285       else
 11330  11286         {
 11331  11287   	  cast_count (geo, &pts, &lns, &pgs);
 11332  11288   	  if (pts == 0 && lns == 0 && pgs == 1)
 11333  11289   	    {
................................................................................
 11359  11315       int len;
 11360  11316       unsigned char *p_result = NULL;
 11361  11317       int pts;
 11362  11318       int lns;
 11363  11319       int pgs;
 11364  11320       gaiaGeomCollPtr geo = NULL;
 11365  11321       gaiaGeomCollPtr geom2 = NULL;
 11366         -    int gpkg_amphibious = 0;
 11367         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11368  11322       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11369         -    if (cache != NULL)
 11370         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11371  11323       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11372  11324         {
 11373  11325   	  sqlite3_result_null (context);
 11374  11326   	  return;
 11375  11327         }
 11376  11328       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11377  11329       n_bytes = sqlite3_value_bytes (argv[0]);
 11378         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11330  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11379  11331       if (!geo)
 11380  11332   	sqlite3_result_null (context);
 11381  11333       else
 11382  11334         {
 11383  11335   	  cast_count (geo, &pts, &lns, &pgs);
 11384  11336   	  if (pts >= 1 && lns == 0 && pgs == 0)
 11385  11337   	    {
................................................................................
 11411  11363       int len;
 11412  11364       unsigned char *p_result = NULL;
 11413  11365       int pts;
 11414  11366       int lns;
 11415  11367       int pgs;
 11416  11368       gaiaGeomCollPtr geo = NULL;
 11417  11369       gaiaGeomCollPtr geom2 = NULL;
 11418         -    int gpkg_amphibious = 0;
 11419         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11420  11370       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11421         -    if (cache != NULL)
 11422         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11423  11371       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11424  11372         {
 11425  11373   	  sqlite3_result_null (context);
 11426  11374   	  return;
 11427  11375         }
 11428  11376       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11429  11377       n_bytes = sqlite3_value_bytes (argv[0]);
 11430         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11378  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11431  11379       if (!geo)
 11432  11380   	sqlite3_result_null (context);
 11433  11381       else
 11434  11382         {
 11435  11383   	  cast_count (geo, &pts, &lns, &pgs);
 11436  11384   	  if (pts == 0 && lns >= 1 && pgs == 0)
 11437  11385   	    {
................................................................................
 11463  11411       int len;
 11464  11412       unsigned char *p_result = NULL;
 11465  11413       int pts;
 11466  11414       int lns;
 11467  11415       int pgs;
 11468  11416       gaiaGeomCollPtr geo = NULL;
 11469  11417       gaiaGeomCollPtr geom2 = NULL;
 11470         -    int gpkg_amphibious = 0;
 11471         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11472  11418       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11473         -    if (cache != NULL)
 11474         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11475  11419       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11476  11420         {
 11477  11421   	  sqlite3_result_null (context);
 11478  11422   	  return;
 11479  11423         }
 11480  11424       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11481  11425       n_bytes = sqlite3_value_bytes (argv[0]);
 11482         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11426  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11483  11427       if (!geo)
 11484  11428   	sqlite3_result_null (context);
 11485  11429       else
 11486  11430         {
 11487  11431   	  cast_count (geo, &pts, &lns, &pgs);
 11488  11432   	  if (pts == 0 && lns == 0 && pgs >= 1)
 11489  11433   	    {
................................................................................
 11515  11459       int len;
 11516  11460       unsigned char *p_result = NULL;
 11517  11461       int pts;
 11518  11462       int lns;
 11519  11463       int pgs;
 11520  11464       gaiaGeomCollPtr geo = NULL;
 11521  11465       gaiaGeomCollPtr geom2 = NULL;
 11522         -    int gpkg_amphibious = 0;
 11523         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11524  11466       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11525         -    if (cache != NULL)
 11526         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11527  11467       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11528  11468         {
 11529  11469   	  sqlite3_result_null (context);
 11530  11470   	  return;
 11531  11471         }
 11532  11472       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11533  11473       n_bytes = sqlite3_value_bytes (argv[0]);
 11534         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11474  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11535  11475       if (!geo)
 11536  11476   	sqlite3_result_null (context);
 11537  11477       else
 11538  11478         {
 11539  11479   	  cast_count (geo, &pts, &lns, &pgs);
 11540  11480   	  if (pts >= 1 || lns >= 1 || pgs >= 1)
 11541  11481   	    {
................................................................................
 11567  11507       int len;
 11568  11508       unsigned char *p_result = NULL;
 11569  11509       int pts;
 11570  11510       int lns;
 11571  11511       int pgs;
 11572  11512       gaiaGeomCollPtr geo = NULL;
 11573  11513       gaiaGeomCollPtr geom2 = NULL;
 11574         -    int gpkg_amphibious = 0;
 11575         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11576  11514       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11577         -    if (cache != NULL)
 11578         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11579  11515       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11580  11516         {
 11581  11517   	  sqlite3_result_null (context);
 11582  11518   	  return;
 11583  11519         }
 11584  11520       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11585  11521       n_bytes = sqlite3_value_bytes (argv[0]);
 11586         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11522  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11587  11523       if (!geo)
 11588  11524   	sqlite3_result_null (context);
 11589  11525       else
 11590  11526         {
 11591  11527   	  cast_count (geo, &pts, &lns, &pgs);
 11592  11528   	  if (pts >= 1 || lns >= 1 || pgs >= 1)
 11593  11529   	    {
................................................................................
 11628  11564       unsigned char *p_result = NULL;
 11629  11565       int pts;
 11630  11566       int lns;
 11631  11567       int pgs;
 11632  11568       int ok;
 11633  11569       gaiaGeomCollPtr geo = NULL;
 11634  11570       gaiaGeomCollPtr geom2 = NULL;
 11635         -    int gpkg_amphibious = 0;
 11636         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11637  11571       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11638         -    if (cache != NULL)
 11639         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11640  11572       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11641  11573         {
 11642  11574   	  sqlite3_result_null (context);
 11643  11575   	  return;
 11644  11576         }
 11645  11577       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11646  11578       n_bytes = sqlite3_value_bytes (argv[0]);
 11647         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11579  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11648  11580       if (!geo)
 11649  11581   	sqlite3_result_null (context);
 11650  11582       else
 11651  11583         {
 11652  11584   	  cast_count (geo, &pts, &lns, &pgs);
 11653  11585   	  ok = 0;
 11654  11586   	  if (pts == 1 && lns == 0 && pgs == 0)
................................................................................
 11688  11620   */
 11689  11621       unsigned char *p_blob;
 11690  11622       int n_bytes;
 11691  11623       int len;
 11692  11624       unsigned char *p_result = NULL;
 11693  11625       gaiaGeomCollPtr geo = NULL;
 11694  11626       gaiaGeomCollPtr geom2 = NULL;
 11695         -    int gpkg_amphibious = 0;
 11696         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11697  11627       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11698         -    if (cache != NULL)
 11699         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11700  11628       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11701  11629         {
 11702  11630   	  sqlite3_result_null (context);
 11703  11631   	  return;
 11704  11632         }
 11705  11633       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11706  11634       n_bytes = sqlite3_value_bytes (argv[0]);
 11707         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11635  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11708  11636       if (!geo)
 11709  11637   	sqlite3_result_null (context);
 11710  11638       else
 11711  11639         {
 11712  11640   	  geom2 = gaiaCastGeomCollToXY (geo);
 11713  11641   	  if (geom2)
 11714  11642   	    {
................................................................................
 11734  11662   */
 11735  11663       unsigned char *p_blob;
 11736  11664       int n_bytes;
 11737  11665       int len;
 11738  11666       unsigned char *p_result = NULL;
 11739  11667       gaiaGeomCollPtr geo = NULL;
 11740  11668       gaiaGeomCollPtr geom2 = NULL;
 11741         -    int gpkg_amphibious = 0;
 11742         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11743  11669       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11744         -    if (cache != NULL)
 11745         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11746  11670       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11747  11671         {
 11748  11672   	  sqlite3_result_null (context);
 11749  11673   	  return;
 11750  11674         }
 11751  11675       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11752  11676       n_bytes = sqlite3_value_bytes (argv[0]);
 11753         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11677  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11754  11678       if (!geo)
 11755  11679   	sqlite3_result_null (context);
 11756  11680       else
 11757  11681         {
 11758  11682   	  geom2 = gaiaCastGeomCollToXYZ (geo);
 11759  11683   	  if (geom2)
 11760  11684   	    {
................................................................................
 11780  11704   */
 11781  11705       unsigned char *p_blob;
 11782  11706       int n_bytes;
 11783  11707       int len;
 11784  11708       unsigned char *p_result = NULL;
 11785  11709       gaiaGeomCollPtr geo = NULL;
 11786  11710       gaiaGeomCollPtr geom2 = NULL;
 11787         -    int gpkg_amphibious = 0;
 11788         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11789  11711       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11790         -    if (cache != NULL)
 11791         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11792  11712       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11793  11713         {
 11794  11714   	  sqlite3_result_null (context);
 11795  11715   	  return;
 11796  11716         }
 11797  11717       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11798  11718       n_bytes = sqlite3_value_bytes (argv[0]);
 11799         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11719  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11800  11720       if (!geo)
 11801  11721   	sqlite3_result_null (context);
 11802  11722       else
 11803  11723         {
 11804  11724   	  geom2 = gaiaCastGeomCollToXYM (geo);
 11805  11725   	  if (geom2)
 11806  11726   	    {
................................................................................
 11826  11746   */
 11827  11747       unsigned char *p_blob;
 11828  11748       int n_bytes;
 11829  11749       int len;
 11830  11750       unsigned char *p_result = NULL;
 11831  11751       gaiaGeomCollPtr geo = NULL;
 11832  11752       gaiaGeomCollPtr geom2 = NULL;
 11833         -    int gpkg_amphibious = 0;
 11834         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11835  11753       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11836         -    if (cache != NULL)
 11837         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11838  11754       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11839  11755         {
 11840  11756   	  sqlite3_result_null (context);
 11841  11757   	  return;
 11842  11758         }
 11843  11759       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11844  11760       n_bytes = sqlite3_value_bytes (argv[0]);
 11845         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11761  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11846  11762       if (!geo)
 11847  11763   	sqlite3_result_null (context);
 11848  11764       else
 11849  11765         {
 11850  11766   	  geom2 = gaiaCastGeomCollToXYZM (geo);
 11851  11767   	  if (geom2)
 11852  11768   	    {
................................................................................
 11876  11792       int len;
 11877  11793       unsigned char *p_result = NULL;
 11878  11794       int pts;
 11879  11795       int lns;
 11880  11796       int pgs;
 11881  11797       gaiaGeomCollPtr geo = NULL;
 11882  11798       gaiaGeomCollPtr geom2 = NULL;
 11883         -    int gpkg_amphibious = 0;
 11884         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11885  11799       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11886         -    if (cache != NULL)
 11887         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11888  11800       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11889  11801         {
 11890  11802   	  sqlite3_result_null (context);
 11891  11803   	  return;
 11892  11804         }
 11893  11805       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11894  11806       n_bytes = sqlite3_value_bytes (argv[0]);
 11895         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11807  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11896  11808       if (!geo)
 11897  11809   	sqlite3_result_null (context);
 11898  11810       else
 11899  11811         {
 11900  11812   	  cast_count (geo, &pts, &lns, &pgs);
 11901  11813   	  if (pts >= 1)
 11902  11814   	    {
................................................................................
 11928  11840       int len;
 11929  11841       unsigned char *p_result = NULL;
 11930  11842       int pts;
 11931  11843       int lns;
 11932  11844       int pgs;
 11933  11845       gaiaGeomCollPtr geo = NULL;
 11934  11846       gaiaGeomCollPtr geom2 = NULL;
 11935         -    int gpkg_amphibious = 0;
 11936         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11937  11847       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11938         -    if (cache != NULL)
 11939         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11940  11848       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11941  11849         {
 11942  11850   	  sqlite3_result_null (context);
 11943  11851   	  return;
 11944  11852         }
 11945  11853       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11946  11854       n_bytes = sqlite3_value_bytes (argv[0]);
 11947         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11855  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 11948  11856       if (!geo)
 11949  11857   	sqlite3_result_null (context);
 11950  11858       else
 11951  11859         {
 11952  11860   	  cast_count (geo, &pts, &lns, &pgs);
 11953  11861   	  if (lns >= 1)
 11954  11862   	    {
................................................................................
 11980  11888       int len;
 11981  11889       unsigned char *p_result = NULL;
 11982  11890       int pts;
 11983  11891       int lns;
 11984  11892       int pgs;
 11985  11893       gaiaGeomCollPtr geo = NULL;
 11986  11894       gaiaGeomCollPtr geom2 = NULL;
 11987         -    int gpkg_amphibious = 0;
 11988         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 11989  11895       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 11990         -    if (cache != NULL)
 11991         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 11992  11896       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 11993  11897         {
 11994  11898   	  sqlite3_result_null (context);
 11995  11899   	  return;
 11996  11900         }
 11997  11901       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 11998  11902       n_bytes = sqlite3_value_bytes (argv[0]);
 11999         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11903  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12000  11904       if (!geo)
 12001  11905   	sqlite3_result_null (context);
 12002  11906       else
 12003  11907         {
 12004  11908   	  cast_count (geo, &pts, &lns, &pgs);
 12005  11909   	  if (pgs >= 1)
 12006  11910   	    {
................................................................................
 12028  11932   */
 12029  11933       unsigned char *p_blob;
 12030  11934       int n_bytes;
 12031  11935       int len;
 12032  11936       unsigned char *p_result = NULL;
 12033  11937       gaiaGeomCollPtr geo = NULL;
 12034  11938       gaiaGeomCollPtr geom2 = NULL;
 12035         -    int gpkg_amphibious = 0;
 12036         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12037  11939       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12038         -    if (cache != NULL)
 12039         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12040  11940       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12041  11941         {
 12042  11942   	  sqlite3_result_null (context);
 12043  11943   	  return;
 12044  11944         }
 12045  11945       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12046  11946       n_bytes = sqlite3_value_bytes (argv[0]);
 12047         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11947  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12048  11948       if (!geo)
 12049  11949   	sqlite3_result_null (context);
 12050  11950       else
 12051  11951         {
 12052  11952   	  geom2 = gaiaCloneGeomCollSpecial (geo, GAIA_REVERSE_ORDER);
 12053  11953   	  geom2->Srid = geo->Srid;
 12054  11954   	  gaiaToSpatiaLiteBlobWkb (geom2, &p_result, &len);
................................................................................
 12070  11970   */
 12071  11971       unsigned char *p_blob;
 12072  11972       int n_bytes;
 12073  11973       int len;
 12074  11974       unsigned char *p_result = NULL;
 12075  11975       gaiaGeomCollPtr geo = NULL;
 12076  11976       gaiaGeomCollPtr geom2 = NULL;
 12077         -    int gpkg_amphibious = 0;
 12078         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12079  11977       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12080         -    if (cache != NULL)
 12081         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12082  11978       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12083  11979         {
 12084  11980   	  sqlite3_result_null (context);
 12085  11981   	  return;
 12086  11982         }
 12087  11983       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12088  11984       n_bytes = sqlite3_value_bytes (argv[0]);
 12089         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        11985  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12090  11986       if (!geo)
 12091  11987   	sqlite3_result_null (context);
 12092  11988       else
 12093  11989         {
 12094  11990   	  geom2 = gaiaCloneGeomCollSpecial (geo, GAIA_LHR_ORDER);
 12095  11991   	  geom2->Srid = geo->Srid;
 12096  11992   	  gaiaToSpatiaLiteBlobWkb (geom2, &p_result, &len);
................................................................................
 12113  12009   / 0, 1, 2, for GEOMETRYCOLLECTIONS according to geometries contained inside
 12114  12010   / or NULL if any error is encountered
 12115  12011   */
 12116  12012       unsigned char *p_blob;
 12117  12013       int n_bytes;
 12118  12014       int dim;
 12119  12015       gaiaGeomCollPtr geo = NULL;
 12120         -    int gpkg_amphibious = 0;
 12121         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12122  12016       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12123         -    if (cache != NULL)
 12124         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12125  12017       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12126  12018         {
 12127  12019   	  sqlite3_result_null (context);
 12128  12020   	  return;
 12129  12021         }
 12130  12022       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12131  12023       n_bytes = sqlite3_value_bytes (argv[0]);
 12132         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12024  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12133  12025       if (!geo)
 12134  12026   	sqlite3_result_null (context);
 12135  12027       else
 12136  12028         {
 12137  12029   	  dim = gaiaDimension (geo);
 12138  12030   	  sqlite3_result_int (context, dim);
 12139  12031         }
................................................................................
 12152  12044   */
 12153  12045       unsigned char *p_blob;
 12154  12046       int n_bytes;
 12155  12047       int len;
 12156  12048       char *p_dim = NULL;
 12157  12049       char *p_result = NULL;
 12158  12050       gaiaGeomCollPtr geo = NULL;
 12159         -    int gpkg_amphibious = 0;
 12160         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12161  12051       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12162         -    if (cache != NULL)
 12163         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12164  12052       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12165  12053         {
 12166  12054   	  sqlite3_result_null (context);
 12167  12055   	  return;
 12168  12056         }
 12169  12057       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12170  12058       n_bytes = sqlite3_value_bytes (argv[0]);
 12171         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12059  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12172  12060       if (!geo)
 12173  12061   	sqlite3_result_null (context);
 12174  12062       else
 12175  12063         {
 12176  12064   	  if (geo->DimensionModel == GAIA_XY)
 12177  12065   	      p_dim = "XY";
 12178  12066   	  else if (geo->DimensionModel == GAIA_XY_Z)
................................................................................
 12208  12096   / 2, 3 or 4
 12209  12097   / or NULL if any error is encountered
 12210  12098   */
 12211  12099       unsigned char *p_blob;
 12212  12100       int n_bytes;
 12213  12101       int result = 0;
 12214  12102       gaiaGeomCollPtr geo = NULL;
 12215         -    int gpkg_amphibious = 0;
 12216         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12217  12103       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12218         -    if (cache != NULL)
 12219         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12220  12104       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12221  12105         {
 12222  12106   	  sqlite3_result_null (context);
 12223  12107   	  return;
 12224  12108         }
 12225  12109       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12226  12110       n_bytes = sqlite3_value_bytes (argv[0]);
 12227         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12111  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12228  12112       if (!geo)
 12229  12113   	sqlite3_result_null (context);
 12230  12114       else
 12231  12115         {
 12232  12116   	  if (geo->DimensionModel == GAIA_XY)
 12233  12117   	      result = 2;
 12234  12118   	  else if (geo->DimensionModel == GAIA_XY_Z)
................................................................................
 12425  12309       unsigned char *p_blob;
 12426  12310       int n_bytes;
 12427  12311       int len;
 12428  12312       int type;
 12429  12313       char *p_type = NULL;
 12430  12314       char *p_result = NULL;
 12431  12315       gaiaGeomCollPtr geo = NULL;
 12432         -    int gpkg_amphibious = 0;
 12433         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12434  12316       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12435         -    if (cache != NULL)
 12436         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12437  12317       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12438  12318         {
 12439  12319   	  sqlite3_result_null (context);
 12440  12320   	  return;
 12441  12321         }
 12442  12322       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12443  12323       n_bytes = sqlite3_value_bytes (argv[0]);
 12444         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12324  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12445  12325       if (!geo)
 12446  12326   	sqlite3_result_null (context);
 12447  12327       else
 12448  12328         {
 12449  12329   	  type = gaiaGeometryAliasType (geo);
 12450  12330   	  switch (type)
 12451  12331   	    {
................................................................................
 12591  12471   / or NULL if any error is encountered
 12592  12472   */
 12593  12473       unsigned char *p_blob;
 12594  12474       int n_bytes;
 12595  12475       gaiaGeomCollPtr geo = NULL;
 12596  12476       int srid;
 12597  12477       unsigned char *p_result = NULL;
 12598         -    int gpkg_amphibious = 0;
 12599         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 12600  12478       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 12601         -    if (cache != NULL)
 12602         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 12603  12479       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 12604  12480         {
 12605  12481   	  sqlite3_result_null (context);
 12606  12482   	  return;
 12607  12483         }
 12608  12484       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 12609  12485   	srid = sqlite3_value_int (argv[1]);
................................................................................
 12610  12486       else
 12611  12487         {
 12612  12488   	  sqlite3_result_null (context);
 12613  12489   	  return;
 12614  12490         }
 12615  12491       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 12616  12492       n_bytes = sqlite3_value_bytes (argv[0]);
 12617         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12493  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 12618  12494       if (!geo)
 12619  12495   	sqlite3_result_null (context);
 12620  12496       else
 12621  12497         {
 12622  12498   	  geo->Srid = srid;
 12623  12499   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &n_bytes);
 12624  12500   	  sqlite3_result_blob (context, p_result, n_bytes, free);
................................................................................
 13063  12939       int n_bytes;
 13064  12940       int len;
 13065  12941       unsigned char *p_result = NULL;
 13066  12942       gaiaGeomCollPtr geo = NULL;
 13067  12943       gaiaGeomCollPtr bbox;
 13068  12944       gaiaPolygonPtr polyg;
 13069  12945       gaiaRingPtr rect;
 13070         -    int gpkg_amphibious = 0;
 13071         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 13072  12946       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 13073         -    if (cache != NULL)
 13074         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 13075  12947       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 13076  12948         {
 13077  12949   	  sqlite3_result_null (context);
 13078  12950   	  return;
 13079  12951         }
 13080  12952       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 13081  12953       n_bytes = sqlite3_value_bytes (argv[0]);
 13082         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        12954  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 13083  12955       if (!geo)
 13084  12956   	sqlite3_result_null (context);
 13085  12957       else
 13086  12958         {
 13087  12959   	  gaiaMbrGeometry (geo);
 13088  12960   	  bbox = gaiaAllocGeomColl ();
 13089  12961   	  bbox->Srid = geo->Srid;
................................................................................
 13116  12988       unsigned char *p_result = NULL;
 13117  12989       gaiaGeomCollPtr geo = NULL;
 13118  12990       gaiaGeomCollPtr bbox;
 13119  12991       gaiaPolygonPtr polyg;
 13120  12992       gaiaRingPtr rect;
 13121  12993       double tic;
 13122  12994       int int_value;
 13123         -    int gpkg_amphibious = 0;
 13124         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 13125  12995       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 13126         -    if (cache != NULL)
 13127         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 13128  12996       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 13129  12997         {
 13130  12998   	  sqlite3_result_null (context);
 13131  12999   	  return;
 13132  13000         }
 13133  13001       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 13134  13002   	tic = sqlite3_value_double (argv[1]);
................................................................................
 13140  13008       else
 13141  13009         {
 13142  13010   	  sqlite3_result_null (context);
 13143  13011   	  return;
 13144  13012         }
 13145  13013       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 13146  13014       n_bytes = sqlite3_value_bytes (argv[0]);
 13147         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        13015  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 13148  13016       if (!geo)
 13149  13017   	sqlite3_result_null (context);
 13150  13018       else
 13151  13019         {
 13152  13020   	  gaiaMbrGeometry (geo);
 13153  13021   	  bbox = gaiaAllocGeomColl ();
 13154  13022   	  bbox->Srid = geo->Srid;
................................................................................
 13565  13433   */
 13566  13434       unsigned char *p_blob;
 13567  13435       int n_bytes;
 13568  13436       gaiaGeomCollPtr geom;
 13569  13437       double **p;
 13570  13438       double *max_min;
 13571  13439       int *srid_check;
 13572         -    int gpkg_amphibious = 0;
 13573         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 13574  13440       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 13575         -    if (cache != NULL)
 13576         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 13577  13441       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 13578  13442         {
 13579  13443   	  sqlite3_result_null (context);
 13580  13444   	  return;
 13581  13445         }
 13582  13446       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 13583  13447       n_bytes = sqlite3_value_bytes (argv[0]);
 13584         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        13448  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 13585  13449       if (!geom)
 13586  13450   	return;
 13587  13451       gaiaMbrGeometry (geom);
 13588  13452       p = sqlite3_aggregate_context (context, sizeof (double **));
 13589  13453       if (!(*p))
 13590  13454         {
 13591  13455   	  /* this is the first row */
................................................................................
 14039  13903   / returns the X coordinate for current POINT geometry 
 14040  13904   / or NULL if any error is encountered
 14041  13905   */
 14042  13906       unsigned char *p_blob;
 14043  13907       int n_bytes;
 14044  13908       gaiaGeomCollPtr geo = NULL;
 14045  13909       gaiaPointPtr point;
 14046         -    int gpkg_amphibious = 0;
 14047         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14048  13910       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14049         -    if (cache != NULL)
 14050         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14051  13911       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14052  13912         {
 14053  13913   	  sqlite3_result_null (context);
 14054  13914   	  return;
 14055  13915         }
 14056  13916       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14057  13917       n_bytes = sqlite3_value_bytes (argv[0]);
 14058         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        13918  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14059  13919       if (!geo)
 14060  13920   	sqlite3_result_null (context);
 14061  13921       else
 14062  13922         {
 14063  13923   	  point = simplePoint (geo);
 14064  13924   	  if (!point)
 14065  13925   	      sqlite3_result_null (context);
................................................................................
 14078  13938   / returns the Y coordinate for current POINT geometry 
 14079  13939   / or NULL if any error is encountered
 14080  13940   */
 14081  13941       unsigned char *p_blob;
 14082  13942       int n_bytes;
 14083  13943       gaiaGeomCollPtr geo = NULL;
 14084  13944       gaiaPointPtr point;
 14085         -    int gpkg_amphibious = 0;
 14086         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14087  13945       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14088         -    if (cache != NULL)
 14089         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14090  13946       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14091  13947         {
 14092  13948   	  sqlite3_result_null (context);
 14093  13949   	  return;
 14094  13950         }
 14095  13951       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14096  13952       n_bytes = sqlite3_value_bytes (argv[0]);
 14097         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        13953  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14098  13954       if (!geo)
 14099  13955   	sqlite3_result_null (context);
 14100  13956       else
 14101  13957         {
 14102  13958   	  point = simplePoint (geo);
 14103  13959   	  if (!point)
 14104  13960   	      sqlite3_result_null (context);
................................................................................
 14117  13973   / returns the Z coordinate for current POINT geometry 
 14118  13974   / or NULL if any error is encountered
 14119  13975   */
 14120  13976       unsigned char *p_blob;
 14121  13977       int n_bytes;
 14122  13978       gaiaGeomCollPtr geo = NULL;
 14123  13979       gaiaPointPtr point;
 14124         -    int gpkg_amphibious = 0;
 14125         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14126  13980       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14127         -    if (cache != NULL)
 14128         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14129  13981       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14130  13982         {
 14131  13983   	  sqlite3_result_null (context);
 14132  13984   	  return;
 14133  13985         }
 14134  13986       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14135  13987       n_bytes = sqlite3_value_bytes (argv[0]);
 14136         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        13988  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14137  13989       if (!geo)
 14138  13990   	sqlite3_result_null (context);
 14139  13991       else
 14140  13992         {
 14141  13993   	  point = simplePoint (geo);
 14142  13994   	  if (!point)
 14143  13995   	      sqlite3_result_null (context);
................................................................................
 14162  14014   / returns the M coordinate for current POINT geometry 
 14163  14015   / or NULL if any error is encountered
 14164  14016   */
 14165  14017       unsigned char *p_blob;
 14166  14018       int n_bytes;
 14167  14019       gaiaGeomCollPtr geo = NULL;
 14168  14020       gaiaPointPtr point;
 14169         -    int gpkg_amphibious = 0;
 14170         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14171  14021       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14172         -    if (cache != NULL)
 14173         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14174  14022       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14175  14023         {
 14176  14024   	  sqlite3_result_null (context);
 14177  14025   	  return;
 14178  14026         }
 14179  14027       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14180  14028       n_bytes = sqlite3_value_bytes (argv[0]);
 14181         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14029  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14182  14030       if (!geo)
 14183  14031   	sqlite3_result_null (context);
 14184  14032       else
 14185  14033         {
 14186  14034   	  point = simplePoint (geo);
 14187  14035   	  if (!point)
 14188  14036   	      sqlite3_result_null (context);
................................................................................
 14207  14055   / returns the number of vertices for current LINESTRING geometry 
 14208  14056   / or NULL if any error is encountered
 14209  14057   */
 14210  14058       unsigned char *p_blob;
 14211  14059       int n_bytes;
 14212  14060       gaiaGeomCollPtr geo = NULL;
 14213  14061       gaiaLinestringPtr line;
 14214         -    int gpkg_amphibious = 0;
 14215         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14216  14062       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14217         -    if (cache != NULL)
 14218         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14219  14063       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14220  14064         {
 14221  14065   	  sqlite3_result_null (context);
 14222  14066   	  return;
 14223  14067         }
 14224  14068       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14225  14069       n_bytes = sqlite3_value_bytes (argv[0]);
 14226         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14070  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14227  14071       if (!geo)
 14228  14072   	sqlite3_result_null (context);
 14229  14073       else
 14230  14074         {
 14231  14075   	  line = simpleLinestring (geo);
 14232  14076   	  if (!line)
 14233  14077   	      sqlite3_result_null (context);
................................................................................
 14257  14101       double y;
 14258  14102       double z;
 14259  14103       double m;
 14260  14104       unsigned char *p_result = NULL;
 14261  14105       gaiaGeomCollPtr geo = NULL;
 14262  14106       gaiaGeomCollPtr result;
 14263  14107       gaiaLinestringPtr line;
 14264         -    int gpkg_amphibious = 0;
 14265         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14266  14108       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14267         -    if (cache != NULL)
 14268         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14269  14109       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14270  14110         {
 14271  14111   	  sqlite3_result_null (context);
 14272  14112   	  return;
 14273  14113         }
 14274  14114       if (request == GAIA_POINTN)
 14275  14115         {
................................................................................
 14283  14123         }
 14284  14124       else if (request == GAIA_END_POINT)
 14285  14125   	vertex = -1;		/* EndPoint() specifies a negative point index */
 14286  14126       else
 14287  14127   	vertex = 1;		/* StartPoint() */
 14288  14128       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14289  14129       n_bytes = sqlite3_value_bytes (argv[0]);
 14290         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14130  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14291  14131       if (!geo)
 14292  14132   	sqlite3_result_null (context);
 14293  14133       else
 14294  14134         {
 14295  14135   	  line = simpleLinestring (geo);
 14296  14136   	  if (!line)
 14297  14137   	      sqlite3_result_null (context);
................................................................................
 14390  14230       int len;
 14391  14231       unsigned char *p_result = NULL;
 14392  14232       gaiaGeomCollPtr geo = NULL;
 14393  14233       gaiaGeomCollPtr result;
 14394  14234       gaiaPolygonPtr polyg;
 14395  14235       gaiaRingPtr ring;
 14396  14236       gaiaLinestringPtr line;
 14397         -    int gpkg_amphibious = 0;
 14398         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14399  14237       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14400         -    if (cache != NULL)
 14401         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14402  14238       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14403  14239         {
 14404  14240   	  sqlite3_result_null (context);
 14405  14241   	  return;
 14406  14242         }
 14407  14243       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14408  14244       n_bytes = sqlite3_value_bytes (argv[0]);
 14409         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14245  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14410  14246       if (!geo)
 14411  14247   	sqlite3_result_null (context);
 14412  14248       else
 14413  14249         {
 14414  14250   	  polyg = simplePolygon (geo);
 14415  14251   	  if (!polyg)
 14416  14252   	      sqlite3_result_null (context);
................................................................................
 14468  14304   / returns the number of INTERIOR RINGS for current POLYGON geometry 
 14469  14305   / or NULL if any error is encountered
 14470  14306   */
 14471  14307       unsigned char *p_blob;
 14472  14308       int n_bytes;
 14473  14309       gaiaGeomCollPtr geo = NULL;
 14474  14310       gaiaPolygonPtr polyg;
 14475         -    int gpkg_amphibious = 0;
 14476         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14477  14311       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14478         -    if (cache != NULL)
 14479         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14480  14312       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14481  14313         {
 14482  14314   	  sqlite3_result_null (context);
 14483  14315   	  return;
 14484  14316         }
 14485  14317       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14486  14318       n_bytes = sqlite3_value_bytes (argv[0]);
 14487         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14319  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14488  14320       if (!geo)
 14489  14321   	sqlite3_result_null (context);
 14490  14322       else
 14491  14323         {
 14492  14324   	  polyg = simplePolygon (geo);
 14493  14325   	  if (!polyg)
 14494  14326   	      sqlite3_result_null (context);
................................................................................
 14518  14350       int len;
 14519  14351       unsigned char *p_result = NULL;
 14520  14352       gaiaGeomCollPtr geo = NULL;
 14521  14353       gaiaGeomCollPtr result;
 14522  14354       gaiaPolygonPtr polyg;
 14523  14355       gaiaRingPtr ring;
 14524  14356       gaiaLinestringPtr line;
 14525         -    int gpkg_amphibious = 0;
 14526         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14527  14357       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14528         -    if (cache != NULL)
 14529         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14530  14358       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14531  14359         {
 14532  14360   	  sqlite3_result_null (context);
 14533  14361   	  return;
 14534  14362         }
 14535  14363       if (sqlite3_value_type (argv[1]) != SQLITE_INTEGER)
 14536  14364         {
 14537  14365   	  sqlite3_result_null (context);
 14538  14366   	  return;
 14539  14367         }
 14540  14368       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14541  14369       n_bytes = sqlite3_value_bytes (argv[0]);
 14542  14370       border = sqlite3_value_int (argv[1]);
 14543         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14371  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14544  14372       if (!geo)
 14545  14373   	sqlite3_result_null (context);
 14546  14374       else
 14547  14375         {
 14548  14376   	  polyg = simplePolygon (geo);
 14549  14377   	  if (!polyg)
 14550  14378   	      sqlite3_result_null (context);
................................................................................
 14613  14441       unsigned char *p_blob;
 14614  14442       int n_bytes;
 14615  14443       int cnt = 0;
 14616  14444       gaiaPointPtr point;
 14617  14445       gaiaLinestringPtr line;
 14618  14446       gaiaPolygonPtr polyg;
 14619  14447       gaiaGeomCollPtr geo = NULL;
 14620         -    int gpkg_amphibious = 0;
 14621         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14622  14448       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14623         -    if (cache != NULL)
 14624         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14625  14449       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14626  14450         {
 14627  14451   	  sqlite3_result_null (context);
 14628  14452   	  return;
 14629  14453         }
 14630  14454       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14631  14455       n_bytes = sqlite3_value_bytes (argv[0]);
 14632         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14456  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14633  14457       if (!geo)
 14634  14458   	sqlite3_result_null (context);
 14635  14459       else
 14636  14460         {
 14637  14461   	  point = geo->FirstPoint;
 14638  14462   	  while (point)
 14639  14463   	    {
................................................................................
 14674  14498       int cnt = 0;
 14675  14499       int ib;
 14676  14500       gaiaPointPtr point;
 14677  14501       gaiaLinestringPtr line;
 14678  14502       gaiaPolygonPtr polyg;
 14679  14503       gaiaRingPtr rng;
 14680  14504       gaiaGeomCollPtr geo = NULL;
 14681         -    int gpkg_amphibious = 0;
 14682         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14683  14505       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14684         -    if (cache != NULL)
 14685         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14686  14506       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14687  14507         {
 14688  14508   	  sqlite3_result_null (context);
 14689  14509   	  return;
 14690  14510         }
 14691  14511       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14692  14512       n_bytes = sqlite3_value_bytes (argv[0]);
 14693         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14513  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14694  14514       if (!geo)
 14695  14515   	sqlite3_result_null (context);
 14696  14516       else
 14697  14517         {
 14698  14518   	  point = geo->FirstPoint;
 14699  14519   	  while (point)
 14700  14520   	    {
................................................................................
 14739  14559   / or NULL if any error is encountered
 14740  14560   */
 14741  14561       unsigned char *p_blob;
 14742  14562       int n_bytes;
 14743  14563       int cnt = 0;
 14744  14564       gaiaPolygonPtr polyg;
 14745  14565       gaiaGeomCollPtr geo = NULL;
 14746         -    int gpkg_amphibious = 0;
 14747         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14748  14566       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14749         -    if (cache != NULL)
 14750         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14751  14567       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14752  14568         {
 14753  14569   	  sqlite3_result_null (context);
 14754  14570   	  return;
 14755  14571         }
 14756  14572       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14757  14573       n_bytes = sqlite3_value_bytes (argv[0]);
 14758         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14574  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14759  14575       if (!geo)
 14760  14576   	sqlite3_result_null (context);
 14761  14577       else
 14762  14578         {
 14763  14579   	  polyg = geo->FirstPolygon;
 14764  14580   	  while (polyg)
 14765  14581   	    {
................................................................................
 14862  14678       unsigned char *p_result = NULL;
 14863  14679       int iv;
 14864  14680       int out_iv;
 14865  14681       double x;
 14866  14682       double y;
 14867  14683       double m;
 14868  14684       double z;
 14869         -    int gpkg_amphibious = 0;
 14870         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 14871  14685       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 14872         -    if (cache != NULL)
 14873         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 14874  14686       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 14875  14687         {
 14876  14688   	  sqlite3_result_null (context);
 14877  14689   	  return;
 14878  14690         }
 14879  14691       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 14880  14692       n_bytes = sqlite3_value_bytes (argv[0]);
 14881         -    line = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14693  +    line = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14882  14694       if (!line)
 14883  14695         {
 14884  14696   	  sqlite3_result_null (context);
 14885  14697   	  return;
 14886  14698         }
 14887  14699       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 14888  14700         {
 14889  14701   	  gaiaFreeGeomColl (line);
 14890  14702   	  sqlite3_result_null (context);
 14891  14703   	  return;
 14892  14704         }
 14893  14705       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 14894  14706       n_bytes = sqlite3_value_bytes (argv[1]);
 14895         -    point = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14707  +    point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 14896  14708       if (!point)
 14897  14709         {
 14898  14710   	  gaiaFreeGeomColl (line);
 14899  14711   	  sqlite3_result_null (context);
 14900  14712   	  return;
 14901  14713         }
 14902  14714       if (argc == 3)
................................................................................
 15172  14984   / or NULL if any error is encountered
 15173  14985   */
 15174  14986       unsigned char *p_blob;
 15175  14987       int n_bytes;
 15176  14988       int position;
 15177  14989       gaiaGeomCollPtr line = NULL;
 15178  14990       gaiaGeomCollPtr point = NULL;
 15179         -    int gpkg_amphibious = 0;
 15180         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15181  14991       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15182         -    if (cache != NULL)
 15183         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15184  14992       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15185  14993         {
 15186  14994   	  sqlite3_result_null (context);
 15187  14995   	  return;
 15188  14996         }
 15189  14997       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15190  14998       n_bytes = sqlite3_value_bytes (argv[0]);
 15191         -    line = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        14999  +    line = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15192  15000       if (!line)
 15193  15001         {
 15194  15002   	  sqlite3_result_null (context);
 15195  15003   	  return;
 15196  15004         }
 15197  15005       if (sqlite3_value_type (argv[1]) != SQLITE_INTEGER)
 15198  15006         {
................................................................................
 15205  15013         {
 15206  15014   	  gaiaFreeGeomColl (line);
 15207  15015   	  sqlite3_result_null (context);
 15208  15016   	  return;
 15209  15017         }
 15210  15018       p_blob = (unsigned char *) sqlite3_value_blob (argv[2]);
 15211  15019       n_bytes = sqlite3_value_bytes (argv[2]);
 15212         -    point = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15020  +    point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15213  15021       if (!point)
 15214  15022         {
 15215  15023   	  gaiaFreeGeomColl (line);
 15216  15024   	  sqlite3_result_null (context);
 15217  15025   	  return;
 15218  15026         }
 15219  15027       commont_set_point (context, line, position, point);
................................................................................
 15228  15036   / returns a new Linestring by replacing its StartPoint
 15229  15037   / or NULL if any error is encountered
 15230  15038   */
 15231  15039       unsigned char *p_blob;
 15232  15040       int n_bytes;
 15233  15041       gaiaGeomCollPtr line = NULL;
 15234  15042       gaiaGeomCollPtr point = NULL;
 15235         -    int gpkg_amphibious = 0;
 15236         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15237  15043       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15238         -    if (cache != NULL)
 15239         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15240  15044       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15241  15045         {
 15242  15046   	  sqlite3_result_null (context);
 15243  15047   	  return;
 15244  15048         }
 15245  15049       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15246  15050       n_bytes = sqlite3_value_bytes (argv[0]);
 15247         -    line = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15051  +    line = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15248  15052       if (!line)
 15249  15053         {
 15250  15054   	  sqlite3_result_null (context);
 15251  15055   	  return;
 15252  15056         }
 15253  15057       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 15254  15058         {
 15255  15059   	  gaiaFreeGeomColl (line);
 15256  15060   	  sqlite3_result_null (context);
 15257  15061   	  return;
 15258  15062         }
 15259  15063       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 15260  15064       n_bytes = sqlite3_value_bytes (argv[1]);
 15261         -    point = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15065  +    point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15262  15066       if (!point)
 15263  15067         {
 15264  15068   	  gaiaFreeGeomColl (line);
 15265  15069   	  sqlite3_result_null (context);
 15266  15070   	  return;
 15267  15071         }
 15268  15072       commont_set_point (context, line, 0, point);
................................................................................
 15279  15083   */
 15280  15084       unsigned char *p_blob;
 15281  15085       int n_bytes;
 15282  15086       gaiaLinestringPtr ln;
 15283  15087       gaiaGeomCollPtr line = NULL;
 15284  15088       gaiaGeomCollPtr point = NULL;
 15285  15089       int position;
 15286         -    int gpkg_amphibious = 0;
 15287         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15288  15090       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15289         -    if (cache != NULL)
 15290         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15291  15091       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15292  15092         {
 15293  15093   	  sqlite3_result_null (context);
 15294  15094   	  return;
 15295  15095         }
 15296  15096       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15297  15097       n_bytes = sqlite3_value_bytes (argv[0]);
 15298         -    line = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15098  +    line = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15299  15099       if (!line)
 15300  15100         {
 15301  15101   	  sqlite3_result_null (context);
 15302  15102   	  return;
 15303  15103         }
 15304  15104       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 15305  15105         {
 15306  15106   	  gaiaFreeGeomColl (line);
 15307  15107   	  sqlite3_result_null (context);
 15308  15108   	  return;
 15309  15109         }
 15310  15110       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 15311  15111       n_bytes = sqlite3_value_bytes (argv[1]);
 15312         -    point = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15112  +    point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15313  15113       if (!point)
 15314  15114         {
 15315  15115   	  gaiaFreeGeomColl (line);
 15316  15116   	  sqlite3_result_null (context);
 15317  15117   	  return;
 15318  15118         }
 15319  15119       if (is_single_linestring (line) && is_single_point (point))
................................................................................
 15352  15152       unsigned char *p_result = NULL;
 15353  15153       int iv;
 15354  15154       int out_iv;
 15355  15155       double x;
 15356  15156       double y;
 15357  15157       double m;
 15358  15158       double z;
 15359         -    int gpkg_amphibious = 0;
 15360         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15361  15159       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15362         -    if (cache != NULL)
 15363         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15364  15160       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15365  15161         {
 15366  15162   	  sqlite3_result_null (context);
 15367  15163   	  return;
 15368  15164         }
 15369  15165       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15370  15166       n_bytes = sqlite3_value_bytes (argv[0]);
 15371         -    line = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15167  +    line = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15372  15168       if (!line)
 15373  15169         {
 15374  15170   	  sqlite3_result_null (context);
 15375  15171   	  return;
 15376  15172         }
 15377  15173       if (sqlite3_value_type (argv[1]) != SQLITE_INTEGER)
 15378  15174         {
................................................................................
 15474  15270       unsigned char *p_blob;
 15475  15271       int n_bytes;
 15476  15272       gaiaGeomCollPtr exterior = NULL;
 15477  15273       gaiaGeomCollPtr interiors = NULL;
 15478  15274       gaiaGeomCollPtr out;
 15479  15275       int len;
 15480  15276       unsigned char *p_result = NULL;
 15481         -    int gpkg_amphibious = 0;
 15482         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15483  15277       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15484         -    if (cache != NULL)
 15485         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15486  15278       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15487  15279         {
 15488  15280   	  sqlite3_result_null (context);
 15489  15281   	  goto stop;
 15490  15282         }
 15491  15283       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15492  15284       n_bytes = sqlite3_value_bytes (argv[0]);
 15493         -    exterior = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15285  +    exterior = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15494  15286       if (!exterior)
 15495  15287         {
 15496  15288   	  sqlite3_result_null (context);
 15497  15289   	  goto stop;
 15498  15290         }
 15499  15291       if (argc == 2)
 15500  15292         {
................................................................................
 15501  15293   	  if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 15502  15294   	    {
 15503  15295   		sqlite3_result_null (context);
 15504  15296   		goto stop;
 15505  15297   	    }
 15506  15298   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 15507  15299   	  n_bytes = sqlite3_value_bytes (argv[1]);
 15508         -	  interiors =
 15509         -	      gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15300  +	  interiors = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15510  15301   	  if (!interiors)
 15511  15302   	    {
 15512  15303   		sqlite3_result_null (context);
 15513  15304   		goto stop;
 15514  15305   	    }
 15515  15306         }
 15516  15307       out = gaiaMakePolygon (exterior, interiors);
................................................................................
 15609  15400       double size_x = 0.0;
 15610  15401       double size_y = 0.0;
 15611  15402       double size_z = 0.0;
 15612  15403       double size_m = 0.0;
 15613  15404       gaiaGeomCollPtr geo = NULL;
 15614  15405       gaiaGeomCollPtr point = NULL;
 15615  15406       gaiaGeomCollPtr result = NULL;
 15616         -    int gpkg_amphibious = 0;
 15617         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 15618  15407       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 15619         -    if (cache != NULL)
 15620         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 15621  15408       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 15622  15409         {
 15623  15410   	  sqlite3_result_null (context);
 15624  15411   	  return;
 15625  15412         }
 15626  15413       if (argc == 2)
 15627  15414         {
................................................................................
 15747  15534   	  if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 15748  15535   	    {
 15749  15536   		sqlite3_result_null (context);
 15750  15537   		return;
 15751  15538   	    }
 15752  15539   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 15753  15540   	  n_bytes = sqlite3_value_bytes (argv[1]);
 15754         -	  point =
 15755         -	      gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15541  +	  point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15756  15542   	  if (!point)
 15757  15543   	    {
 15758  15544   		sqlite3_result_null (context);
 15759  15545   		return;
 15760  15546   	    }
 15761  15547   	  if (!getXYZMSinglePoint
 15762  15548   	      (point, &origin_x, &origin_y, &origin_z, &origin_m))
................................................................................
 15821  15607   	    {
 15822  15608   		sqlite3_result_null (context);
 15823  15609   		return;
 15824  15610   	    }
 15825  15611         }
 15826  15612       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 15827  15613       n_bytes = sqlite3_value_bytes (argv[0]);
 15828         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15614  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 15829  15615       if (!geo)
 15830  15616   	sqlite3_result_null (context);
 15831  15617       else
 15832  15618         {
 15833  15619   	  result =
 15834  15620   	      gaiaSnapToGrid (geo, origin_x, origin_y, origin_z, origin_m,
 15835  15621   			      size_x, size_y, size_z, size_m);
................................................................................
 16090  15876       gaiaGeomCollPtr geo = NULL;
 16091  15877       char p_result[8];
 16092  15878       int lon_band = 0;
 16093  15879       double lon_minutes = 0;
 16094  15880       int segmentNumber = 0;
 16095  15881       int lat_band = 0;
 16096  15882       double lat_minutes = 0;
 16097         -    int gpkg_amphibious = 0;
 16098         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16099  15883       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16100         -    if (cache != NULL)
 16101         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16102  15884       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16103  15885         {
 16104  15886   	  sqlite3_result_null (context);
 16105  15887   	  return;
 16106  15888         }
 16107  15889       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16108  15890       n_bytes = sqlite3_value_bytes (argv[0]);
 16109         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        15891  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16110  15892       if (!geo)
 16111  15893         {
 16112  15894   	  sqlite3_result_null (context);
 16113  15895   	  return;
 16114  15896         }
 16115  15897       gaiaNormalizeLonLat (geo);
 16116  15898       point = geo->FirstPoint;
................................................................................
 16226  16008       gaiaPolygonPtr polyg;
 16227  16009       gaiaPolygonPtr polyg2;
 16228  16010       gaiaRingPtr ring_in;
 16229  16011       gaiaRingPtr ring_out;
 16230  16012       unsigned char *p_result = NULL;
 16231  16013       gaiaGeomCollPtr geo = NULL;
 16232  16014       gaiaGeomCollPtr result = NULL;
 16233         -    int gpkg_amphibious = 0;
 16234         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16235  16015       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16236         -    if (cache != NULL)
 16237         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16238  16016       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16239  16017         {
 16240  16018   	  sqlite3_result_null (context);
 16241  16019   	  return;
 16242  16020         }
 16243  16021       if (sqlite3_value_type (argv[1]) != SQLITE_INTEGER)
 16244  16022         {
 16245  16023   	  sqlite3_result_null (context);
 16246  16024   	  return;
 16247  16025         }
 16248  16026       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16249  16027       n_bytes = sqlite3_value_bytes (argv[0]);
 16250  16028       entity = sqlite3_value_int (argv[1]);
 16251         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16029  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16252  16030       if (!geo)
 16253  16031   	sqlite3_result_null (context);
 16254  16032       else
 16255  16033         {
 16256  16034   	  point = geo->FirstPoint;
 16257  16035   	  while (point)
 16258  16036   	    {
................................................................................
 16566  16344       int int_value;
 16567  16345       unsigned char *p_blob;
 16568  16346       int n_bytes;
 16569  16347       int ret = 0;
 16570  16348       gaiaGeomCollPtr geo1 = NULL;
 16571  16349       gaiaGeomCollPtr geo2 = NULL;
 16572  16350       gaiaLinestringPtr ln;
 16573         -    int gpkg_amphibious = 0;
 16574         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16575  16351       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16576         -    if (cache != NULL)
 16577         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16578  16352       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16579  16353         {
 16580  16354   	  sqlite3_result_null (context);
 16581  16355   	  return;
 16582  16356         }
 16583  16357       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 16584  16358   	x1 = sqlite3_value_double (argv[1]);
................................................................................
 16626  16400       else
 16627  16401         {
 16628  16402   	  sqlite3_result_null (context);
 16629  16403   	  return;
 16630  16404         }
 16631  16405       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16632  16406       n_bytes = sqlite3_value_bytes (argv[0]);
 16633         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16407  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16634  16408       if (!geo1)
 16635  16409   	sqlite3_result_null (context);
 16636  16410       else
 16637  16411         {
 16638  16412   	  gaiaMbrGeometry (geo1);
 16639  16413   	  geo2 = gaiaAllocGeomColl ();
 16640  16414   	  ln = gaiaAddLinestringToGeomColl (geo2, 2);
................................................................................
 16680  16454       int n_bytes;
 16681  16455       int len;
 16682  16456       unsigned char *p_result = NULL;
 16683  16457       gaiaGeomCollPtr geo = NULL;
 16684  16458       double shift_x;
 16685  16459       double shift_y;
 16686  16460       int int_value;
 16687         -    int gpkg_amphibious = 0;
 16688         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16689  16461       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16690         -    if (cache != NULL)
 16691         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16692  16462       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16693  16463         {
 16694  16464   	  sqlite3_result_null (context);
 16695  16465   	  return;
 16696  16466         }
 16697  16467       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 16698  16468   	shift_x = sqlite3_value_double (argv[1]);
................................................................................
 16716  16486       else
 16717  16487         {
 16718  16488   	  sqlite3_result_null (context);
 16719  16489   	  return;
 16720  16490         }
 16721  16491       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16722  16492       n_bytes = sqlite3_value_bytes (argv[0]);
 16723         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16493  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16724  16494       if (!geo)
 16725  16495   	sqlite3_result_null (context);
 16726  16496       else
 16727  16497         {
 16728  16498   	  gaiaShiftCoords (geo, shift_x, shift_y);
 16729  16499   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 16730  16500   	  if (!p_result)
................................................................................
 16749  16519       int len;
 16750  16520       unsigned char *p_result = NULL;
 16751  16521       gaiaGeomCollPtr geo = NULL;
 16752  16522       double shift_x;
 16753  16523       double shift_y;
 16754  16524       double shift_z;
 16755  16525       int int_value;
 16756         -    int gpkg_amphibious = 0;
 16757         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16758  16526       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16759         -    if (cache != NULL)
 16760         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16761  16527       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16762  16528         {
 16763  16529   	  sqlite3_result_null (context);
 16764  16530   	  return;
 16765  16531         }
 16766  16532       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 16767  16533   	shift_x = sqlite3_value_double (argv[1]);
................................................................................
 16797  16563       else
 16798  16564         {
 16799  16565   	  sqlite3_result_null (context);
 16800  16566   	  return;
 16801  16567         }
 16802  16568       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16803  16569       n_bytes = sqlite3_value_bytes (argv[0]);
 16804         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16570  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16805  16571       if (!geo)
 16806  16572   	sqlite3_result_null (context);
 16807  16573       else
 16808  16574         {
 16809  16575   	  gaiaShiftCoords3D (geo, shift_x, shift_y, shift_z);
 16810  16576   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 16811  16577   	  if (!p_result)
................................................................................
 16828  16594   / or NULL if any error is encountered
 16829  16595   */
 16830  16596       unsigned char *p_blob;
 16831  16597       int n_bytes;
 16832  16598       int len;
 16833  16599       unsigned char *p_result = NULL;
 16834  16600       gaiaGeomCollPtr geo = NULL;
 16835         -    int gpkg_amphibious = 0;
 16836         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16837  16601       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16838         -    if (cache != NULL)
 16839         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16840  16602       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16841  16603         {
 16842  16604   	  sqlite3_result_null (context);
 16843  16605   	  return;
 16844  16606         }
 16845  16607       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16846  16608       n_bytes = sqlite3_value_bytes (argv[0]);
 16847         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16609  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16848  16610       if (!geo)
 16849  16611   	sqlite3_result_null (context);
 16850  16612       else
 16851  16613         {
 16852  16614   	  gaiaShiftLongitude (geo);
 16853  16615   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 16854  16616   	  if (!p_result)
................................................................................
 16871  16633   / NULL is returned if any error is encountered
 16872  16634   */
 16873  16635       unsigned char *p_blob;
 16874  16636       int n_bytes;
 16875  16637       int len;
 16876  16638       unsigned char *p_result = NULL;
 16877  16639       gaiaGeomCollPtr geo = NULL;
 16878         -    int gpkg_amphibious = 0;
 16879         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16880  16640       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16881         -    if (cache != NULL)
 16882         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16883  16641       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16884  16642         {
 16885  16643   	  sqlite3_result_null (context);
 16886  16644   	  return;
 16887  16645         }
 16888  16646       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16889  16647       n_bytes = sqlite3_value_bytes (argv[0]);
 16890         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16648  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16891  16649       if (!geo)
 16892  16650   	sqlite3_result_null (context);
 16893  16651       else
 16894  16652         {
 16895  16653   	  gaiaNormalizeLonLat (geo);
 16896  16654   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 16897  16655   	  if (!p_result)
................................................................................
 16915  16673       int n_bytes;
 16916  16674       int len;
 16917  16675       unsigned char *p_result = NULL;
 16918  16676       gaiaGeomCollPtr geo = NULL;
 16919  16677       double scale_x;
 16920  16678       double scale_y;
 16921  16679       int int_value;
 16922         -    int gpkg_amphibious = 0;
 16923         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16924         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16925         -    if (cache != NULL)
 16926         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 16927  16680       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 16928  16681         {
 16929  16682   	  sqlite3_result_null (context);
 16930  16683   	  return;
 16931  16684         }
 16932  16685       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 16933  16686   	scale_x = sqlite3_value_double (argv[1]);
................................................................................
 16957  16710   	    {
 16958  16711   		sqlite3_result_null (context);
 16959  16712   		return;
 16960  16713   	    }
 16961  16714         }
 16962  16715       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 16963  16716       n_bytes = sqlite3_value_bytes (argv[0]);
 16964         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16717  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 16965  16718       if (!geo)
 16966  16719   	sqlite3_result_null (context);
 16967  16720       else
 16968  16721         {
 16969  16722   	  gaiaScaleCoords (geo, scale_x, scale_y);
 16970  16723   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 16971  16724   	  if (!p_result)
................................................................................
 16988  16741       unsigned char *p_blob;
 16989  16742       int n_bytes;
 16990  16743       int len;
 16991  16744       unsigned char *p_result = NULL;
 16992  16745       gaiaGeomCollPtr geo = NULL;
 16993  16746       double angle;
 16994  16747       int int_value;
 16995         -    int gpkg_amphibious = 0;
 16996         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 16997  16748       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 16998         -    if (cache != NULL)
 16999         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17000  16749       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17001  16750         {
 17002  16751   	  sqlite3_result_null (context);
 17003  16752   	  return;
 17004  16753         }
 17005  16754       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 17006  16755   	angle = sqlite3_value_double (argv[1]);
................................................................................
 17012  16761       else
 17013  16762         {
 17014  16763   	  sqlite3_result_null (context);
 17015  16764   	  return;
 17016  16765         }
 17017  16766       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17018  16767       n_bytes = sqlite3_value_bytes (argv[0]);
 17019         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16768  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17020  16769       if (!geo)
 17021  16770   	sqlite3_result_null (context);
 17022  16771       else
 17023  16772         {
 17024  16773   	  gaiaRotateCoords (geo, angle);
 17025  16774   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 17026  16775   	  if (!p_result)
................................................................................
 17043  16792       unsigned char *p_blob;
 17044  16793       int n_bytes;
 17045  16794       int len;
 17046  16795       unsigned char *p_result = NULL;
 17047  16796       gaiaGeomCollPtr geo = NULL;
 17048  16797       int x_axis;
 17049  16798       int y_axis;
 17050         -    int gpkg_amphibious = 0;
 17051         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17052  16799       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17053         -    if (cache != NULL)
 17054         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17055  16800       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17056  16801         {
 17057  16802   	  sqlite3_result_null (context);
 17058  16803   	  return;
 17059  16804         }
 17060  16805       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 17061  16806   	x_axis = sqlite3_value_int (argv[1]);
................................................................................
 17069  16814       else
 17070  16815         {
 17071  16816   	  sqlite3_result_null (context);
 17072  16817   	  return;
 17073  16818         }
 17074  16819       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17075  16820       n_bytes = sqlite3_value_bytes (argv[0]);
 17076         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16821  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17077  16822       if (!geo)
 17078  16823   	sqlite3_result_null (context);
 17079  16824       else
 17080  16825         {
 17081  16826   	  gaiaReflectCoords (geo, x_axis, y_axis);
 17082  16827   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 17083  16828   	  if (!p_result)
................................................................................
 17098  16843   / or NULL if any error is encountered
 17099  16844   */
 17100  16845       unsigned char *p_blob;
 17101  16846       int n_bytes;
 17102  16847       int len;
 17103  16848       unsigned char *p_result = NULL;
 17104  16849       gaiaGeomCollPtr geo = NULL;
 17105         -    int gpkg_amphibious = 0;
 17106         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17107  16850       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17108         -    if (cache != NULL)
 17109         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17110  16851       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17111  16852         {
 17112  16853   	  sqlite3_result_null (context);
 17113  16854   	  return;
 17114  16855         }
 17115  16856       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17116  16857       n_bytes = sqlite3_value_bytes (argv[0]);
 17117         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        16858  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17118  16859       if (!geo)
 17119  16860   	sqlite3_result_null (context);
 17120  16861       else
 17121  16862         {
 17122  16863   	  gaiaSwapCoords (geo);
 17123  16864   	  gaiaToSpatiaLiteBlobWkb (geo, &p_result, &len);
 17124  16865   	  if (!p_result)
................................................................................
 17257  16998   / or NULL if any error is encountered
 17258  16999   */
 17259  17000       unsigned char *p_blob;
 17260  17001       int n_bytes;
 17261  17002       int len;
 17262  17003       gaiaOutBuffer out_buf;
 17263  17004       gaiaGeomCollPtr geo = NULL;
 17264         -    int gpkg_amphibious = 0;
 17265         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17266  17005       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17267         -    if (cache != NULL)
 17268         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17269  17006       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17270  17007         {
 17271  17008   	  sqlite3_result_null (context);
 17272  17009   	  return;
 17273  17010         }
 17274  17011       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17275  17012       n_bytes = sqlite3_value_bytes (argv[0]);
 17276         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17013  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17277  17014       if (!geo)
 17278  17015         {
 17279  17016   	  sqlite3_result_null (context);
 17280  17017   	  return;
 17281  17018         }
 17282  17019       else
 17283  17020         {
................................................................................
 17306  17043   / or NULL if any error is encountered
 17307  17044   */
 17308  17045       unsigned char *p_blob;
 17309  17046       int n_bytes;
 17310  17047       int len;
 17311  17048       gaiaOutBuffer out_buf;
 17312  17049       gaiaGeomCollPtr geo = NULL;
 17313         -    int gpkg_amphibious = 0;
 17314         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17315  17050       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17316         -    if (cache != NULL)
 17317         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17318  17051       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17319  17052         {
 17320  17053   	  sqlite3_result_null (context);
 17321  17054   	  return;
 17322  17055         }
 17323  17056       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17324  17057       n_bytes = sqlite3_value_bytes (argv[0]);
 17325  17058       gaiaOutBufferInitialize (&out_buf);
 17326         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17059  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17327  17060       if (!geo)
 17328  17061   	sqlite3_result_null (context);
 17329  17062       else
 17330  17063         {
 17331  17064   	  gaiaToEWKT (&out_buf, geo);
 17332  17065   	  if (out_buf.Error || out_buf.Buffer == NULL)
 17333  17066   	      sqlite3_result_null (context);
................................................................................
 17484  17217       unsigned char *p_blob;
 17485  17218       int n_bytes;
 17486  17219       gaiaGeomCollPtr geo = NULL;
 17487  17220       gaiaGeomCollPtr geom_new = NULL;
 17488  17221       int len;
 17489  17222       int multi_linestring = 0;
 17490  17223       unsigned char *p_result = NULL;
 17491         -    int gpkg_amphibious = 0;
 17492         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17493  17224       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17494         -    if (cache != NULL)
 17495         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17496  17225       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17497  17226         {
 17498  17227   	  sqlite3_result_null (context);
 17499  17228   	  return;
 17500  17229         }
 17501  17230       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17502  17231       n_bytes = sqlite3_value_bytes (argv[0]);
 17503         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17232  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17504  17233       if (geo == NULL)
 17505  17234         {
 17506  17235   	  sqlite3_result_null (context);
 17507  17236   	  return;
 17508  17237         }
 17509  17238       if (argc == 2)
 17510  17239         {
................................................................................
 17538  17267   / (or a set of Polygons)
 17539  17268   / NULL is returned for invalid arguments
 17540  17269   */
 17541  17270       unsigned char *p_blob;
 17542  17271       int n_bytes;
 17543  17272       gaiaGeomCollPtr geo = NULL;
 17544  17273       gaiaGeomCollPtr result;
 17545         -    int gpkg_amphibious = 0;
 17546         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17547  17274       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17548         -    if (cache != NULL)
 17549         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17550  17275       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17551  17276         {
 17552  17277   	  sqlite3_result_null (context);
 17553  17278   	  return;
 17554  17279         }
 17555  17280       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17556  17281       n_bytes = sqlite3_value_bytes (argv[0]);
 17557         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17282  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17558  17283       if (geo == NULL)
 17559  17284   	sqlite3_result_null (context);
 17560  17285       else
 17561  17286         {
 17562  17287   	  void *data = sqlite3_user_data (context);
 17563  17288   	  if (data != NULL)
 17564  17289   	      result = gaiaPolygonize_r (data, geo, 0);
................................................................................
 17592  17317   /
 17593  17318   */
 17594  17319       unsigned char *p_blob;
 17595  17320       int n_bytes;
 17596  17321       gaiaGeomCollPtr geom;
 17597  17322       gaiaGeomCollPtr result;
 17598  17323       gaiaGeomCollPtr *p;
 17599         -    int gpkg_amphibious = 0;
 17600         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17601  17324       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17602         -    if (cache != NULL)
 17603         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17604  17325       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17605  17326         {
 17606  17327   	  sqlite3_result_null (context);
 17607  17328   	  return;
 17608  17329         }
 17609  17330       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17610  17331       n_bytes = sqlite3_value_bytes (argv[0]);
 17611         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17332  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17612  17333       if (!geom)
 17613  17334   	return;
 17614  17335       p = sqlite3_aggregate_context (context, sizeof (gaiaGeomCollPtr));
 17615  17336       if (!(*p))
 17616  17337         {
 17617  17338   	  /* this is the first row */
 17618  17339   	  *p = geom;
................................................................................
 17686  17407   / Dissolves any LINESTRING or RING into elementary segments
 17687  17408   / NULL is returned for invalid arguments
 17688  17409   */
 17689  17410       unsigned char *p_blob;
 17690  17411       int n_bytes;
 17691  17412       gaiaGeomCollPtr geo = NULL;
 17692  17413       gaiaGeomCollPtr result;
 17693         -    int gpkg_amphibious = 0;
 17694         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17695  17414       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17696         -    if (cache != NULL)
 17697         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17698  17415       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17699  17416         {
 17700  17417   	  sqlite3_result_null (context);
 17701  17418   	  return;
 17702  17419         }
 17703  17420       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17704  17421       n_bytes = sqlite3_value_bytes (argv[0]);
 17705         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17422  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17706  17423       if (geo == NULL)
 17707  17424   	sqlite3_result_null (context);
 17708  17425       else
 17709  17426         {
 17710  17427   	  result = gaiaDissolveSegments (geo);
 17711  17428   	  if (result == NULL)
 17712  17429   	      sqlite3_result_null (context);
................................................................................
 17733  17450   / Dissolves any LINESTRING or RING into elementary Vertices
 17734  17451   / NULL is returned for invalid arguments
 17735  17452   */
 17736  17453       unsigned char *p_blob;
 17737  17454       int n_bytes;
 17738  17455       gaiaGeomCollPtr geo = NULL;
 17739  17456       gaiaGeomCollPtr result;
 17740         -    int gpkg_amphibious = 0;
 17741         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17742  17457       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17743         -    if (cache != NULL)
 17744         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17745  17458       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17746  17459         {
 17747  17460   	  sqlite3_result_null (context);
 17748  17461   	  return;
 17749  17462         }
 17750  17463       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17751  17464       n_bytes = sqlite3_value_bytes (argv[0]);
 17752         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17465  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17753  17466       if (geo == NULL)
 17754  17467   	sqlite3_result_null (context);
 17755  17468       else
 17756  17469         {
 17757  17470   	  result = gaiaDissolvePoints (geo);
 17758  17471   	  if (result == NULL)
 17759  17472   	      sqlite3_result_null (context);
................................................................................
 17783  17496   / NULL is returned for invalid arguments
 17784  17497   */
 17785  17498       unsigned char *p_blob;
 17786  17499       int n_bytes;
 17787  17500       int type;
 17788  17501       gaiaGeomCollPtr geo = NULL;
 17789  17502       gaiaGeomCollPtr result;
 17790         -    int gpkg_amphibious = 0;
 17791         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17792  17503       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17793         -    if (cache != NULL)
 17794         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17795  17504       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17796  17505         {
 17797  17506   	  sqlite3_result_null (context);
 17798  17507   	  return;
 17799  17508         }
 17800  17509       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 17801  17510   	type = sqlite3_value_int (argv[1]);
................................................................................
 17809  17518       else
 17810  17519         {
 17811  17520   	  sqlite3_result_null (context);
 17812  17521   	  return;
 17813  17522         }
 17814  17523       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17815  17524       n_bytes = sqlite3_value_bytes (argv[0]);
 17816         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17525  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17817  17526       if (geo == NULL)
 17818  17527   	sqlite3_result_null (context);
 17819  17528       else
 17820  17529         {
 17821  17530   	  switch (type)
 17822  17531   	    {
 17823  17532   	    case 1:
................................................................................
 17861  17570       unsigned char *p_blob;
 17862  17571       int n_bytes;
 17863  17572       double m_start;
 17864  17573       double m_end;
 17865  17574       int intval;
 17866  17575       gaiaGeomCollPtr geo = NULL;
 17867  17576       gaiaGeomCollPtr result;
 17868         -    int gpkg_amphibious = 0;
 17869         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17870  17577       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17871         -    if (cache != NULL)
 17872         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17873  17578       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17874  17579         {
 17875  17580   	  sqlite3_result_null (context);
 17876  17581   	  return;
 17877  17582         }
 17878  17583       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 17879  17584   	m_start = sqlite3_value_double (argv[1]);
................................................................................
 17902  17607   		return;
 17903  17608   	    }
 17904  17609         }
 17905  17610       else
 17906  17611   	m_end = m_start;
 17907  17612       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17908  17613       n_bytes = sqlite3_value_bytes (argv[0]);
 17909         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17614  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17910  17615       if (geo == NULL)
 17911  17616   	sqlite3_result_null (context);
 17912  17617       else
 17913  17618         {
 17914  17619   	  result = gaiaLocateBetweenMeasures (geo, m_start, m_end);
 17915  17620   	  if (result == NULL)
 17916  17621   	      sqlite3_result_null (context);
................................................................................
 17932  17637   
 17933  17638   static void
 17934  17639   fnct_Transform (sqlite3_context * context, int argc, sqlite3_value ** argv)
 17935  17640   {
 17936  17641   /* SQL function:
 17937  17642   / Transform(BLOBencoded geometry, srid)
 17938  17643   /
 17939         -/ returns a new geometry that is the original one received, but transformed / translated to the new SRID [coordinates translation is applied]
        17644  +/ returns a new geometry that is the original one received, but with the new SRID [no coordinates translation is applied]
 17940  17645   / or NULL if any error is encountered
 17941  17646   */
 17942  17647       unsigned char *p_blob;
 17943  17648       int n_bytes;
 17944  17649       gaiaGeomCollPtr geo = NULL;
 17945  17650       gaiaGeomCollPtr result;
 17946  17651       int srid_from;
 17947  17652       int srid_to;
 17948  17653       char *proj_from;
 17949  17654       char *proj_to;
 17950  17655       void *data = sqlite3_user_data (context);
 17951  17656       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 17952         -    int gpkg_amphibious = 0;
 17953         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 17954  17657       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 17955         -    if (cache != NULL)
 17956         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 17957  17658       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 17958  17659         {
 17959  17660   	  sqlite3_result_null (context);
 17960  17661   	  return;
 17961  17662         }
 17962  17663       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 17963  17664   	srid_to = sqlite3_value_int (argv[1]);
................................................................................
 17964  17665       else
 17965  17666         {
 17966  17667   	  sqlite3_result_null (context);
 17967  17668   	  return;
 17968  17669         }
 17969  17670       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 17970  17671       n_bytes = sqlite3_value_bytes (argv[0]);
 17971         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17672  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 17972  17673       if (!geo)
 17973  17674   	sqlite3_result_null (context);
 17974  17675       else
 17975  17676         {
 17976  17677   	  srid_from = geo->Srid;
 17977         -	  getProjParamsEx (sqlite, srid_from, &proj_from, gpkg_amphibious);
 17978         -	  getProjParamsEx (sqlite, srid_to, &proj_to, gpkg_amphibious);
        17678  +	  getProjParams (sqlite, srid_from, &proj_from);
        17679  +	  getProjParams (sqlite, srid_to, &proj_to);
 17979  17680   	  if (proj_to == NULL || proj_from == NULL)
 17980  17681   	    {
 17981  17682   		if (proj_from)
 17982  17683   		    free (proj_from);
 17983  17684   		if (proj_to)
 17984  17685   		    free (proj_to);
 17985  17686   		gaiaFreeGeomColl (geo);
................................................................................
 18134  17835   */
 18135  17836       unsigned char *p_blob;
 18136  17837       int n_bytes;
 18137  17838       int len;
 18138  17839       gaiaGeomCollPtr geom;
 18139  17840       char *str;
 18140  17841       void *data = sqlite3_user_data (context);
 18141         -    int gpkg_amphibious = 0;
 18142         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18143  17842       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18144         -    if (cache != NULL)
 18145         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18146  17843       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18147  17844         {
 18148  17845   	  sqlite3_result_null (context);
 18149  17846   	  return;
 18150  17847         }
 18151  17848       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18152  17849       n_bytes = sqlite3_value_bytes (argv[0]);
 18153         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17850  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18154  17851       if (data != NULL)
 18155  17852   	str = gaiaIsValidReason_r (data, geom);
 18156  17853       else
 18157  17854   	str = gaiaIsValidReason (geom);
 18158  17855       if (str == NULL)
 18159  17856   	sqlite3_result_null (context);
 18160  17857       else
................................................................................
 18179  17876       unsigned char *p_blob;
 18180  17877       int n_bytes;
 18181  17878       int len;
 18182  17879       gaiaGeomCollPtr geom;
 18183  17880       gaiaGeomCollPtr detail;
 18184  17881       unsigned char *p_result = NULL;
 18185  17882       void *data = sqlite3_user_data (context);
 18186         -    int gpkg_amphibious = 0;
 18187         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18188  17883       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18189         -    if (cache != NULL)
 18190         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18191  17884       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18192  17885         {
 18193  17886   	  sqlite3_result_null (context);
 18194  17887   	  return;
 18195  17888         }
 18196  17889       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18197  17890       n_bytes = sqlite3_value_bytes (argv[0]);
 18198         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17891  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18199  17892       if (data != NULL)
 18200  17893   	detail = gaiaIsValidDetail_r (data, geom);
 18201  17894       else
 18202  17895   	detail = gaiaIsValidDetail (geom);
 18203  17896       if (detail == NULL)
 18204  17897   	sqlite3_result_null (context);
 18205  17898       else
................................................................................
 18225  17918   */
 18226  17919       unsigned char *p_blob;
 18227  17920       int n_bytes;
 18228  17921       int len;
 18229  17922       unsigned char *p_result = NULL;
 18230  17923       gaiaGeomCollPtr geo = NULL;
 18231  17924       gaiaGeomCollPtr boundary;
 18232         -    int gpkg_amphibious = 0;
 18233         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18234  17925       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18235         -    if (cache != NULL)
 18236         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18237  17926       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18238  17927         {
 18239  17928   	  sqlite3_result_null (context);
 18240  17929   	  return;
 18241  17930         }
 18242  17931       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18243  17932       n_bytes = sqlite3_value_bytes (argv[0]);
 18244         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17933  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18245  17934       if (!geo)
 18246  17935   	sqlite3_result_null (context);
 18247  17936       else
 18248  17937         {
 18249  17938   	  if (gaiaIsEmpty (geo))
 18250  17939   	      sqlite3_result_null (context);
 18251  17940   	  else
................................................................................
 18278  17967   / 1 if this LINESTRING is closed [or if this is a MULTILINESTRING and every LINESTRINGs are closed] 
 18279  17968   / 0 otherwise
 18280  17969   / or -1 if any error is encountered
 18281  17970   */
 18282  17971       unsigned char *p_blob;
 18283  17972       int n_bytes;
 18284  17973       gaiaGeomCollPtr geo = NULL;
 18285         -    int gpkg_amphibious = 0;
 18286         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18287  17974       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18288         -    if (cache != NULL)
 18289         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18290  17975       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18291  17976         {
 18292  17977   	  sqlite3_result_int (context, -1);
 18293  17978   	  return;
 18294  17979         }
 18295  17980       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18296  17981       n_bytes = sqlite3_value_bytes (argv[0]);
 18297         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        17982  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18298  17983       if (!geo)
 18299  17984   	sqlite3_result_int (context, -1);
 18300  17985       else
 18301  17986         {
 18302  17987   	  sqlite3_result_int (context, gaiaIsClosedGeom (geo));
 18303  17988         }
 18304  17989       gaiaFreeGeomColl (geo);
................................................................................
 18315  18000   / 0 otherwise
 18316  18001   / or -1 if any error is encountered
 18317  18002   */
 18318  18003       unsigned char *p_blob;
 18319  18004       int n_bytes;
 18320  18005       int ret;
 18321  18006       gaiaGeomCollPtr geo = NULL;
 18322         -    int gpkg_amphibious = 0;
 18323         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18324  18007       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18325         -    if (cache != NULL)
 18326         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18327  18008       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18328  18009         {
 18329  18010   	  sqlite3_result_int (context, -1);
 18330  18011   	  return;
 18331  18012         }
 18332  18013       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18333  18014       n_bytes = sqlite3_value_bytes (argv[0]);
 18334         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18015  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18335  18016       if (!geo)
 18336  18017   	sqlite3_result_int (context, -1);
 18337  18018       else
 18338  18019         {
 18339  18020   	  void *data = sqlite3_user_data (context);
 18340  18021   	  if (data != NULL)
 18341  18022   	      ret = gaiaIsSimple_r (data, geo);
................................................................................
 18361  18042   / or -1 if any error is encountered
 18362  18043   */
 18363  18044       unsigned char *p_blob;
 18364  18045       int n_bytes;
 18365  18046       int ret;
 18366  18047       gaiaGeomCollPtr geo = NULL;
 18367  18048       gaiaLinestringPtr line;
 18368         -    int gpkg_amphibious = 0;
 18369         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18370  18049       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18371         -    if (cache != NULL)
 18372         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18373  18050       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18374  18051         {
 18375  18052   	  sqlite3_result_int (context, -1);
 18376  18053   	  return;
 18377  18054         }
 18378  18055       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18379  18056       n_bytes = sqlite3_value_bytes (argv[0]);
 18380         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18057  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18381  18058       if (!geo)
 18382  18059   	sqlite3_result_int (context, -1);
 18383  18060       else
 18384  18061         {
 18385  18062   	  line = simpleLinestring (geo);
 18386  18063   	  if (!line < 0)
 18387  18064   	      sqlite3_result_int (context, -1);
................................................................................
 18409  18086   / 0 otherwise
 18410  18087   / or -1 if any error is encountered
 18411  18088   */
 18412  18089       unsigned char *p_blob;
 18413  18090       int n_bytes;
 18414  18091       int ret;
 18415  18092       gaiaGeomCollPtr geo = NULL;
 18416         -    int gpkg_amphibious = 0;
 18417         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18418  18093       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18419         -    if (cache != NULL)
 18420         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18421  18094       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18422  18095         {
 18423  18096   	  sqlite3_result_int (context, -1);
 18424  18097   	  return;
 18425  18098         }
 18426  18099       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18427  18100       n_bytes = sqlite3_value_bytes (argv[0]);
 18428         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18101  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18429  18102       if (!geo)
 18430  18103   	sqlite3_result_int (context, -1);
 18431  18104       else
 18432  18105         {
 18433  18106   	  void *data = sqlite3_user_data (context);
 18434  18107   	  if (data != NULL)
 18435  18108   	      ret = gaiaIsValid_r (data, geo);
................................................................................
 18454  18127       int ret;
 18455  18128       int use_ellipsoid = -1;
 18456  18129       double a;
 18457  18130       double b;
 18458  18131       double rf;
 18459  18132       gaiaGeomCollPtr geo = NULL;
 18460  18133       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 18461         -    int gpkg_amphibious = 0;
 18462         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18463  18134       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18464         -    if (cache != NULL)
 18465         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18466  18135       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18467  18136         {
 18468  18137   	  sqlite3_result_null (context);
 18469  18138   	  return;
 18470  18139         }
 18471  18140       if (argc == 2)
 18472  18141         {
................................................................................
 18477  18146   	    }
 18478  18147   	  use_ellipsoid = sqlite3_value_int (argv[1]);
 18479  18148   	  if (use_ellipsoid != 0)
 18480  18149   	      use_ellipsoid = 1;
 18481  18150         }
 18482  18151       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18483  18152       n_bytes = sqlite3_value_bytes (argv[0]);
 18484         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18153  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18485  18154       if (!geo)
 18486  18155   	sqlite3_result_null (context);
 18487  18156       else
 18488  18157         {
 18489  18158   	  if (use_ellipsoid >= 0)
 18490  18159   	    {
 18491  18160   		/* attempting to identify the corresponding ellipsoid */
................................................................................
 18702  18371   #ifdef ENABLE_LWGEOM		/* only if LWGEOM is enabled */
 18703  18372       double a;
 18704  18373       double b;
 18705  18374       double rf;
 18706  18375       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 18707  18376   #endif /* end LWGEOM conditional */
 18708  18377       gaiaGeomCollPtr geo = NULL;
 18709         -    int gpkg_amphibious = 0;
 18710         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18711  18378       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18712         -    if (cache != NULL)
 18713         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18714  18379       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18715  18380         {
 18716  18381   	  sqlite3_result_null (context);
 18717  18382   	  return;
 18718  18383         }
 18719  18384       if (argc == 2)
 18720  18385         {
................................................................................
 18725  18390   	    }
 18726  18391   	  use_ellipsoid = sqlite3_value_int (argv[1]);
 18727  18392   	  if (use_ellipsoid != 0)
 18728  18393   	      use_ellipsoid = 1;
 18729  18394         }
 18730  18395       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18731  18396       n_bytes = sqlite3_value_bytes (argv[0]);
 18732         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18397  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18733  18398       if (!geo)
 18734  18399   	sqlite3_result_null (context);
 18735  18400       else
 18736  18401         {
 18737  18402   	  if (use_ellipsoid >= 0)
 18738  18403   	    {
 18739  18404   #ifdef ENABLE_LWGEOM		/* only if LWGEOM is enabled */
................................................................................
 18776  18441       int len;
 18777  18442       int ret;
 18778  18443       double x;
 18779  18444       double y;
 18780  18445       unsigned char *p_result = NULL;
 18781  18446       gaiaGeomCollPtr geo = NULL;
 18782  18447       gaiaGeomCollPtr result;
 18783         -    int gpkg_amphibious = 0;
 18784         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18785  18448       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18786         -    if (cache != NULL)
 18787         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18788  18449       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18789  18450         {
 18790  18451   	  sqlite3_result_null (context);
 18791  18452   	  return;
 18792  18453         }
 18793  18454       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18794  18455       n_bytes = sqlite3_value_bytes (argv[0]);
 18795         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18456  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18796  18457       if (!geo)
 18797  18458   	sqlite3_result_null (context);
 18798  18459       else
 18799  18460         {
 18800  18461   	  if (gaiaIsEmpty (geo))
 18801  18462   	      sqlite3_result_null (context);
 18802  18463   	  else
................................................................................
 18835  18496       int n_bytes;
 18836  18497       int len;
 18837  18498       double x;
 18838  18499       double y;
 18839  18500       unsigned char *p_result = NULL;
 18840  18501       gaiaGeomCollPtr geo = NULL;
 18841  18502       gaiaGeomCollPtr result;
 18842         -    int gpkg_amphibious = 0;
 18843         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18844  18503       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18845         -    if (cache != NULL)
 18846         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18847  18504       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18848  18505         {
 18849  18506   	  sqlite3_result_null (context);
 18850  18507   	  return;
 18851  18508         }
 18852  18509       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18853  18510       n_bytes = sqlite3_value_bytes (argv[0]);
 18854         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18511  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18855  18512       if (!geo)
 18856  18513   	sqlite3_result_null (context);
 18857  18514       else
 18858  18515         {
 18859  18516   	  void *data = sqlite3_user_data (context);
 18860  18517   	  int posret;
 18861  18518   	  if (data != NULL)
................................................................................
 18888  18545   */
 18889  18546       unsigned char *p_blob;
 18890  18547       int n_bytes;
 18891  18548       gaiaGeomCollPtr geo = NULL;
 18892  18549       gaiaGeomCollPtr result;
 18893  18550       int int_value;
 18894  18551       double tolerance;
 18895         -    int gpkg_amphibious = 0;
 18896         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18897  18552       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18898         -    if (cache != NULL)
 18899         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18900  18553       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18901  18554         {
 18902  18555   	  sqlite3_result_null (context);
 18903  18556   	  return;
 18904  18557         }
 18905  18558       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 18906  18559   	tolerance = sqlite3_value_double (argv[1]);
................................................................................
 18912  18565       else
 18913  18566         {
 18914  18567   	  sqlite3_result_null (context);
 18915  18568   	  return;
 18916  18569         }
 18917  18570       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18918  18571       n_bytes = sqlite3_value_bytes (argv[0]);
 18919         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18572  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18920  18573       if (!geo)
 18921  18574   	sqlite3_result_null (context);
 18922  18575       else
 18923  18576         {
 18924  18577   	  void *data = sqlite3_user_data (context);
 18925  18578   	  if (data != NULL)
 18926  18579   	      result = gaiaGeomCollSimplify_r (data, geo, tolerance);
................................................................................
 18953  18606   */
 18954  18607       unsigned char *p_blob;
 18955  18608       int n_bytes;
 18956  18609       gaiaGeomCollPtr geo = NULL;
 18957  18610       gaiaGeomCollPtr result;
 18958  18611       int int_value;
 18959  18612       double tolerance;
 18960         -    int gpkg_amphibious = 0;
 18961         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 18962  18613       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 18963         -    if (cache != NULL)
 18964         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 18965  18614       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 18966  18615         {
 18967  18616   	  sqlite3_result_null (context);
 18968  18617   	  return;
 18969  18618         }
 18970  18619       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 18971  18620   	tolerance = sqlite3_value_double (argv[1]);
................................................................................
 18977  18626       else
 18978  18627         {
 18979  18628   	  sqlite3_result_null (context);
 18980  18629   	  return;
 18981  18630         }
 18982  18631       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 18983  18632       n_bytes = sqlite3_value_bytes (argv[0]);
 18984         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18633  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 18985  18634       if (!geo)
 18986  18635   	sqlite3_result_null (context);
 18987  18636       else
 18988  18637         {
 18989  18638   	  void *data = sqlite3_user_data (context);
 18990  18639   	  if (data != NULL)
 18991  18640   	      result =
................................................................................
 19018  18667   */
 19019  18668       unsigned char *p_blob;
 19020  18669       int n_bytes;
 19021  18670       int len;
 19022  18671       unsigned char *p_result = NULL;
 19023  18672       gaiaGeomCollPtr geo = NULL;
 19024  18673       gaiaGeomCollPtr result;
 19025         -    int gpkg_amphibious = 0;
 19026         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19027  18674       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19028         -    if (cache != NULL)
 19029         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19030  18675       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19031  18676         {
 19032  18677   	  sqlite3_result_null (context);
 19033  18678   	  return;
 19034  18679         }
 19035  18680       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19036  18681       n_bytes = sqlite3_value_bytes (argv[0]);
 19037         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18682  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19038  18683       if (!geo)
 19039  18684   	sqlite3_result_null (context);
 19040  18685       else
 19041  18686         {
 19042  18687   	  void *data = sqlite3_user_data (context);
 19043  18688   	  if (data != NULL)
 19044  18689   	      result = gaiaConvexHull_r (data, geo);
................................................................................
 19069  18714       unsigned char *p_blob;
 19070  18715       int n_bytes;
 19071  18716       gaiaGeomCollPtr geo = NULL;
 19072  18717       gaiaGeomCollPtr result;
 19073  18718       double radius;
 19074  18719       int int_value;
 19075  18720       int quadrantsegments = 30;
 19076         -    int gpkg_amphibious = 0;
 19077         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19078  18721       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19079         -    if (cache != NULL)
 19080         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19081  18722       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19082  18723         {
 19083  18724   	  sqlite3_result_null (context);
 19084  18725   	  return;
 19085  18726         }
 19086  18727       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 19087  18728   	radius = sqlite3_value_double (argv[1]);
................................................................................
 19104  18745   	    }
 19105  18746   	  quadrantsegments = sqlite3_value_int (argv[2]);
 19106  18747   	  if (quadrantsegments <= 0)
 19107  18748   	      quadrantsegments = 1;
 19108  18749         }
 19109  18750       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19110  18751       n_bytes = sqlite3_value_bytes (argv[0]);
 19111         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18752  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19112  18753       if (!geo)
 19113  18754   	sqlite3_result_null (context);
 19114  18755       else
 19115  18756         {
 19116  18757   	  void *data = sqlite3_user_data (context);
 19117  18758   	  if (data != NULL)
 19118  18759   	      result =
................................................................................
 19145  18786   / or NULL if any error is encountered
 19146  18787   */
 19147  18788       unsigned char *p_blob;
 19148  18789       int n_bytes;
 19149  18790       gaiaGeomCollPtr geo1 = NULL;
 19150  18791       gaiaGeomCollPtr geo2 = NULL;
 19151  18792       gaiaGeomCollPtr result;
 19152         -    int gpkg_amphibious = 0;
 19153         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19154  18793       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19155         -    if (cache != NULL)
 19156         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19157  18794       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19158  18795         {
 19159  18796   	  sqlite3_result_null (context);
 19160  18797   	  return;
 19161  18798         }
 19162  18799       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19163  18800         {
 19164  18801   	  sqlite3_result_null (context);
 19165  18802   	  return;
 19166  18803         }
 19167  18804       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19168  18805       n_bytes = sqlite3_value_bytes (argv[0]);
 19169         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18806  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19170  18807       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 19171  18808       n_bytes = sqlite3_value_bytes (argv[1]);
 19172         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18809  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19173  18810       if (!geo1 || !geo2)
 19174  18811   	sqlite3_result_null (context);
 19175  18812       else
 19176  18813         {
 19177  18814   	  void *data = sqlite3_user_data (context);
 19178  18815   	  if (data != NULL)
 19179  18816   	      result = gaiaGeometryIntersection_r (data, geo1, geo2);
................................................................................
 19246  18883   */
 19247  18884       struct gaia_geom_chain *chain;
 19248  18885       struct gaia_geom_chain_item *item;
 19249  18886       unsigned char *p_blob;
 19250  18887       int n_bytes;
 19251  18888       gaiaGeomCollPtr geom;
 19252  18889       struct gaia_geom_chain **p;
 19253         -    int gpkg_amphibious = 0;
 19254         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19255  18890       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19256         -    if (cache != NULL)
 19257         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19258  18891       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19259  18892         {
 19260  18893   	  sqlite3_result_null (context);
 19261  18894   	  return;
 19262  18895         }
 19263  18896       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19264  18897       n_bytes = sqlite3_value_bytes (argv[0]);
 19265         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        18898  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19266  18899       if (!geom)
 19267  18900   	return;
 19268  18901       p = sqlite3_aggregate_context (context, sizeof (struct gaia_geom_chain **));
 19269  18902       if (!(*p))
 19270  18903         {
 19271  18904   	  /* this is the first row */
 19272  18905   	  chain = malloc (sizeof (struct gaia_geom_chain));
................................................................................
 19385  19018   / or NULL if any error is encountered
 19386  19019   */
 19387  19020       unsigned char *p_blob;
 19388  19021       int n_bytes;
 19389  19022       gaiaGeomCollPtr geo1 = NULL;
 19390  19023       gaiaGeomCollPtr geo2 = NULL;
 19391  19024       gaiaGeomCollPtr result;
 19392         -    int gpkg_amphibious = 0;
 19393         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19394  19025       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19395         -    if (cache != NULL)
 19396         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19397  19026       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19398  19027         {
 19399  19028   	  sqlite3_result_null (context);
 19400  19029   	  return;
 19401  19030         }
 19402  19031       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19403  19032         {
 19404  19033   	  sqlite3_result_null (context);
 19405  19034   	  return;
 19406  19035         }
 19407  19036       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19408  19037       n_bytes = sqlite3_value_bytes (argv[0]);
 19409         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19038  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19410  19039       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 19411  19040       n_bytes = sqlite3_value_bytes (argv[1]);
 19412         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19041  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19413  19042       if (!geo1 || !geo2)
 19414  19043   	sqlite3_result_null (context);
 19415  19044       else
 19416  19045         {
 19417  19046   	  void *data = sqlite3_user_data (context);
 19418  19047   	  if (data != NULL)
 19419  19048   	      result = gaiaGeometryUnion_r (data, geo1, geo2);
................................................................................
 19450  19079   / or NULL if any error is encountered
 19451  19080   */
 19452  19081       unsigned char *p_blob;
 19453  19082       int n_bytes;
 19454  19083       gaiaGeomCollPtr geo1 = NULL;
 19455  19084       gaiaGeomCollPtr geo2 = NULL;
 19456  19085       gaiaGeomCollPtr result;
 19457         -    int gpkg_amphibious = 0;
 19458         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19459  19086       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19460         -    if (cache != NULL)
 19461         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19462  19087       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19463  19088         {
 19464  19089   	  sqlite3_result_null (context);
 19465  19090   	  return;
 19466  19091         }
 19467  19092       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19468  19093         {
 19469  19094   	  sqlite3_result_null (context);
 19470  19095   	  return;
 19471  19096         }
 19472  19097       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19473  19098       n_bytes = sqlite3_value_bytes (argv[0]);
 19474         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19099  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19475  19100       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 19476  19101       n_bytes = sqlite3_value_bytes (argv[1]);
 19477         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19102  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19478  19103       if (!geo1 || !geo2)
 19479  19104   	sqlite3_result_null (context);
 19480  19105       else
 19481  19106         {
 19482  19107   	  void *data = sqlite3_user_data (context);
 19483  19108   	  if (data != NULL)
 19484  19109   	      result = gaiaGeometryDifference_r (data, geo1, geo2);
................................................................................
 19515  19140   / or NULL if any error is encountered
 19516  19141   */
 19517  19142       unsigned char *p_blob;
 19518  19143       int n_bytes;
 19519  19144       gaiaGeomCollPtr geo1 = NULL;
 19520  19145       gaiaGeomCollPtr geo2 = NULL;
 19521  19146       gaiaGeomCollPtr result;
 19522         -    int gpkg_amphibious = 0;
 19523         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19524  19147       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19525         -    if (cache != NULL)
 19526         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19527  19148       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19528  19149         {
 19529  19150   	  sqlite3_result_null (context);
 19530  19151   	  return;
 19531  19152         }
 19532  19153       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19533  19154         {
 19534  19155   	  sqlite3_result_null (context);
 19535  19156   	  return;
 19536  19157         }
 19537  19158       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19538  19159       n_bytes = sqlite3_value_bytes (argv[0]);
 19539         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19160  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19540  19161       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 19541  19162       n_bytes = sqlite3_value_bytes (argv[1]);
 19542         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19163  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19543  19164       if (!geo1 || !geo2)
 19544  19165   	sqlite3_result_null (context);
 19545  19166       else
 19546  19167         {
 19547  19168   	  void *data = sqlite3_user_data (context);
 19548  19169   	  if (data != NULL)
 19549  19170   	      result = gaiaGeometrySymDifference_r (data, geo1, geo2);
................................................................................
 19582  19203   / or -1 if any error is encountered
 19583  19204   */
 19584  19205       unsigned char *p_blob;
 19585  19206       int n_bytes;
 19586  19207       gaiaGeomCollPtr geo1 = NULL;
 19587  19208       gaiaGeomCollPtr geo2 = NULL;
 19588  19209       int ret;
 19589         -    int gpkg_amphibious = 0;
 19590         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19591  19210       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19592         -    if (cache != NULL)
 19593         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19594  19211       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19595  19212         {
 19596  19213   	  sqlite3_result_int (context, -1);
 19597  19214   	  return;
 19598  19215         }
 19599  19216       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19600  19217         {
 19601  19218   	  sqlite3_result_int (context, -1);
 19602  19219   	  return;
 19603  19220         }
 19604  19221       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 19605  19222       n_bytes = sqlite3_value_bytes (argv[0]);
 19606         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19223  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19607  19224       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 19608  19225       n_bytes = sqlite3_value_bytes (argv[1]);
 19609         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19226  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 19610  19227       if (!geo1 || !geo2)
 19611  19228   	sqlite3_result_int (context, -1);
 19612  19229       else
 19613  19230         {
 19614  19231   	  void *data = sqlite3_user_data (context);
 19615  19232   	  if (data != NULL)
 19616  19233   	      ret = gaiaGeomCollEquals_r (data, geo1, geo2);
................................................................................
 19636  19253       unsigned char *blob1;
 19637  19254       unsigned char *blob2;
 19638  19255       int bytes1;
 19639  19256       int bytes2;
 19640  19257       gaiaGeomCollPtr geo1 = NULL;
 19641  19258       gaiaGeomCollPtr geo2 = NULL;
 19642  19259       int ret;
 19643         -    int gpkg_amphibious = 0;
 19644         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19645  19260       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19646         -    if (cache != NULL)
 19647         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19648  19261       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19649  19262         {
 19650  19263   	  sqlite3_result_int (context, -1);
 19651  19264   	  return;
 19652  19265         }
 19653  19266       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19654  19267         {
 19655  19268   	  sqlite3_result_int (context, -1);
 19656  19269   	  return;
 19657  19270         }
 19658  19271       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19659  19272       bytes1 = sqlite3_value_bytes (argv[0]);
 19660         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19273  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19661  19274       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19662  19275       bytes2 = sqlite3_value_bytes (argv[1]);
 19663         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19276  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19664  19277       if (!geo1 || !geo2)
 19665  19278   	sqlite3_result_int (context, -1);
 19666  19279       else
 19667  19280         {
 19668  19281   	  void *data = sqlite3_user_data (context);
 19669  19282   	  if (data != NULL)
 19670  19283   	      ret = gaiaGeomCollPreparedIntersects (data,
................................................................................
 19692  19305       unsigned char *blob1;
 19693  19306       unsigned char *blob2;
 19694  19307       int bytes1;
 19695  19308       int bytes2;
 19696  19309       gaiaGeomCollPtr geo1 = NULL;
 19697  19310       gaiaGeomCollPtr geo2 = NULL;
 19698  19311       int ret;
 19699         -    int gpkg_amphibious = 0;
 19700         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19701  19312       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19702         -    if (cache != NULL)
 19703         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19704  19313       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19705  19314         {
 19706  19315   	  sqlite3_result_int (context, -1);
 19707  19316   	  return;
 19708  19317         }
 19709  19318       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19710  19319         {
 19711  19320   	  sqlite3_result_int (context, -1);
 19712  19321   	  return;
 19713  19322         }
 19714  19323       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19715  19324       bytes1 = sqlite3_value_bytes (argv[0]);
 19716         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19325  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19717  19326       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19718  19327       bytes2 = sqlite3_value_bytes (argv[1]);
 19719         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19328  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19720  19329       if (!geo1 || !geo2)
 19721  19330   	sqlite3_result_int (context, -1);
 19722  19331       else
 19723  19332         {
 19724  19333   	  void *data = sqlite3_user_data (context);
 19725  19334   	  if (data != NULL)
 19726  19335   	      ret = gaiaGeomCollPreparedDisjoint (data,
................................................................................
 19748  19357       unsigned char *blob1;
 19749  19358       unsigned char *blob2;
 19750  19359       int bytes1;
 19751  19360       int bytes2;
 19752  19361       gaiaGeomCollPtr geo1 = NULL;
 19753  19362       gaiaGeomCollPtr geo2 = NULL;
 19754  19363       int ret;
 19755         -    int gpkg_amphibious = 0;
 19756         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19757  19364       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19758         -    if (cache != NULL)
 19759         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19760  19365       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19761  19366         {
 19762  19367   	  sqlite3_result_int (context, -1);
 19763  19368   	  return;
 19764  19369         }
 19765  19370       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19766  19371         {
 19767  19372   	  sqlite3_result_int (context, -1);
 19768  19373   	  return;
 19769  19374         }
 19770  19375       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19771  19376       bytes1 = sqlite3_value_bytes (argv[0]);
 19772         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19377  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19773  19378       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19774  19379       bytes2 = sqlite3_value_bytes (argv[1]);
 19775         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19380  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19776  19381       if (!geo1 || !geo2)
 19777  19382   	sqlite3_result_int (context, -1);
 19778  19383       else
 19779  19384         {
 19780  19385   	  void *data = sqlite3_user_data (context);
 19781  19386   	  if (data != NULL)
 19782  19387   	      ret = gaiaGeomCollPreparedOverlaps (data,
................................................................................
 19804  19409       unsigned char *blob1;
 19805  19410       unsigned char *blob2;
 19806  19411       int bytes1;
 19807  19412       int bytes2;
 19808  19413       gaiaGeomCollPtr geo1 = NULL;
 19809  19414       gaiaGeomCollPtr geo2 = NULL;
 19810  19415       int ret;
 19811         -    int gpkg_amphibious = 0;
 19812         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19813  19416       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19814         -    if (cache != NULL)
 19815         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19816  19417       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19817  19418         {
 19818  19419   	  sqlite3_result_int (context, -1);
 19819  19420   	  return;
 19820  19421         }
 19821  19422       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19822  19423         {
 19823  19424   	  sqlite3_result_int (context, -1);
 19824  19425   	  return;
 19825  19426         }
 19826  19427       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19827  19428       bytes1 = sqlite3_value_bytes (argv[0]);
 19828         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19429  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19829  19430       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19830  19431       bytes2 = sqlite3_value_bytes (argv[1]);
 19831         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19432  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19832  19433       if (!geo1 || !geo2)
 19833  19434   	sqlite3_result_int (context, -1);
 19834  19435       else
 19835  19436         {
 19836  19437   	  void *data = sqlite3_user_data (context);
 19837  19438   	  if (data != NULL)
 19838  19439   	      ret = gaiaGeomCollPreparedCrosses (data,
................................................................................
 19860  19461       unsigned char *blob1;
 19861  19462       unsigned char *blob2;
 19862  19463       int bytes1;
 19863  19464       int bytes2;
 19864  19465       gaiaGeomCollPtr geo1 = NULL;
 19865  19466       gaiaGeomCollPtr geo2 = NULL;
 19866  19467       int ret;
 19867         -    int gpkg_amphibious = 0;
 19868         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19869  19468       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19870         -    if (cache != NULL)
 19871         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19872  19469       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19873  19470         {
 19874  19471   	  sqlite3_result_int (context, -1);
 19875  19472   	  return;
 19876  19473         }
 19877  19474       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19878  19475         {
 19879  19476   	  sqlite3_result_int (context, -1);
 19880  19477   	  return;
 19881  19478         }
 19882  19479       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19883  19480       bytes1 = sqlite3_value_bytes (argv[0]);
 19884         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19481  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19885  19482       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19886  19483       bytes2 = sqlite3_value_bytes (argv[1]);
 19887         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19484  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19888  19485       if (!geo1 || !geo2)
 19889  19486   	sqlite3_result_int (context, -1);
 19890  19487       else
 19891  19488         {
 19892  19489   	  void *data = sqlite3_user_data (context);
 19893  19490   	  if (data != NULL)
 19894  19491   	      ret = gaiaGeomCollPreparedTouches (data,
................................................................................
 19916  19513       unsigned char *blob1;
 19917  19514       unsigned char *blob2;
 19918  19515       int bytes1;
 19919  19516       int bytes2;
 19920  19517       gaiaGeomCollPtr geo1 = NULL;
 19921  19518       gaiaGeomCollPtr geo2 = NULL;
 19922  19519       int ret;
 19923         -    int gpkg_amphibious = 0;
 19924         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19925  19520       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19926         -    if (cache != NULL)
 19927         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19928  19521       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19929  19522         {
 19930  19523   	  sqlite3_result_int (context, -1);
 19931  19524   	  return;
 19932  19525         }
 19933  19526       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19934  19527         {
 19935  19528   	  sqlite3_result_int (context, -1);
 19936  19529   	  return;
 19937  19530         }
 19938  19531       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19939  19532       bytes1 = sqlite3_value_bytes (argv[0]);
 19940         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19533  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19941  19534       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19942  19535       bytes2 = sqlite3_value_bytes (argv[1]);
 19943         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19536  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 19944  19537       if (!geo1 || !geo2)
 19945  19538   	sqlite3_result_int (context, -1);
 19946  19539       else
 19947  19540         {
 19948  19541   	  void *data = sqlite3_user_data (context);
 19949  19542   	  if (data != NULL)
 19950  19543   	      ret = gaiaGeomCollPreparedWithin (data, geo1,
................................................................................
 19972  19565       unsigned char *blob1;
 19973  19566       unsigned char *blob2;
 19974  19567       int bytes1;
 19975  19568       int bytes2;
 19976  19569       gaiaGeomCollPtr geo1 = NULL;
 19977  19570       gaiaGeomCollPtr geo2 = NULL;
 19978  19571       int ret;
 19979         -    int gpkg_amphibious = 0;
 19980         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 19981  19572       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 19982         -    if (cache != NULL)
 19983         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 19984  19573       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 19985  19574         {
 19986  19575   	  sqlite3_result_int (context, -1);
 19987  19576   	  return;
 19988  19577         }
 19989  19578       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 19990  19579         {
 19991  19580   	  sqlite3_result_int (context, -1);
 19992  19581   	  return;
 19993  19582         }
 19994  19583       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 19995  19584       bytes1 = sqlite3_value_bytes (argv[0]);
 19996         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        19585  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 19997  19586       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 19998  19587       bytes2 = sqlite3_value_bytes (argv[1]);
 19999         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        19588  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 20000  19589       if (!geo1 || !geo2)
 20001  19590   	sqlite3_result_int (context, -1);
 20002  19591       else
 20003  19592         {
 20004  19593   	  void *data = sqlite3_user_data (context);
 20005  19594   	  if (data != NULL)
 20006  19595   	      ret = gaiaGeomCollPreparedContains (data,
................................................................................
 20027  19616   */
 20028  19617       unsigned char *p_blob;
 20029  19618       int n_bytes;
 20030  19619       gaiaGeomCollPtr geo1 = NULL;
 20031  19620       gaiaGeomCollPtr geo2 = NULL;
 20032  19621       int ret;
 20033  19622       const unsigned char *pattern;
 20034         -    int gpkg_amphibious = 0;
 20035         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 20036  19623       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 20037         -    if (cache != NULL)
 20038         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 20039  19624       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 20040  19625         {
 20041  19626   	  sqlite3_result_int (context, -1);
 20042  19627   	  return;
 20043  19628         }
 20044  19629       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 20045  19630         {
................................................................................
 20049  19634       if (sqlite3_value_type (argv[2]) != SQLITE_TEXT)
 20050  19635         {
 20051  19636   	  sqlite3_result_int (context, -1);
 20052  19637   	  return;
 20053  19638         }
 20054  19639       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 20055  19640       n_bytes = sqlite3_value_bytes (argv[0]);
 20056         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19641  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20057  19642       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 20058  19643       n_bytes = sqlite3_value_bytes (argv[1]);
 20059         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19644  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20060  19645       pattern = sqlite3_value_text (argv[2]);
 20061  19646       if (!geo1 || !geo2)
 20062  19647   	sqlite3_result_int (context, -1);
 20063  19648       else
 20064  19649         {
 20065  19650   	  void *data = sqlite3_user_data (context);
 20066  19651   	  if (data != NULL)
................................................................................
 20090  19675       int use_ellipsoid = -1;
 20091  19676       double a;
 20092  19677       double b;
 20093  19678       double rf;
 20094  19679       int ret;
 20095  19680       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 20096  19681       void *data = sqlite3_user_data (context);
 20097         -    int gpkg_amphibious = 0;
 20098         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 20099  19682       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 20100         -    if (cache != NULL)
 20101         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 20102  19683       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 20103  19684         {
 20104  19685   	  sqlite3_result_null (context);
 20105  19686   	  return;
 20106  19687         }
 20107  19688       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 20108  19689         {
................................................................................
 20118  19699   	    }
 20119  19700   	  use_ellipsoid = sqlite3_value_int (argv[2]);
 20120  19701   	  if (use_ellipsoid != 0)
 20121  19702   	      use_ellipsoid = 1;
 20122  19703         }
 20123  19704       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 20124  19705       n_bytes = sqlite3_value_bytes (argv[0]);
 20125         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19706  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20126  19707       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 20127  19708       n_bytes = sqlite3_value_bytes (argv[1]);
 20128         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19709  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20129  19710       if (!geo1 || !geo2)
 20130  19711   	sqlite3_result_null (context);
 20131  19712       else
 20132  19713         {
 20133  19714   	  if (use_ellipsoid >= 0)
 20134  19715   	    {
 20135  19716   		/* attempting to identify the corresponding ellipsoid */
................................................................................
 20290  19871       int pg1 = 0;
 20291  19872       double dist;
 20292  19873       double a;
 20293  19874       double b;
 20294  19875       double rf;
 20295  19876       int ret;
 20296  19877       void *data = sqlite3_user_data (context);
 20297         -    int gpkg_amphibious = 0;
 20298         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 20299  19878       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 20300         -    if (cache != NULL)
 20301         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 20302  19879       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 20303  19880         {
 20304  19881   	  sqlite3_result_null (context);
 20305  19882   	  return;
 20306  19883         }
 20307  19884       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 20308  19885         {
................................................................................
 20324  19901   	    {
 20325  19902   		sqlite3_result_null (context);
 20326  19903   		return;
 20327  19904   	    }
 20328  19905         }
 20329  19906       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 20330  19907       n_bytes = sqlite3_value_bytes (argv[0]);
 20331         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19908  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20332  19909       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 20333  19910       n_bytes = sqlite3_value_bytes (argv[1]);
 20334         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        19911  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 20335  19912       if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 20336  19913         {
 20337  19914   	  int dst = sqlite3_value_int (argv[2]);
 20338  19915   	  ref_dist = dst;
 20339  19916         }
 20340  19917       else
 20341  19918   	ref_dist = sqlite3_value_double (argv[2]);
................................................................................
 22118  21695   */
 22119  21696       unsigned char *p_blob;
 22120  21697       int n_bytes;
 22121  21698       gaiaGeomCollPtr geo = NULL;
 22122  21699       gaiaGeomCollPtr result;
 22123  21700       double radius;
 22124  21701       int int_value;
 22125         -    int gpkg_amphibious = 0;
 22126         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22127  21702       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22128         -    if (cache != NULL)
 22129         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22130  21703       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22131  21704         {
 22132  21705   	  sqlite3_result_null (context);
 22133  21706   	  return;
 22134  21707         }
 22135  21708       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 22136  21709   	radius = sqlite3_value_double (argv[1]);
................................................................................
 22142  21715       else
 22143  21716         {
 22144  21717   	  sqlite3_result_null (context);
 22145  21718   	  return;
 22146  21719         }
 22147  21720       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22148  21721       n_bytes = sqlite3_value_bytes (argv[0]);
 22149         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21722  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22150  21723       if (!geo)
 22151  21724   	sqlite3_result_null (context);
 22152  21725       else
 22153  21726         {
 22154  21727   	  void *data = sqlite3_user_data (context);
 22155  21728   	  if (data != NULL)
 22156  21729   	      result = gaiaOffsetCurve_r (data, geo, radius, 16, 0);
................................................................................
 22186  21759       unsigned char *p_blob;
 22187  21760       int n_bytes;
 22188  21761       gaiaGeomCollPtr geo = NULL;
 22189  21762       gaiaGeomCollPtr result;
 22190  21763       double radius;
 22191  21764       int int_value;
 22192  21765       int left_right;
 22193         -    int gpkg_amphibious = 0;
 22194         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22195  21766       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22196         -    if (cache != NULL)
 22197         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22198  21767       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22199  21768         {
 22200  21769   	  sqlite3_result_null (context);
 22201  21770   	  return;
 22202  21771         }
 22203  21772       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 22204  21773   	radius = sqlite3_value_double (argv[1]);
................................................................................
 22217  21786       else
 22218  21787         {
 22219  21788   	  sqlite3_result_null (context);
 22220  21789   	  return;
 22221  21790         }
 22222  21791       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22223  21792       n_bytes = sqlite3_value_bytes (argv[0]);
 22224         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21793  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22225  21794       if (!geo)
 22226  21795   	sqlite3_result_null (context);
 22227  21796       else
 22228  21797         {
 22229  21798   	  void *data = sqlite3_user_data (context);
 22230  21799   	  if (data != NULL)
 22231  21800   	      result =
................................................................................
 22259  21828   */
 22260  21829       unsigned char *p_blob;
 22261  21830       int n_bytes;
 22262  21831       gaiaGeomCollPtr geo1 = NULL;
 22263  21832       gaiaGeomCollPtr geo2 = NULL;
 22264  21833       double dist;
 22265  21834       int ret;
 22266         -    int gpkg_amphibious = 0;
 22267         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22268  21835       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22269         -    if (cache != NULL)
 22270         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22271  21836       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22272  21837         {
 22273  21838   	  sqlite3_result_null (context);
 22274  21839   	  return;
 22275  21840         }
 22276  21841       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22277  21842         {
 22278  21843   	  sqlite3_result_null (context);
 22279  21844   	  return;
 22280  21845         }
 22281  21846       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22282  21847       n_bytes = sqlite3_value_bytes (argv[0]);
 22283         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21848  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22284  21849       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22285  21850       n_bytes = sqlite3_value_bytes (argv[1]);
 22286         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21851  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22287  21852       if (!geo1 || !geo2)
 22288  21853   	sqlite3_result_null (context);
 22289  21854       else
 22290  21855         {
 22291  21856   	  void *data = sqlite3_user_data (context);
 22292  21857   	  if (data != NULL)
 22293  21858   	      ret = gaiaHausdorffDistance_r (data, geo1, geo2, &dist);
................................................................................
 22312  21877   / or NULL if any error is encountered
 22313  21878   */
 22314  21879       unsigned char *p_blob;
 22315  21880       int n_bytes;
 22316  21881       gaiaGeomCollPtr geo1 = NULL;
 22317  21882       gaiaGeomCollPtr geo2 = NULL;
 22318  21883       gaiaGeomCollPtr result;
 22319         -    int gpkg_amphibious = 0;
 22320         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22321  21884       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22322         -    if (cache != NULL)
 22323         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22324  21885       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22325  21886         {
 22326  21887   	  sqlite3_result_null (context);
 22327  21888   	  return;
 22328  21889         }
 22329  21890       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22330  21891         {
 22331  21892   	  sqlite3_result_null (context);
 22332  21893   	  return;
 22333  21894         }
 22334  21895       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22335  21896       n_bytes = sqlite3_value_bytes (argv[0]);
 22336         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21897  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22337  21898       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22338  21899       n_bytes = sqlite3_value_bytes (argv[1]);
 22339         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        21900  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22340  21901       if (geo1 == NULL || geo2 == NULL)
 22341  21902   	sqlite3_result_null (context);
 22342  21903       else
 22343  21904         {
 22344  21905   	  void *data = sqlite3_user_data (context);
 22345  21906   	  if (data != NULL)
 22346  21907   	      result = gaiaSharedPaths_r (data, geo1, geo2);
................................................................................
 22377  21938       unsigned char *blob1;
 22378  21939       unsigned char *blob2;
 22379  21940       int bytes1;
 22380  21941       int bytes2;
 22381  21942       gaiaGeomCollPtr geo1 = NULL;
 22382  21943       gaiaGeomCollPtr geo2 = NULL;
 22383  21944       int ret;
 22384         -    int gpkg_amphibious = 0;
 22385         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22386  21945       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22387         -    if (cache != NULL)
 22388         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22389  21946       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22390  21947         {
 22391  21948   	  sqlite3_result_int (context, -1);
 22392  21949   	  return;
 22393  21950         }
 22394  21951       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22395  21952         {
 22396  21953   	  sqlite3_result_int (context, -1);
 22397  21954   	  return;
 22398  21955         }
 22399  21956       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 22400  21957       bytes1 = sqlite3_value_bytes (argv[0]);
 22401         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        21958  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 22402  21959       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 22403  21960       bytes2 = sqlite3_value_bytes (argv[1]);
 22404         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        21961  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 22405  21962       if (!geo1 || !geo2)
 22406  21963   	sqlite3_result_int (context, -1);
 22407  21964       else
 22408  21965         {
 22409  21966   	  void *data = sqlite3_user_data (context);
 22410  21967   	  if (data != NULL)
 22411  21968   	      ret = gaiaGeomCollPreparedCovers (data, geo1,
................................................................................
 22433  21990       unsigned char *blob1;
 22434  21991       unsigned char *blob2;
 22435  21992       int bytes1;
 22436  21993       int bytes2;
 22437  21994       gaiaGeomCollPtr geo1 = NULL;
 22438  21995       gaiaGeomCollPtr geo2 = NULL;
 22439  21996       int ret;
 22440         -    int gpkg_amphibious = 0;
 22441         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22442  21997       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22443         -    if (cache != NULL)
 22444         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22445  21998       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22446  21999         {
 22447  22000   	  sqlite3_result_int (context, -1);
 22448  22001   	  return;
 22449  22002         }
 22450  22003       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22451  22004         {
 22452  22005   	  sqlite3_result_int (context, -1);
 22453  22006   	  return;
 22454  22007         }
 22455  22008       blob1 = (unsigned char *) sqlite3_value_blob (argv[0]);
 22456  22009       bytes1 = sqlite3_value_bytes (argv[0]);
 22457         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (blob1, bytes1, gpkg_amphibious);
        22010  +    geo1 = gaiaFromSpatiaLiteBlobWkb (blob1, bytes1);
 22458  22011       blob2 = (unsigned char *) sqlite3_value_blob (argv[1]);
 22459  22012       bytes2 = sqlite3_value_bytes (argv[1]);
 22460         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (blob2, bytes2, gpkg_amphibious);
        22013  +    geo2 = gaiaFromSpatiaLiteBlobWkb (blob2, bytes2);
 22461  22014       if (!geo1 || !geo2)
 22462  22015   	sqlite3_result_int (context, -1);
 22463  22016       else
 22464  22017         {
 22465  22018   	  void *data = sqlite3_user_data (context);
 22466  22019   	  if (data != NULL)
 22467  22020   	      ret = gaiaGeomCollPreparedCoveredBy (data,
................................................................................
 22488  22041   */
 22489  22042       unsigned char *p_blob;
 22490  22043       int n_bytes;
 22491  22044       int int_value;
 22492  22045       double fraction;
 22493  22046       gaiaGeomCollPtr geo = NULL;
 22494  22047       gaiaGeomCollPtr result;
 22495         -    int gpkg_amphibious = 0;
 22496         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22497  22048       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22498         -    if (cache != NULL)
 22499         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22500  22049       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22501  22050         {
 22502  22051   	  sqlite3_result_null (context);
 22503  22052   	  return;
 22504  22053         }
 22505  22054       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 22506  22055   	fraction = sqlite3_value_double (argv[1]);
................................................................................
 22512  22061       else
 22513  22062         {
 22514  22063   	  sqlite3_result_null (context);
 22515  22064   	  return;
 22516  22065         }
 22517  22066       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22518  22067       n_bytes = sqlite3_value_bytes (argv[0]);
 22519         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22068  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22520  22069       if (geo == NULL)
 22521  22070   	sqlite3_result_null (context);
 22522  22071       else
 22523  22072         {
 22524  22073   	  void *data = sqlite3_user_data (context);
 22525  22074   	  if (data != NULL)
 22526  22075   	      result = gaiaLineInterpolatePoint_r (data, geo, fraction);
................................................................................
 22555  22104   */
 22556  22105       unsigned char *p_blob;
 22557  22106       int n_bytes;
 22558  22107       int int_value;
 22559  22108       double distance;
 22560  22109       gaiaGeomCollPtr geo = NULL;
 22561  22110       gaiaGeomCollPtr result;
 22562         -    int gpkg_amphibious = 0;
 22563         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22564  22111       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22565         -    if (cache != NULL)
 22566         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22567  22112       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22568  22113         {
 22569  22114   	  sqlite3_result_null (context);
 22570  22115   	  return;
 22571  22116         }
 22572  22117       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 22573  22118   	distance = sqlite3_value_double (argv[1]);
................................................................................
 22579  22124       else
 22580  22125         {
 22581  22126   	  sqlite3_result_null (context);
 22582  22127   	  return;
 22583  22128         }
 22584  22129       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22585  22130       n_bytes = sqlite3_value_bytes (argv[0]);
 22586         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22131  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22587  22132       if (geo == NULL)
 22588  22133   	sqlite3_result_null (context);
 22589  22134       else
 22590  22135         {
 22591  22136   	  void *data = sqlite3_user_data (context);
 22592  22137   	  if (data != NULL)
 22593  22138   	      result =
................................................................................
 22625  22170   / - geom2 is expected to represent some POINT
 22626  22171   */
 22627  22172       unsigned char *p_blob;
 22628  22173       int n_bytes;
 22629  22174       double fraction;
 22630  22175       gaiaGeomCollPtr geo1 = NULL;
 22631  22176       gaiaGeomCollPtr geo2 = NULL;
 22632         -    int gpkg_amphibious = 0;
 22633         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22634  22177       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22635         -    if (cache != NULL)
 22636         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22637  22178       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22638  22179         {
 22639  22180   	  sqlite3_result_null (context);
 22640  22181   	  return;
 22641  22182         }
 22642  22183       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22643  22184         {
 22644  22185   	  sqlite3_result_null (context);
 22645  22186   	  return;
 22646  22187         }
 22647  22188       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22648  22189       n_bytes = sqlite3_value_bytes (argv[0]);
 22649         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22190  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22650  22191       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22651  22192       n_bytes = sqlite3_value_bytes (argv[1]);
 22652         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22193  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22653  22194       if (geo1 == NULL || geo2 == NULL)
 22654  22195   	sqlite3_result_null (context);
 22655  22196       else
 22656  22197         {
 22657  22198   	  void *data = sqlite3_user_data (context);
 22658  22199   	  if (data != NULL)
 22659  22200   	      fraction = gaiaLineLocatePoint_r (data, geo1, geo2);
................................................................................
 22681  22222       unsigned char *p_blob;
 22682  22223       int n_bytes;
 22683  22224       int int_value;
 22684  22225       double fraction1;
 22685  22226       double fraction2;
 22686  22227       gaiaGeomCollPtr geo = NULL;
 22687  22228       gaiaGeomCollPtr result;
 22688         -    int gpkg_amphibious = 0;
 22689         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22690  22229       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22691         -    if (cache != NULL)
 22692         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22693  22230       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22694  22231         {
 22695  22232   	  sqlite3_result_null (context);
 22696  22233   	  return;
 22697  22234         }
 22698  22235       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 22699  22236   	fraction1 = sqlite3_value_double (argv[1]);
................................................................................
 22717  22254       else
 22718  22255         {
 22719  22256   	  sqlite3_result_null (context);
 22720  22257   	  return;
 22721  22258         }
 22722  22259       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22723  22260       n_bytes = sqlite3_value_bytes (argv[0]);
 22724         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22261  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22725  22262       if (geo == NULL)
 22726  22263   	sqlite3_result_null (context);
 22727  22264       else
 22728  22265         {
 22729  22266   	  void *data = sqlite3_user_data (context);
 22730  22267   	  if (data != NULL)
 22731  22268   	      result = gaiaLineSubstring_r (data, geo, fraction1, fraction2);
................................................................................
 22757  22294   / NULL is returned for invalid arguments (or if distance is ZERO)
 22758  22295   */
 22759  22296       unsigned char *p_blob;
 22760  22297       int n_bytes;
 22761  22298       gaiaGeomCollPtr geo1 = NULL;
 22762  22299       gaiaGeomCollPtr geo2 = NULL;
 22763  22300       gaiaGeomCollPtr result;
 22764         -    int gpkg_amphibious = 0;
 22765         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22766  22301       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22767         -    if (cache != NULL)
 22768         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22769  22302       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22770  22303         {
 22771  22304   	  sqlite3_result_null (context);
 22772  22305   	  return;
 22773  22306         }
 22774  22307       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22775  22308         {
 22776  22309   	  sqlite3_result_null (context);
 22777  22310   	  return;
 22778  22311         }
 22779  22312       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22780  22313       n_bytes = sqlite3_value_bytes (argv[0]);
 22781         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22314  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22782  22315       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22783  22316       n_bytes = sqlite3_value_bytes (argv[1]);
 22784         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22317  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22785  22318       if (geo1 == NULL || geo2 == NULL)
 22786  22319   	sqlite3_result_null (context);
 22787  22320       else
 22788  22321         {
 22789  22322   	  void *data = sqlite3_user_data (context);
 22790  22323   	  if (data != NULL)
 22791  22324   	      result = gaiaShortestLine_r (data, geo1, geo2);
................................................................................
 22858  22391   / NULL is returned for invalid arguments (or if distance is ZERO)
 22859  22392   */
 22860  22393       unsigned char *p_blob;
 22861  22394       int n_bytes;
 22862  22395       gaiaGeomCollPtr geo1 = NULL;
 22863  22396       gaiaGeomCollPtr geo2 = NULL;
 22864  22397       gaiaGeomCollPtr result;
 22865         -    int gpkg_amphibious = 0;
 22866         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22867  22398       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22868         -    if (cache != NULL)
 22869         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22870  22399       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22871  22400         {
 22872  22401   	  sqlite3_result_null (context);
 22873  22402   	  return;
 22874  22403         }
 22875  22404       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22876  22405         {
 22877  22406   	  sqlite3_result_null (context);
 22878  22407   	  return;
 22879  22408         }
 22880  22409       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22881  22410       n_bytes = sqlite3_value_bytes (argv[0]);
 22882         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22411  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22883  22412       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22884  22413       n_bytes = sqlite3_value_bytes (argv[1]);
 22885         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22414  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22886  22415       if (geo1 == NULL || geo2 == NULL)
 22887  22416   	sqlite3_result_null (context);
 22888  22417       else
 22889  22418         {
 22890  22419   	  void *data = sqlite3_user_data (context);
 22891  22420   	  if (data != NULL)
 22892  22421   	      result = gaiaShortestLine_r (data, geo1, geo2);
................................................................................
 22923  22452       unsigned char *p_blob;
 22924  22453       int n_bytes;
 22925  22454       int int_value;
 22926  22455       double tolerance;
 22927  22456       gaiaGeomCollPtr geo1 = NULL;
 22928  22457       gaiaGeomCollPtr geo2 = NULL;
 22929  22458       gaiaGeomCollPtr result;
 22930         -    int gpkg_amphibious = 0;
 22931         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 22932  22459       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 22933         -    if (cache != NULL)
 22934         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 22935  22460       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 22936  22461         {
 22937  22462   	  sqlite3_result_null (context);
 22938  22463   	  return;
 22939  22464         }
 22940  22465       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 22941  22466         {
................................................................................
 22952  22477       else
 22953  22478         {
 22954  22479   	  sqlite3_result_null (context);
 22955  22480   	  return;
 22956  22481         }
 22957  22482       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 22958  22483       n_bytes = sqlite3_value_bytes (argv[0]);
 22959         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22484  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22960  22485       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 22961  22486       n_bytes = sqlite3_value_bytes (argv[1]);
 22962         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22487  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 22963  22488       if (geo1 == NULL || geo2 == NULL)
 22964  22489   	sqlite3_result_null (context);
 22965  22490       else
 22966  22491         {
 22967  22492   	  void *data = sqlite3_user_data (context);
 22968  22493   	  if (data != NULL)
 22969  22494   	      result = gaiaSnap_r (data, geo1, geo2, tolerance);
................................................................................
 22997  22522   / (or a set of lines)
 22998  22523   / NULL is returned for invalid arguments
 22999  22524   */
 23000  22525       unsigned char *p_blob;
 23001  22526       int n_bytes;
 23002  22527       gaiaGeomCollPtr geo = NULL;
 23003  22528       gaiaGeomCollPtr result;
 23004         -    int gpkg_amphibious = 0;
 23005         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23006  22529       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23007         -    if (cache != NULL)
 23008         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23009  22530       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23010  22531         {
 23011  22532   	  sqlite3_result_null (context);
 23012  22533   	  return;
 23013  22534         }
 23014  22535       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23015  22536       n_bytes = sqlite3_value_bytes (argv[0]);
 23016         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22537  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23017  22538       if (geo == NULL)
 23018  22539   	sqlite3_result_null (context);
 23019  22540       else
 23020  22541         {
 23021  22542   	  void *data = sqlite3_user_data (context);
 23022  22543   	  if (data != NULL)
 23023  22544   	      result = gaiaLineMerge_r (data, geo);
................................................................................
 23048  22569   / exactly like Union, but using a single Collection
 23049  22570   / NULL is returned for invalid arguments
 23050  22571   */
 23051  22572       unsigned char *p_blob;
 23052  22573       int n_bytes;
 23053  22574       gaiaGeomCollPtr geo = NULL;
 23054  22575       gaiaGeomCollPtr result;
 23055         -    int gpkg_amphibious = 0;
 23056         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23057  22576       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23058         -    if (cache != NULL)
 23059         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23060  22577       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23061  22578         {
 23062  22579   	  sqlite3_result_null (context);
 23063  22580   	  return;
 23064  22581         }
 23065  22582       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23066  22583       n_bytes = sqlite3_value_bytes (argv[0]);
 23067         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22584  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23068  22585       if (geo == NULL)
 23069  22586   	sqlite3_result_null (context);
 23070  22587       else
 23071  22588         {
 23072  22589   	  void *data = sqlite3_user_data (context);
 23073  22590   	  if (data != NULL)
 23074  22591   	      result = gaiaUnaryUnion_r (data, geo);
................................................................................
 23109  22626       double origin_x = 0.0;
 23110  22627       double origin_y = 0.0;
 23111  22628       double size;
 23112  22629       int edges_only = 0;
 23113  22630       gaiaGeomCollPtr geo = NULL;
 23114  22631       gaiaGeomCollPtr point = NULL;
 23115  22632       gaiaGeomCollPtr result = NULL;
 23116         -    int gpkg_amphibious = 0;
 23117         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23118  22633       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23119         -    if (cache != NULL)
 23120         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23121  22634       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23122  22635         {
 23123  22636   	  sqlite3_result_null (context);
 23124  22637   	  return;
 23125  22638         }
 23126  22639       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 23127  22640         {
................................................................................
 23158  22671   	  if (sqlite3_value_type (argv[3]) != SQLITE_BLOB)
 23159  22672   	    {
 23160  22673   		sqlite3_result_null (context);
 23161  22674   		return;
 23162  22675   	    }
 23163  22676   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[3]);
 23164  22677   	  n_bytes = sqlite3_value_bytes (argv[3]);
 23165         -	  point =
 23166         -	      gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22678  +	  point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23167  22679   	  if (!point)
 23168  22680   	    {
 23169  22681   		sqlite3_result_null (context);
 23170  22682   		return;
 23171  22683   	    }
 23172  22684   	  if (point->FirstLinestring != NULL)
 23173  22685   	      goto no_point;
................................................................................
 23186  22698   	    }
 23187  22699   	  else
 23188  22700   	      goto no_point;
 23189  22701   
 23190  22702         }
 23191  22703       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23192  22704       n_bytes = sqlite3_value_bytes (argv[0]);
 23193         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22705  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23194  22706       if (!geo)
 23195  22707   	sqlite3_result_null (context);
 23196  22708       else
 23197  22709         {
 23198  22710   	  void *data = sqlite3_user_data (context);
 23199  22711   	  if (geo->FirstPoint != NULL)
 23200  22712   	      goto no_polygon;
................................................................................
 23255  22767       double origin_x = 0.0;
 23256  22768       double origin_y = 0.0;
 23257  22769       double size;
 23258  22770       int edges_only = 0;
 23259  22771       gaiaGeomCollPtr geo = NULL;
 23260  22772       gaiaGeomCollPtr point = NULL;
 23261  22773       gaiaGeomCollPtr result = NULL;
 23262         -    int gpkg_amphibious = 0;
 23263         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23264  22774       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23265         -    if (cache != NULL)
 23266         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23267  22775       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23268  22776         {
 23269  22777   	  sqlite3_result_null (context);
 23270  22778   	  return;
 23271  22779         }
 23272  22780       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 23273  22781         {
................................................................................
 23304  22812   	  if (sqlite3_value_type (argv[3]) != SQLITE_BLOB)
 23305  22813   	    {
 23306  22814   		sqlite3_result_null (context);
 23307  22815   		return;
 23308  22816   	    }
 23309  22817   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[3]);
 23310  22818   	  n_bytes = sqlite3_value_bytes (argv[3]);
 23311         -	  point =
 23312         -	      gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22819  +	  point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23313  22820   	  if (!point)
 23314  22821   	    {
 23315  22822   		sqlite3_result_null (context);
 23316  22823   		return;
 23317  22824   	    }
 23318  22825   	  if (point->FirstLinestring != NULL)
 23319  22826   	      goto no_point;
................................................................................
 23332  22839   	    }
 23333  22840   	  else
 23334  22841   	      goto no_point;
 23335  22842   
 23336  22843         }
 23337  22844       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23338  22845       n_bytes = sqlite3_value_bytes (argv[0]);
 23339         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22846  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23340  22847       if (!geo)
 23341  22848   	sqlite3_result_null (context);
 23342  22849       else
 23343  22850         {
 23344  22851   	  void *data = sqlite3_user_data (context);
 23345  22852   	  if (geo->FirstPoint != NULL)
 23346  22853   	      goto no_polygon;
................................................................................
 23402  22909       double origin_x = 0.0;
 23403  22910       double origin_y = 0.0;
 23404  22911       double size;
 23405  22912       int edges_only = 0;
 23406  22913       gaiaGeomCollPtr geo = NULL;
 23407  22914       gaiaGeomCollPtr point = NULL;
 23408  22915       gaiaGeomCollPtr result = NULL;
 23409         -    int gpkg_amphibious = 0;
 23410         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23411  22916       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23412         -    if (cache != NULL)
 23413         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23414  22917       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23415  22918         {
 23416  22919   	  sqlite3_result_null (context);
 23417  22920   	  return;
 23418  22921         }
 23419  22922       if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 23420  22923         {
................................................................................
 23451  22954   	  if (sqlite3_value_type (argv[3]) != SQLITE_BLOB)
 23452  22955   	    {
 23453  22956   		sqlite3_result_null (context);
 23454  22957   		return;
 23455  22958   	    }
 23456  22959   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[3]);
 23457  22960   	  n_bytes = sqlite3_value_bytes (argv[3]);
 23458         -	  point =
 23459         -	      gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22961  +	  point = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23460  22962   	  if (!point)
 23461  22963   	    {
 23462  22964   		sqlite3_result_null (context);
 23463  22965   		return;
 23464  22966   	    }
 23465  22967   	  if (point->FirstLinestring != NULL)
 23466  22968   	      goto no_point;
................................................................................
 23479  22981   	    }
 23480  22982   	  else
 23481  22983   	      goto no_point;
 23482  22984   
 23483  22985         }
 23484  22986       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23485  22987       n_bytes = sqlite3_value_bytes (argv[0]);
 23486         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        22988  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23487  22989       if (!geo)
 23488  22990   	sqlite3_result_null (context);
 23489  22991       else
 23490  22992         {
 23491  22993   	  void *data = sqlite3_user_data (context);
 23492  22994   	  if (geo->FirstPoint != NULL)
 23493  22995   	      goto no_polygon;
................................................................................
 23542  23044   / NULL is returned for invalid arguments
 23543  23045   */
 23544  23046       unsigned char *p_blob;
 23545  23047       int n_bytes;
 23546  23048       gaiaGeomCollPtr geom1 = NULL;
 23547  23049       gaiaGeomCollPtr geom2 = NULL;
 23548  23050       gaiaGeomCollPtr result;
 23549         -    int gpkg_amphibious = 0;
 23550         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23551  23051       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23552         -    if (cache != NULL)
 23553         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23554  23052       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23555  23053         {
 23556  23054   	  sqlite3_result_null (context);
 23557  23055   	  return;
 23558  23056         }
 23559  23057       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 23560  23058         {
 23561  23059   	  sqlite3_result_null (context);
 23562  23060   	  return;
 23563  23061         }
 23564  23062       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23565  23063       n_bytes = sqlite3_value_bytes (argv[0]);
 23566         -    geom1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23064  +    geom1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23567  23065       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 23568  23066       n_bytes = sqlite3_value_bytes (argv[1]);
 23569         -    geom2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23067  +    geom2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23570  23068       if (geom1 == NULL || geom2 == NULL)
 23571  23069         {
 23572  23070   	  if (geom1)
 23573  23071   	      gaiaFreeGeomColl (geom1);
 23574  23072   	  if (geom2)
 23575  23073   	      gaiaFreeGeomColl (geom2);
 23576  23074   	  sqlite3_result_null (context);
................................................................................
 23797  23295       gaiaPointPtr pt;
 23798  23296       gaiaLinestringPtr ln;
 23799  23297       gaiaPolygonPtr pg;
 23800  23298       gaiaGeomCollPtr geom = NULL;
 23801  23299       gaiaGeomCollPtr geom1 = NULL;
 23802  23300       gaiaGeomCollPtr geom2 = NULL;
 23803  23301       gaiaGeomCollPtr result;
 23804         -    int gpkg_amphibious = 0;
 23805         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23806  23302       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23807         -    if (cache != NULL)
 23808         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23809  23303       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23810  23304         {
 23811  23305   	  sqlite3_result_null (context);
 23812  23306   	  return;
 23813  23307         }
 23814  23308       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23815  23309       n_bytes = sqlite3_value_bytes (argv[0]);
 23816         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23310  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23817  23311       if (geom == NULL)
 23818  23312         {
 23819  23313   	  sqlite3_result_null (context);
 23820  23314   	  return;
 23821  23315         }
 23822  23316   
 23823  23317   /* checking if Geometry is a Polygon or MultiPolyhon */
................................................................................
 23908  23402       unsigned char *p_blob;
 23909  23403       int n_bytes;
 23910  23404       gaiaGeomCollPtr geo = NULL;
 23911  23405       gaiaGeomCollPtr result;
 23912  23406       int int_value;
 23913  23407       double tolerance = 0.0;
 23914  23408       int only_edges = 0;
 23915         -    int gpkg_amphibious = 0;
 23916         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 23917  23409       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 23918         -    if (cache != NULL)
 23919         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 23920  23410       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 23921  23411         {
 23922  23412   	  sqlite3_result_null (context);
 23923  23413   	  return;
 23924  23414         }
 23925  23415       if (argc >= 2)
 23926  23416         {
................................................................................
 23945  23435   	    {
 23946  23436   		sqlite3_result_null (context);
 23947  23437   		return;
 23948  23438   	    }
 23949  23439         }
 23950  23440       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 23951  23441       n_bytes = sqlite3_value_bytes (argv[0]);
 23952         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23442  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 23953  23443       if (geo == NULL)
 23954  23444   	sqlite3_result_null (context);
 23955  23445       else
 23956  23446         {
 23957  23447   	  void *data = sqlite3_user_data (context);
 23958  23448   	  if (data != NULL)
 23959  23449   	      result =
................................................................................
 23996  23486       int n_bytes;
 23997  23487       gaiaGeomCollPtr geo = NULL;
 23998  23488       gaiaGeomCollPtr result;
 23999  23489       int int_value;
 24000  23490       double tolerance = 0.0;
 24001  23491       double extra_frame_size = -1.0;
 24002  23492       int only_edges = 0;
 24003         -    int gpkg_amphibious = 0;
 24004         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24005  23493       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24006         -    if (cache != NULL)
 24007         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24008  23494       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24009  23495         {
 24010  23496   	  sqlite3_result_null (context);
 24011  23497   	  return;
 24012  23498         }
 24013  23499       if (argc >= 2)
 24014  23500         {
................................................................................
 24048  23534   	    {
 24049  23535   		sqlite3_result_null (context);
 24050  23536   		return;
 24051  23537   	    }
 24052  23538         }
 24053  23539       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24054  23540       n_bytes = sqlite3_value_bytes (argv[0]);
 24055         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23541  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24056  23542       if (geo == NULL)
 24057  23543   	sqlite3_result_null (context);
 24058  23544       else
 24059  23545         {
 24060  23546   	  void *data = sqlite3_user_data (context);
 24061  23547   	  if (data != NULL)
 24062  23548   	      result =
................................................................................
 24100  23586       int n_bytes;
 24101  23587       gaiaGeomCollPtr geo = NULL;
 24102  23588       gaiaGeomCollPtr result;
 24103  23589       int int_value;
 24104  23590       double tolerance = 0.0;
 24105  23591       double factor = 3.0;
 24106  23592       int allow_holes = 0;
 24107         -    int gpkg_amphibious = 0;
 24108         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24109  23593       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24110         -    if (cache != NULL)
 24111         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24112  23594       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24113  23595         {
 24114  23596   	  sqlite3_result_null (context);
 24115  23597   	  return;
 24116  23598         }
 24117  23599       if (argc >= 2)
 24118  23600         {
................................................................................
 24152  23634   	    {
 24153  23635   		sqlite3_result_null (context);
 24154  23636   		return;
 24155  23637   	    }
 24156  23638         }
 24157  23639       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24158  23640       n_bytes = sqlite3_value_bytes (argv[0]);
 24159         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23641  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24160  23642       if (geo == NULL)
 24161  23643   	sqlite3_result_null (context);
 24162  23644       else
 24163  23645         {
 24164  23646   	  void *data = sqlite3_user_data (context);
 24165  23647   	  if (data != NULL)
 24166  23648   	      result =
................................................................................
 24234  23716   / Attempts to make an invalid geometry valid without loosing vertices.
 24235  23717   / NULL is returned for invalid arguments
 24236  23718   */
 24237  23719       unsigned char *p_blob;
 24238  23720       int n_bytes;
 24239  23721       gaiaGeomCollPtr geo = NULL;
 24240  23722       gaiaGeomCollPtr result;
 24241         -    int gpkg_amphibious = 0;
 24242         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24243  23723       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24244         -    if (cache != NULL)
 24245         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24246  23724       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24247  23725         {
 24248  23726   	  sqlite3_result_null (context);
 24249  23727   	  return;
 24250  23728         }
 24251  23729       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24252  23730       n_bytes = sqlite3_value_bytes (argv[0]);
 24253         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23731  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24254  23732       if (geo == NULL)
 24255  23733   	sqlite3_result_null (context);
 24256  23734       else
 24257  23735         {
 24258  23736   	  result = gaiaMakeValid (geo);
 24259  23737   	  if (result == NULL)
 24260  23738   	    {
................................................................................
 24294  23772   / discarded during the validation process.
 24295  23773   / NULL is returned for invalid arguments (or if no discarded items are found)
 24296  23774   */
 24297  23775       unsigned char *p_blob;
 24298  23776       int n_bytes;
 24299  23777       gaiaGeomCollPtr geo = NULL;
 24300  23778       gaiaGeomCollPtr result;
 24301         -    int gpkg_amphibious = 0;
 24302         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24303  23779       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24304         -    if (cache != NULL)
 24305         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24306  23780       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24307  23781         {
 24308  23782   	  sqlite3_result_null (context);
 24309  23783   	  return;
 24310  23784         }
 24311  23785       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24312  23786       n_bytes = sqlite3_value_bytes (argv[0]);
 24313         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23787  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24314  23788       if (geo == NULL)
 24315  23789   	sqlite3_result_null (context);
 24316  23790       else
 24317  23791         {
 24318  23792   	  result = gaiaMakeValidDiscarded (geo);
 24319  23793   	  if (result == NULL)
 24320  23794   	      sqlite3_result_null (context);
................................................................................
 24343  23817   */
 24344  23818       unsigned char *p_blob;
 24345  23819       int n_bytes;
 24346  23820       int int_value;
 24347  23821       double dist;
 24348  23822       gaiaGeomCollPtr geo = NULL;
 24349  23823       gaiaGeomCollPtr result;
 24350         -    int gpkg_amphibious = 0;
 24351         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24352  23824       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24353         -    if (cache != NULL)
 24354         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24355  23825       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24356  23826         {
 24357  23827   	  sqlite3_result_null (context);
 24358  23828   	  return;
 24359  23829         }
 24360  23830       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 24361  23831   	dist = sqlite3_value_double (argv[1]);
................................................................................
 24367  23837       else
 24368  23838         {
 24369  23839   	  sqlite3_result_null (context);
 24370  23840   	  return;
 24371  23841         }
 24372  23842       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24373  23843       n_bytes = sqlite3_value_bytes (argv[0]);
 24374         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23844  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24375  23845       if (geo == NULL)
 24376  23846   	sqlite3_result_null (context);
 24377  23847       else
 24378  23848         {
 24379  23849   	  result = gaiaSegmentize (geo, dist);
 24380  23850   	  if (result == NULL)
 24381  23851   	      sqlite3_result_null (context);
................................................................................
 24403  23873   / NULL is returned for invalid arguments
 24404  23874   */
 24405  23875       unsigned char *p_blob;
 24406  23876       int n_bytes;
 24407  23877       gaiaGeomCollPtr input = NULL;
 24408  23878       gaiaGeomCollPtr blade = NULL;
 24409  23879       gaiaGeomCollPtr result;
 24410         -    int gpkg_amphibious = 0;
 24411         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24412  23880       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24413         -    if (cache != NULL)
 24414         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24415  23881       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24416  23882         {
 24417  23883   	  sqlite3_result_null (context);
 24418  23884   	  return;
 24419  23885         }
 24420  23886       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 24421  23887         {
 24422  23888   	  sqlite3_result_null (context);
 24423  23889   	  return;
 24424  23890         }
 24425  23891       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24426  23892       n_bytes = sqlite3_value_bytes (argv[0]);
 24427         -    input = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23893  +    input = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24428  23894       if (input == NULL)
 24429  23895         {
 24430  23896   	  sqlite3_result_null (context);
 24431  23897   	  return;
 24432  23898         }
 24433  23899       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 24434  23900       n_bytes = sqlite3_value_bytes (argv[1]);
 24435         -    blade = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23901  +    blade = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24436  23902       if (blade == NULL)
 24437  23903         {
 24438  23904   	  gaiaFreeGeomColl (input);
 24439  23905   	  sqlite3_result_null (context);
 24440  23906   	  return;
 24441  23907         }
 24442  23908       else
................................................................................
 24469  23935   / NULL is returned for invalid arguments
 24470  23936   */
 24471  23937       unsigned char *p_blob;
 24472  23938       int n_bytes;
 24473  23939       gaiaGeomCollPtr input = NULL;
 24474  23940       gaiaGeomCollPtr blade = NULL;
 24475  23941       gaiaGeomCollPtr result;
 24476         -    int gpkg_amphibious = 0;
 24477         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24478  23942       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24479         -    if (cache != NULL)
 24480         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24481  23943       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24482  23944         {
 24483  23945   	  sqlite3_result_null (context);
 24484  23946   	  return;
 24485  23947         }
 24486  23948       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 24487  23949         {
 24488  23950   	  sqlite3_result_null (context);
 24489  23951   	  return;
 24490  23952         }
 24491  23953       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24492  23954       n_bytes = sqlite3_value_bytes (argv[0]);
 24493         -    input = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23955  +    input = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24494  23956       if (input == NULL)
 24495  23957         {
 24496  23958   	  sqlite3_result_null (context);
 24497  23959   	  return;
 24498  23960         }
 24499  23961       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 24500  23962       n_bytes = sqlite3_value_bytes (argv[1]);
 24501         -    blade = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        23963  +    blade = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24502  23964       if (blade == NULL)
 24503  23965         {
 24504  23966   	  gaiaFreeGeomColl (input);
 24505  23967   	  sqlite3_result_null (context);
 24506  23968   	  return;
 24507  23969         }
 24508  23970       else
................................................................................
 24535  23997   / NULL is returned for invalid arguments
 24536  23998   */
 24537  23999       unsigned char *p_blob;
 24538  24000       int n_bytes;
 24539  24001       gaiaGeomCollPtr input = NULL;
 24540  24002       gaiaGeomCollPtr blade = NULL;
 24541  24003       gaiaGeomCollPtr result;
 24542         -    int gpkg_amphibious = 0;
 24543         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24544  24004       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24545         -    if (cache != NULL)
 24546         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24547  24005       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24548  24006         {
 24549  24007   	  sqlite3_result_null (context);
 24550  24008   	  return;
 24551  24009         }
 24552  24010       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 24553  24011         {
 24554  24012   	  sqlite3_result_null (context);
 24555  24013   	  return;
 24556  24014         }
 24557  24015       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24558  24016       n_bytes = sqlite3_value_bytes (argv[0]);
 24559         -    input = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24017  +    input = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24560  24018       if (input == NULL)
 24561  24019         {
 24562  24020   	  sqlite3_result_null (context);
 24563  24021   	  return;
 24564  24022         }
 24565  24023       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 24566  24024       n_bytes = sqlite3_value_bytes (argv[1]);
 24567         -    blade = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24025  +    blade = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24568  24026       if (blade == NULL)
 24569  24027         {
 24570  24028   	  gaiaFreeGeomColl (input);
 24571  24029   	  sqlite3_result_null (context);
 24572  24030   	  return;
 24573  24031         }
 24574  24032       else
................................................................................
 24621  24079       double y2;
 24622  24080       double a;
 24623  24081       double b;
 24624  24082       double rf;
 24625  24083       double azimuth;
 24626  24084       int srid;
 24627  24085       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 24628         -    int gpkg_amphibious = 0;
 24629         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24630  24086       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24631         -    if (cache != NULL)
 24632         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24633  24087       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24634  24088         {
 24635  24089   	  sqlite3_result_null (context);
 24636  24090   	  return;
 24637  24091         }
 24638  24092       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 24639  24093         {
................................................................................
 24640  24094   	  sqlite3_result_null (context);
 24641  24095   	  return;
 24642  24096         }
 24643  24097   
 24644  24098   /* retrieving and validating the first point */
 24645  24099       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24646  24100       n_bytes = sqlite3_value_bytes (argv[0]);
 24647         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24101  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24648  24102       if (geom == NULL)
 24649  24103         {
 24650  24104   	  sqlite3_result_null (context);
 24651  24105   	  return;
 24652  24106         }
 24653  24107       if (!getXYSinglePoint (geom, &x1, &y1))
 24654  24108         {
................................................................................
 24658  24112         }
 24659  24113       srid = geom->Srid;
 24660  24114       gaiaFreeGeomColl (geom);
 24661  24115   
 24662  24116   /* retrieving and validating the second point */
 24663  24117       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 24664  24118       n_bytes = sqlite3_value_bytes (argv[1]);
 24665         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24119  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24666  24120       if (geom == NULL)
 24667  24121         {
 24668  24122   	  sqlite3_result_null (context);
 24669  24123   	  return;
 24670  24124         }
 24671  24125       if (!getXYSinglePoint (geom, &x2, &y2))
 24672  24126         {
................................................................................
 24716  24170       double distance;
 24717  24171       double azimuth;
 24718  24172       double a;
 24719  24173       double b;
 24720  24174       double rf;
 24721  24175       int srid;
 24722  24176       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 24723         -    int gpkg_amphibious = 0;
 24724         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24725  24177       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24726         -    if (cache != NULL)
 24727         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24728  24178       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24729  24179         {
 24730  24180   	  sqlite3_result_null (context);
 24731  24181   	  return;
 24732  24182         }
 24733  24183       if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 24734  24184   	distance = sqlite3_value_double (argv[1]);
................................................................................
 24754  24204   	  sqlite3_result_null (context);
 24755  24205   	  return;
 24756  24206         }
 24757  24207   
 24758  24208   /* retrieving and validating the start point */
 24759  24209       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24760  24210       n_bytes = sqlite3_value_bytes (argv[0]);
 24761         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24211  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24762  24212       if (geom == NULL)
 24763  24213         {
 24764  24214   	  sqlite3_result_null (context);
 24765  24215   	  return;
 24766  24216         }
 24767  24217       if (!getXYSinglePoint (geom, &x1, &y1))
 24768  24218         {
................................................................................
 24812  24262   / NULL is returned for invalid arguments
 24813  24263   */
 24814  24264       unsigned char *p_blob;
 24815  24265       int n_bytes;
 24816  24266       gaiaGeomCollPtr geom;
 24817  24267       int precision = 0;
 24818  24268       char *geo_hash;
 24819         -    int gpkg_amphibious = 0;
 24820         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24821  24269       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24822         -    if (cache != NULL)
 24823         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24824  24270       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24825  24271         {
 24826  24272   	  sqlite3_result_null (context);
 24827  24273   	  return;
 24828  24274         }
 24829  24275       if (argc == 2)
 24830  24276         {
................................................................................
 24835  24281   		sqlite3_result_null (context);
 24836  24282   		return;
 24837  24283   	    }
 24838  24284         }
 24839  24285   
 24840  24286       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24841  24287       n_bytes = sqlite3_value_bytes (argv[0]);
 24842         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24288  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24843  24289       if (geom == NULL)
 24844  24290         {
 24845  24291   	  sqlite3_result_null (context);
 24846  24292   	  return;
 24847  24293         }
 24848  24294       geo_hash = gaiaGeoHash (geom, precision);
 24849  24295       if (geo_hash != NULL)
................................................................................
 24913  24359       gaiaGeomCollPtr geom;
 24914  24360       int precision = 15;
 24915  24361       int options = 0;
 24916  24362       const char *refid = "";
 24917  24363       char *srs = NULL;
 24918  24364       char *x3d;
 24919  24365       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 24920         -    int gpkg_amphibious = 0;
 24921         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 24922  24366       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 24923         -    if (cache != NULL)
 24924         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 24925  24367       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 24926  24368         {
 24927  24369   	  sqlite3_result_null (context);
 24928  24370   	  return;
 24929  24371         }
 24930  24372       if (argc >= 2)
 24931  24373         {
................................................................................
 24956  24398   		sqlite3_result_null (context);
 24957  24399   		return;
 24958  24400   	    }
 24959  24401         }
 24960  24402   
 24961  24403       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 24962  24404       n_bytes = sqlite3_value_bytes (argv[0]);
 24963         -    geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24405  +    geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 24964  24406       if (geom == NULL)
 24965  24407         {
 24966  24408   	  sqlite3_result_null (context);
 24967  24409   	  return;
 24968  24410         }
 24969  24411       if (geom->Srid > 0)
 24970  24412         {
................................................................................
 24996  24438   */
 24997  24439       unsigned char *p_blob;
 24998  24440       int n_bytes;
 24999  24441       gaiaGeomCollPtr geo1 = NULL;
 25000  24442       gaiaGeomCollPtr geo2 = NULL;
 25001  24443       double dist;
 25002  24444       int ret;
 25003         -    int gpkg_amphibious = 0;
 25004         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 25005  24445       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 25006         -    if (cache != NULL)
 25007         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 25008  24446       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 25009  24447         {
 25010  24448   	  sqlite3_result_null (context);
 25011  24449   	  return;
 25012  24450         }
 25013  24451       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 25014  24452         {
 25015  24453   	  sqlite3_result_null (context);
 25016  24454   	  return;
 25017  24455         }
 25018  24456       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 25019  24457       n_bytes = sqlite3_value_bytes (argv[0]);
 25020         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24458  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25021  24459       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 25022  24460       n_bytes = sqlite3_value_bytes (argv[1]);
 25023         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24461  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25024  24462       if (!geo1 || !geo2)
 25025  24463   	sqlite3_result_null (context);
 25026  24464       else
 25027  24465         {
 25028  24466   	  ret = gaia3DDistance (geo1, geo2, &dist);
 25029  24467   	  if (!ret)
 25030  24468   	      sqlite3_result_null (context);
................................................................................
 25045  24483   */
 25046  24484       unsigned char *p_blob;
 25047  24485       int n_bytes;
 25048  24486       gaiaGeomCollPtr geo1 = NULL;
 25049  24487       gaiaGeomCollPtr geo2 = NULL;
 25050  24488       double dist;
 25051  24489       int ret;
 25052         -    int gpkg_amphibious = 0;
 25053         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 25054  24490       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 25055         -    if (cache != NULL)
 25056         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 25057  24491       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 25058  24492         {
 25059  24493   	  sqlite3_result_null (context);
 25060  24494   	  return;
 25061  24495         }
 25062  24496       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 25063  24497         {
 25064  24498   	  sqlite3_result_null (context);
 25065  24499   	  return;
 25066  24500         }
 25067  24501       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 25068  24502       n_bytes = sqlite3_value_bytes (argv[0]);
 25069         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24503  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25070  24504       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 25071  24505       n_bytes = sqlite3_value_bytes (argv[1]);
 25072         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24506  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25073  24507       if (!geo1 || !geo2)
 25074  24508   	sqlite3_result_null (context);
 25075  24509       else
 25076  24510         {
 25077  24511   	  ret = gaiaMaxDistance (geo1, geo2, &dist);
 25078  24512   	  if (!ret)
 25079  24513   	      sqlite3_result_null (context);
................................................................................
 25094  24528   */
 25095  24529       unsigned char *p_blob;
 25096  24530       int n_bytes;
 25097  24531       gaiaGeomCollPtr geo1 = NULL;
 25098  24532       gaiaGeomCollPtr geo2 = NULL;
 25099  24533       double dist;
 25100  24534       int ret;
 25101         -    int gpkg_amphibious = 0;
 25102         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 25103  24535       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 25104         -    if (cache != NULL)
 25105         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 25106  24536       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 25107  24537         {
 25108  24538   	  sqlite3_result_null (context);
 25109  24539   	  return;
 25110  24540         }
 25111  24541       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 25112  24542         {
 25113  24543   	  sqlite3_result_null (context);
 25114  24544   	  return;
 25115  24545         }
 25116  24546       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 25117  24547       n_bytes = sqlite3_value_bytes (argv[0]);
 25118         -    geo1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24548  +    geo1 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25119  24549       p_blob = (unsigned char *) sqlite3_value_blob (argv[1]);
 25120  24550       n_bytes = sqlite3_value_bytes (argv[1]);
 25121         -    geo2 = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24551  +    geo2 = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25122  24552       if (!geo1 || !geo2)
 25123  24553   	sqlite3_result_null (context);
 25124  24554       else
 25125  24555         {
 25126  24556   	  ret = gaia3DMaxDistance (geo1, geo2, &dist);
 25127  24557   	  if (!ret)
 25128  24558   	      sqlite3_result_null (context);
................................................................................
 25142  24572   / Returns a new new (Multi)Linestring by re-noding the input linestring(s)
 25143  24573   / NULL is returned for invalid arguments
 25144  24574   */
 25145  24575       unsigned char *p_blob;
 25146  24576       int n_bytes;
 25147  24577       gaiaGeomCollPtr input;
 25148  24578       gaiaGeomCollPtr result;
 25149         -    int gpkg_amphibious = 0;
 25150         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 25151  24579       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 25152         -    if (cache != NULL)
 25153         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 25154  24580       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 25155  24581         {
 25156  24582   	  sqlite3_result_null (context);
 25157  24583   	  return;
 25158  24584         }
 25159  24585   
 25160  24586   /* retrieving the input geometry */
 25161  24587       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 25162  24588       n_bytes = sqlite3_value_bytes (argv[0]);
 25163         -    input = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24589  +    input = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25164  24590       if (input == NULL)
 25165  24591         {
 25166  24592   	  sqlite3_result_null (context);
 25167  24593   	  return;
 25168  24594         }
 25169  24595   
 25170  24596       result = gaiaNodeLines (input);
................................................................................
 25395  24821       unsigned char *p_blob;
 25396  24822       int n_bytes;
 25397  24823       gaiaGeomCollPtr input;
 25398  24824       gaiaGeomCollPtr noded;
 25399  24825       gaiaGeomCollPtr result;
 25400  24826       gaiaGeomCollPtr nodes_in;
 25401  24827       gaiaGeomCollPtr nodes_out;
 25402         -    int gpkg_amphibious = 0;
 25403         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 25404  24828       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 25405         -    if (cache != NULL)
 25406         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 25407  24829       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 25408  24830         {
 25409  24831   	  sqlite3_result_null (context);
 25410  24832   	  return;
 25411  24833         }
 25412  24834   
 25413  24835   /* retrieving the input geometry */
 25414  24836       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 25415  24837       n_bytes = sqlite3_value_bytes (argv[0]);
 25416         -    input = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        24838  +    input = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 25417  24839       if (input == NULL)
 25418  24840         {
 25419  24841   	  sqlite3_result_null (context);
 25420  24842   	  return;
 25421  24843         }
 25422  24844   
 25423  24845   /* checking the input (Linestrings only) */
................................................................................
 26441  25863   	  x = atan (x);
 26442  25864   	  sqlite3_result_double (context, x);
 26443  25865         }
 26444  25866       else
 26445  25867   	sqlite3_result_null (context);
 26446  25868   }
 26447  25869   
 26448         -static void
 26449         -fnct_math_atan2 (sqlite3_context * context, int argc, sqlite3_value ** argv)
 26450         -{
 26451         -/* SQL function:
 26452         -/ atan2(double X, double Y)
 26453         -/
 26454         -/ Returns  the principal value of the arc tangent of Y/X, using
 26455         -/ the signs of the two arguments to determine the quadrant of 
 26456         -/ the result.
 26457         -/ or NULL if any error is encountered
 26458         -*/
 26459         -    int int_value;
 26460         -    double x;
 26461         -    double y;
 26462         -    double t;
 26463         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 26464         -    if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
 26465         -	x = sqlite3_value_double (argv[0]);
 26466         -    else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 26467         -      {
 26468         -	  int_value = sqlite3_value_int (argv[0]);
 26469         -	  x = int_value;
 26470         -      }
 26471         -    else
 26472         -      {
 26473         -	  sqlite3_result_null (context);
 26474         -	  return;
 26475         -      }
 26476         -    if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 26477         -	y = sqlite3_value_double (argv[1]);
 26478         -    else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 26479         -      {
 26480         -	  int_value = sqlite3_value_int (argv[1]);
 26481         -	  y = int_value;
 26482         -      }
 26483         -    else
 26484         -      {
 26485         -	  sqlite3_result_null (context);
 26486         -	  return;
 26487         -      }
 26488         -    t = atan2 (x, y);
 26489         -    sqlite3_result_double (context, t);
 26490         -}
 26491         -
 26492  25870   static void
 26493  25871   fnct_math_ceil (sqlite3_context * context, int argc, sqlite3_value ** argv)
 26494  25872   {
 26495  25873   /* SQL function:
 26496  25874   / ceil(double X)
 26497  25875   /
 26498  25876   / Returns the smallest integer value not less than X
................................................................................
 27967  27345       const char *label_col_name = NULL;
 27968  27346       const char *text_height_col_name = NULL;
 27969  27347       const char *text_rotation_col_name = NULL;
 27970  27348       gaiaGeomCollPtr geom = NULL;
 27971  27349       int precision = 3;
 27972  27350       int ret = 1;
 27973  27351       sqlite3 *db_handle = sqlite3_context_db_handle (context);
 27974         -    int gpkg_amphibious = 0;
 27975         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 27976  27352       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 27977         -    if (cache != NULL)
 27978         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 27979  27353       if (sqlite3_value_type (argv[0]) == SQLITE_TEXT)
 27980  27354   	dir_path = (const char *) sqlite3_value_text (argv[0]);
 27981  27355       if (sqlite3_value_type (argv[1]) == SQLITE_TEXT)
 27982  27356   	filename = (const char *) sqlite3_value_text (argv[1]);
 27983  27357       if (sqlite3_value_type (argv[2]) == SQLITE_TEXT)
 27984  27358   	sql_query = (const char *) sqlite3_value_text (argv[2]);
 27985  27359       if (sqlite3_value_type (argv[3]) == SQLITE_TEXT)
................................................................................
 27992  27366   	text_height_col_name = (const char *) sqlite3_value_text (argv[6]);
 27993  27367       if (sqlite3_value_type (argv[7]) == SQLITE_TEXT)
 27994  27368   	text_rotation_col_name = (const char *) sqlite3_value_text (argv[7]);
 27995  27369       if (sqlite3_value_type (argv[8]) == SQLITE_BLOB)
 27996  27370         {
 27997  27371   	  p_blob = (unsigned char *) sqlite3_value_blob (argv[8]);
 27998  27372   	  n_bytes = sqlite3_value_bytes (argv[8]);
 27999         -	  geom = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        27373  +	  geom = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 28000  27374         }
 28001  27375       if (argc == 10)
 28002  27376         {
 28003  27377   	  if (sqlite3_value_type (argv[9]) == SQLITE_INTEGER)
 28004  27378   	      precision = sqlite3_value_int (argv[9]);
 28005  27379         }
 28006  27380       if (dir_path == NULL || filename == NULL || sql_query == NULL
................................................................................
 28972  28346       double rf;
 28973  28347       gaiaGeomCollPtr geo = NULL;
 28974  28348       gaiaLinestringPtr line;
 28975  28349       gaiaPolygonPtr polyg;
 28976  28350       gaiaRingPtr ring;
 28977  28351       int ib;
 28978  28352       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 28979         -    int gpkg_amphibious = 0;
 28980         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 28981  28353       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 28982         -    if (cache != NULL)
 28983         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 28984  28354       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 28985  28355         {
 28986  28356   	  sqlite3_result_null (context);
 28987  28357   	  return;
 28988  28358         }
 28989  28359       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 28990  28360       n_bytes = sqlite3_value_bytes (argv[0]);
 28991         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        28361  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 28992  28362       if (!geo)
 28993  28363   	sqlite3_result_null (context);
 28994  28364       else
 28995  28365         {
 28996  28366   	  if (getEllipsoidParams (sqlite, geo->Srid, &a, &b, &rf))
 28997  28367   	    {
 28998  28368   		line = geo->FirstLinestring;
................................................................................
 29078  28448       double rf;
 29079  28449       gaiaGeomCollPtr geo = NULL;
 29080  28450       gaiaLinestringPtr line;
 29081  28451       gaiaPolygonPtr polyg;
 29082  28452       gaiaRingPtr ring;
 29083  28453       int ib;
 29084  28454       sqlite3 *sqlite = sqlite3_context_db_handle (context);
 29085         -    int gpkg_amphibious = 0;
 29086         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 29087  28455       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 29088         -    if (cache != NULL)
 29089         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 29090  28456       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 29091  28457         {
 29092  28458   	  sqlite3_result_null (context);
 29093  28459   	  return;
 29094  28460         }
 29095  28461       p_blob = (unsigned char *) sqlite3_value_blob (argv[0]);
 29096  28462       n_bytes = sqlite3_value_bytes (argv[0]);
 29097         -    geo = gaiaFromSpatiaLiteBlobWkbEx (p_blob, n_bytes, gpkg_amphibious);
        28463  +    geo = gaiaFromSpatiaLiteBlobWkb (p_blob, n_bytes);
 29098  28464       if (!geo)
 29099  28465   	sqlite3_result_null (context);
 29100  28466       else
 29101  28467         {
 29102  28468   	  if (getEllipsoidParams (sqlite, geo->Srid, &a, &b, &rf))
 29103  28469   	    {
 29104  28470   		line = geo->FirstLinestring;
................................................................................
 32272  31638   /            double xoff, double yoff) - 2D
 32273  31639   /    or
 32274  31640   / ATM_Create(double a, double b, double c, double d, 
 32275  31641   /            double e, double f, double g, double h,
 32276  31642   /            double i, double xoff, double yoff,
 32277  31643   /            double zoff) - 3D
 32278  31644   /
        31645  +/ will create a BLOB-encoded Affine Transform Matrix
        31646  +/ 
 32279  31647   / returns a BLOB-ATM object or NULL on failure
 32280  31648   */
 32281  31649       double a = 1.0;
 32282  31650       double b = 0.0;
 32283  31651       double c = 0.0;
 32284  31652       double d = 0.0;
 32285  31653       double e = 1.0;
................................................................................
 32535  31903   					    sqlite3_value ** argv)
 32536  31904   {
 32537  31905   /* SQL function:
 32538  31906   / ATM_CreateTranslate(double tx, double ty) - 2D
 32539  31907   /    or
 32540  31908   / ATM_CreateTranslate(double tx, double ty, double tz) - 3D
 32541  31909   /
        31910  +/ will create a BLOB-encoded Affine Transform Matrix
        31911  +/ 
 32542  31912   / returns a BLOB-ATM object or NULL on failure
 32543  31913   */
 32544  31914       double a = 1.0;
 32545  31915       double b = 0.0;
 32546  31916       double c = 0.0;
 32547  31917       double d = 0.0;
 32548  31918       double e = 1.0;
................................................................................
 32642  32012   					sqlite3_value ** argv)
 32643  32013   {
 32644  32014   /* SQL function:
 32645  32015   / ATM_CreateScale(double sx, double sy) - 2D
 32646  32016   /    or
 32647  32017   / ATM_CreateScale(double sx, double sy, double sz - 3D
 32648  32018   /
        32019  +/ will create a BLOB-encoded Affine Transform Matrix
        32020  +/ 
 32649  32021   / returns a BLOB-ATM object or NULL on failure
 32650  32022   */
 32651  32023       double a = 1.0;
 32652  32024       double b = 0.0;
 32653  32025       double c = 0.0;
 32654  32026       double d = 0.0;
 32655  32027       double e = 1.0;
................................................................................
 32749  32121   					 sqlite3_value ** argv)
 32750  32122   {
 32751  32123   /* SQL function:
 32752  32124   / ATM_CreateRotate(double angleInDegrees) - 2D
 32753  32125   /    or
 32754  32126   / ATM_CreateZRoll(double angeInDegrees) - 3D
 32755  32127   /
        32128  +/ will create a BLOB-encoded Affine Transform Matrix
        32129  +/ 
 32756  32130   / returns a BLOB-ATM object or NULL on failure
 32757  32131   */
 32758  32132       double a = 1.0;
 32759  32133       double b = 0.0;
 32760  32134       double c = 0.0;
 32761  32135       double d = 0.0;
 32762  32136       double e = 1.0;
................................................................................
 32810  32184   static void
 32811  32185   fnct_AffineTransformMatrix_CreateXRoll (sqlite3_context * context, int argc,
 32812  32186   					sqlite3_value ** argv)
 32813  32187   {
 32814  32188   /* SQL function:
 32815  32189   / ATM_CreateXRoll(double angleInDegrees) - 3D
 32816  32190   /
        32191  +/ will create a BLOB-encoded Affine Transform Matrix
        32192  +/ 
 32817  32193   / returns a BLOB-ATM object or NULL on failure
 32818  32194   */
 32819  32195       double a = 1.0;
 32820  32196       double b = 0.0;
 32821  32197       double c = 0.0;
 32822  32198       double d = 0.0;
 32823  32199       double e = 1.0;
................................................................................
 32871  32247   static void
 32872  32248   fnct_AffineTransformMatrix_CreateYRoll (sqlite3_context * context, int argc,
 32873  32249   					sqlite3_value ** argv)
 32874  32250   {
 32875  32251   /* SQL function:
 32876  32252   / ATM_CreateYRoll(double angleInDegrees) - 3D
 32877  32253   /
        32254  +/ will create a BLOB-encoded Affine Transform Matrix
        32255  +/ 
 32878  32256   / returns a BLOB-ATM object or NULL on failure
 32879  32257   */
 32880  32258       double a = 1.0;
 32881  32259       double b = 0.0;
 32882  32260       double c = 0.0;
 32883  32261       double d = 0.0;
 32884  32262       double e = 1.0;
................................................................................
 32931  32309   
 32932  32310   static void
 32933  32311   fnct_AffineTransformMatrix_Multiply (sqlite3_context * context, int argc,
 32934  32312   				     sqlite3_value ** argv)
 32935  32313   {
 32936  32314   /* SQL function:
 32937  32315   / ATM_Multiply(blob atmA, blob atmB)
        32316  +/
        32317  +/ will create a BLOB-encoded Affine Transform Matrix
        32318  +/ by multiplying atmA by atmB
 32938  32319   / 
 32939  32320   / returns a BLOB-ATM object or NULL on failure
 32940  32321   */
 32941  32322       unsigned char *blob;
 32942  32323       int blob_sz;
 32943  32324       const unsigned char *iblob1;
 32944  32325       int iblob1_sz;
................................................................................
 32978  32359   }
 32979  32360   
 32980  32361   static void
 32981  32362   fnct_AffineTransformMatrix_Translate (sqlite3_context * context, int argc,
 32982  32363   				      sqlite3_value ** argv)
 32983  32364   {
 32984  32365   /* SQL function:
 32985         -/ ATM_Translate(blob atm, double tx, double ty) - 2D
        32366  +/ ATM_Translate(double tx, double ty, blob atm) - 2D
 32986  32367   /    or
 32987         -/ ATM_Translate(blob atm, double tx, double ty, double tz) - 3D
        32368  +/ ATM_Translate(double tx, double ty, double tz, blob atm) - 3D
 32988  32369   /
        32370  +/ will create a BLOB-encoded Affine Transform Matrix
        32371  +/ 
 32989  32372   / returns a BLOB-ATM object or NULL on failure
 32990  32373   */
 32991  32374       double a = 1.0;
 32992  32375       double b = 0.0;
 32993  32376       double c = 0.0;
 32994  32377       double d = 0.0;
 32995  32378       double e = 1.0;
................................................................................
 33007  32390       int iblob_sz;
 33008  32391       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33009  32392   
 33010  32393   /* validating the input args */
 33011  32394       if (argc == 3)
 33012  32395         {
 33013  32396   	  /* 2D translate */
 33014         -	  if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32397  +	  if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32398  +	      xoff = sqlite3_value_double (argv[0]);
        32399  +	  else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33015  32400   	    {
 33016         -		iblob = sqlite3_value_blob (argv[0]);
 33017         -		iblob_sz = sqlite3_value_bytes (argv[0]);
        32401  +		int_value = sqlite3_value_int (argv[0]);
        32402  +		xoff = int_value;
 33018  32403   	    }
 33019  32404   	  else
 33020  32405   	    {
 33021  32406   		sqlite3_result_null (context);
 33022  32407   		return;
 33023  32408   	    }
 33024  32409   	  if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33025         -	      xoff = sqlite3_value_double (argv[1]);
        32410  +	      yoff = sqlite3_value_double (argv[1]);
 33026  32411   	  else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 33027  32412   	    {
 33028  32413   		int_value = sqlite3_value_int (argv[1]);
 33029         -		xoff = int_value;
 33030         -	    }
 33031         -	  else
 33032         -	    {
 33033         -		sqlite3_result_null (context);
 33034         -		return;
 33035         -	    }
 33036         -	  if (sqlite3_value_type (argv[2]) == SQLITE_FLOAT)
 33037         -	      yoff = sqlite3_value_double (argv[2]);
 33038         -	  else if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 33039         -	    {
 33040         -		int_value = sqlite3_value_int (argv[2]);
 33041  32414   		yoff = int_value;
 33042  32415   	    }
        32416  +	  else
        32417  +	    {
        32418  +		sqlite3_result_null (context);
        32419  +		return;
        32420  +	    }
        32421  +	  if (sqlite3_value_type (argv[2]) == SQLITE_BLOB)
        32422  +	    {
        32423  +		iblob = sqlite3_value_blob (argv[2]);
        32424  +		iblob_sz = sqlite3_value_bytes (argv[2]);
        32425  +	    }
 33043  32426   	  else
 33044  32427   	    {
 33045  32428   		sqlite3_result_null (context);
 33046  32429   		return;
 33047  32430   	    }
 33048  32431         }
 33049  32432       else if (argc == 4)
 33050  32433         {
 33051  32434   	  /* 3D translate */
 33052         -	  if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32435  +	  if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32436  +	      xoff = sqlite3_value_double (argv[0]);
        32437  +	  else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33053  32438   	    {
 33054         -		iblob = sqlite3_value_blob (argv[0]);
 33055         -		iblob_sz = sqlite3_value_bytes (argv[0]);
        32439  +		int_value = sqlite3_value_int (argv[0]);
        32440  +		xoff = int_value;
 33056  32441   	    }
 33057  32442   	  else
 33058  32443   	    {
 33059  32444   		sqlite3_result_null (context);
 33060  32445   		return;
 33061  32446   	    }
 33062  32447   	  if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33063         -	      xoff = sqlite3_value_double (argv[1]);
        32448  +	      yoff = sqlite3_value_double (argv[1]);
 33064  32449   	  else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 33065  32450   	    {
 33066  32451   		int_value = sqlite3_value_int (argv[1]);
 33067         -		xoff = int_value;
        32452  +		yoff = int_value;
 33068  32453   	    }
 33069  32454   	  else
 33070  32455   	    {
 33071  32456   		sqlite3_result_null (context);
 33072  32457   		return;
 33073  32458   	    }
 33074  32459   	  if (sqlite3_value_type (argv[2]) == SQLITE_FLOAT)
 33075         -	      yoff = sqlite3_value_double (argv[2]);
        32460  +	      zoff = sqlite3_value_double (argv[2]);
 33076  32461   	  else if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 33077  32462   	    {
 33078  32463   		int_value = sqlite3_value_int (argv[2]);
 33079         -		yoff = int_value;
        32464  +		zoff = int_value;
 33080  32465   	    }
 33081  32466   	  else
 33082  32467   	    {
 33083  32468   		sqlite3_result_null (context);
 33084  32469   		return;
 33085  32470   	    }
 33086         -	  if (sqlite3_value_type (argv[3]) == SQLITE_FLOAT)
 33087         -	      zoff = sqlite3_value_double (argv[3]);
 33088         -	  else if (sqlite3_value_type (argv[3]) == SQLITE_INTEGER)
        32471  +	  if (sqlite3_value_type (argv[3]) == SQLITE_BLOB)
 33089  32472   	    {
 33090         -		int_value = sqlite3_value_int (argv[3]);
 33091         -		zoff = int_value;
        32473  +		iblob = sqlite3_value_blob (argv[3]);
        32474  +		iblob_sz = sqlite3_value_bytes (argv[3]);
 33092  32475   	    }
 33093  32476   	  else
 33094  32477   	    {
 33095  32478   		sqlite3_result_null (context);
 33096  32479   		return;
 33097  32480   	    }
 33098  32481         }
................................................................................
 33107  32490   }
 33108  32491   
 33109  32492   static void
 33110  32493   fnct_AffineTransformMatrix_Scale (sqlite3_context * context, int argc,
 33111  32494   				  sqlite3_value ** argv)
 33112  32495   {
 33113  32496   /* SQL function:
 33114         -/ ATM_Scale(blob atm, double sx, double sy) - 2D
        32497  +/ ATM_Scale(double sx, double sy, blob atm) - 2D
 33115  32498   /    or
 33116         -/ ATM_Scale(blob atm, double sx, double sy, double sz) - 3D
        32499  +/ ATM_Scale(double sx, double sy, double sz, blob atm) - 3D
 33117  32500   /
 33118  32501   / will create a BLOB-encoded Affine Transform Matrix
 33119  32502   / 
 33120  32503   / returns a BLOB-ATM object or NULL on failure
 33121  32504   */
 33122  32505       double a = 1.0;
 33123  32506       double b = 0.0;
................................................................................
 33138  32521       int iblob_sz;
 33139  32522       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33140  32523   
 33141  32524   /* validating the input args */
 33142  32525       if (argc == 3)
 33143  32526         {
 33144  32527   	  /* 2D scale */
 33145         -	  if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32528  +	  if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32529  +	      a = sqlite3_value_double (argv[0]);
        32530  +	  else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33146  32531   	    {
 33147         -		iblob = sqlite3_value_blob (argv[0]);
 33148         -		iblob_sz = sqlite3_value_bytes (argv[0]);
        32532  +		int_value = sqlite3_value_int (argv[0]);
        32533  +		a = int_value;
 33149  32534   	    }
 33150  32535   	  else
 33151  32536   	    {
 33152  32537   		sqlite3_result_null (context);
 33153  32538   		return;
 33154  32539   	    }
 33155  32540   	  if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33156         -	      a = sqlite3_value_double (argv[1]);
        32541  +	      e = sqlite3_value_double (argv[1]);
 33157  32542   	  else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 33158  32543   	    {
 33159  32544   		int_value = sqlite3_value_int (argv[1]);
 33160         -		a = int_value;
        32545  +		e = int_value;
 33161  32546   	    }
 33162  32547   	  else
 33163  32548   	    {
 33164  32549   		sqlite3_result_null (context);
 33165  32550   		return;
 33166  32551   	    }
 33167         -	  if (sqlite3_value_type (argv[2]) == SQLITE_FLOAT)
 33168         -	      e = sqlite3_value_double (argv[2]);
 33169         -	  else if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
        32552  +	  if (sqlite3_value_type (argv[2]) == SQLITE_BLOB)
 33170  32553   	    {
 33171         -		int_value = sqlite3_value_int (argv[2]);
 33172         -		e = int_value;
        32554  +		iblob = sqlite3_value_blob (argv[2]);
        32555  +		iblob_sz = sqlite3_value_bytes (argv[2]);
 33173  32556   	    }
 33174  32557   	  else
 33175  32558   	    {
 33176  32559   		sqlite3_result_null (context);
 33177  32560   		return;
 33178  32561   	    }
 33179  32562         }
 33180  32563       else if (argc == 4)
 33181  32564         {
 33182  32565   	  /* 3D scale */
 33183         -	  if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32566  +	  if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32567  +	      a = sqlite3_value_double (argv[0]);
        32568  +	  else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33184  32569   	    {
 33185         -		iblob = sqlite3_value_blob (argv[0]);
 33186         -		iblob_sz = sqlite3_value_bytes (argv[0]);
        32570  +		int_value = sqlite3_value_int (argv[0]);
        32571  +		a = int_value;
 33187  32572   	    }
 33188  32573   	  else
 33189  32574   	    {
 33190  32575   		sqlite3_result_null (context);
 33191  32576   		return;
 33192  32577   	    }
 33193  32578   	  if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33194         -	      a = sqlite3_value_double (argv[1]);
        32579  +	      e = sqlite3_value_double (argv[1]);
 33195  32580   	  else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 33196  32581   	    {
 33197  32582   		int_value = sqlite3_value_int (argv[1]);
 33198         -		a = int_value;
        32583  +		e = int_value;
 33199  32584   	    }
 33200  32585   	  else
 33201  32586   	    {
 33202  32587   		sqlite3_result_null (context);
 33203  32588   		return;
 33204  32589   	    }
 33205  32590   	  if (sqlite3_value_type (argv[2]) == SQLITE_FLOAT)
 33206         -	      e = sqlite3_value_double (argv[2]);
        32591  +	      i = sqlite3_value_double (argv[2]);
 33207  32592   	  else if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 33208  32593   	    {
 33209  32594   		int_value = sqlite3_value_int (argv[2]);
 33210         -		e = int_value;
        32595  +		i = int_value;
 33211  32596   	    }
 33212  32597   	  else
 33213  32598   	    {
 33214  32599   		sqlite3_result_null (context);
 33215  32600   		return;
 33216  32601   	    }
 33217         -	  if (sqlite3_value_type (argv[3]) == SQLITE_FLOAT)
 33218         -	      i = sqlite3_value_double (argv[3]);
 33219         -	  else if (sqlite3_value_type (argv[3]) == SQLITE_INTEGER)
        32602  +	  if (sqlite3_value_type (argv[3]) == SQLITE_BLOB)
 33220  32603   	    {
 33221         -		int_value = sqlite3_value_int (argv[3]);
 33222         -		i = int_value;
        32604  +		iblob = sqlite3_value_blob (argv[3]);
        32605  +		iblob_sz = sqlite3_value_bytes (argv[3]);
 33223  32606   	    }
 33224  32607   	  else
 33225  32608   	    {
 33226  32609   		sqlite3_result_null (context);
 33227  32610   		return;
 33228  32611   	    }
 33229  32612         }
................................................................................
 33238  32621   }
 33239  32622   
 33240  32623   static void
 33241  32624   fnct_AffineTransformMatrix_Rotate (sqlite3_context * context, int argc,
 33242  32625   				   sqlite3_value ** argv)
 33243  32626   {
 33244  32627   /* SQL function:
 33245         -/ ATM_Rotate(blob atm, double angleInDegrees) - 2D
        32628  +/ ATM_Rotate(double angleInDegrees, blob atm) - 2D
 33246  32629   /    or
 33247         -/ ATM_ZRoll(blob atm, double angleInDegrees) - 3D
        32630  +/ ATM_ZRoll(double angleInDegrees, blob atm) - 3D
 33248  32631   /
 33249  32632   / will create a BLOB-encoded Affine Transform Matrix
 33250  32633   / 
 33251  32634   / returns a BLOB-ATM object or NULL on failure
 33252  32635   */
 33253  32636       double a = 1.0;
 33254  32637       double b = 0.0;
................................................................................
 33271  32654       unsigned char *blob;
 33272  32655       int blob_sz;
 33273  32656       const unsigned char *iblob;
 33274  32657       int iblob_sz;
 33275  32658       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33276  32659   
 33277  32660   /* validating the input args */
 33278         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32661  +    if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32662  +	angle = sqlite3_value_double (argv[0]);
        32663  +    else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33279  32664         {
 33280         -	  iblob = sqlite3_value_blob (argv[0]);
 33281         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
 33282         -      }
 33283         -    else
 33284         -      {
 33285         -	  sqlite3_result_null (context);
 33286         -	  return;
 33287         -      }
 33288         -    if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33289         -	angle = sqlite3_value_double (argv[1]);
 33290         -    else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
 33291         -      {
 33292         -	  int_value = sqlite3_value_int (argv[1]);
        32665  +	  int_value = sqlite3_value_int (argv[0]);
 33293  32666   	  angle = int_value;
 33294  32667         }
        32668  +    else
        32669  +      {
        32670  +	  sqlite3_result_null (context);
        32671  +	  return;
        32672  +      }
        32673  +    if (sqlite3_value_type (argv[1]) == SQLITE_BLOB)
        32674  +      {
        32675  +	  iblob = sqlite3_value_blob (argv[1]);
        32676  +	  iblob_sz = sqlite3_value_bytes (argv[1]);
        32677  +      }
 33295  32678       else
 33296  32679         {
 33297  32680   	  sqlite3_result_null (context);
 33298  32681   	  return;
 33299  32682         }
 33300  32683       rads = angle * coeff;
 33301  32684       vsin = sin (rads);
................................................................................
 33346  32729       unsigned char *blob;
 33347  32730       int blob_sz;
 33348  32731       const unsigned char *iblob;
 33349  32732       int iblob_sz;
 33350  32733       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33351  32734   
 33352  32735   /* validating the input args */
 33353         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32736  +    if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32737  +	angle = sqlite3_value_double (argv[0]);
        32738  +    else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33354  32739         {
 33355         -	  iblob = sqlite3_value_blob (argv[0]);
 33356         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
        32740  +	  int_value = sqlite3_value_int (argv[0]);
        32741  +	  angle = int_value;
 33357  32742         }
 33358  32743       else
 33359  32744         {
 33360  32745   	  sqlite3_result_null (context);
 33361  32746   	  return;
 33362  32747         }
 33363         -    if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33364         -	angle = sqlite3_value_double (argv[1]);
 33365         -    else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
        32748  +    if (sqlite3_value_type (argv[1]) == SQLITE_BLOB)
 33366  32749         {
 33367         -	  int_value = sqlite3_value_int (argv[1]);
 33368         -	  angle = int_value;
        32750  +	  iblob = sqlite3_value_blob (argv[1]);
        32751  +	  iblob_sz = sqlite3_value_bytes (argv[1]);
 33369  32752         }
 33370  32753       else
 33371  32754         {
 33372  32755   	  sqlite3_result_null (context);
 33373  32756   	  return;
 33374  32757         }
 33375  32758       rads = angle * coeff;
................................................................................
 33421  32804       unsigned char *blob;
 33422  32805       int blob_sz;
 33423  32806       const unsigned char *iblob;
 33424  32807       int iblob_sz;
 33425  32808       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33426  32809   
 33427  32810   /* validating the input args */
 33428         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
        32811  +    if (sqlite3_value_type (argv[0]) == SQLITE_FLOAT)
        32812  +	angle = sqlite3_value_double (argv[0]);
        32813  +    else if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 33429  32814         {
 33430         -	  iblob = sqlite3_value_blob (argv[0]);
 33431         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
        32815  +	  int_value = sqlite3_value_int (argv[0]);
        32816  +	  angle = int_value;
 33432  32817         }
 33433  32818       else
 33434  32819         {
 33435  32820   	  sqlite3_result_null (context);
 33436  32821   	  return;
 33437  32822         }
 33438         -    if (sqlite3_value_type (argv[1]) == SQLITE_FLOAT)
 33439         -	angle = sqlite3_value_double (argv[1]);
 33440         -    else if (sqlite3_value_type (argv[1]) == SQLITE_INTEGER)
        32823  +    if (sqlite3_value_type (argv[1]) == SQLITE_BLOB)
 33441  32824         {
 33442         -	  int_value = sqlite3_value_int (argv[1]);
 33443         -	  angle = int_value;
        32825  +	  iblob = sqlite3_value_blob (argv[1]);
        32826  +	  iblob_sz = sqlite3_value_bytes (argv[1]);
 33444  32827         }
 33445  32828       else
 33446  32829         {
 33447  32830   	  sqlite3_result_null (context);
 33448  32831   	  return;
 33449  32832         }
 33450  32833       rads = angle * coeff;
................................................................................
 33460  32843   				 xoff, yoff, zoff, &blob, &blob_sz);
 33461  32844       if (blob == NULL)
 33462  32845   	sqlite3_result_null (context);
 33463  32846       else
 33464  32847   	sqlite3_result_blob (context, blob, blob_sz, free);
 33465  32848   }
 33466  32849   
 33467         -static void
 33468         -fnct_AffineTransformMatrix_Determinant (sqlite3_context * context, int argc,
 33469         -					sqlite3_value ** argv)
 33470         -{
 33471         -/* SQL function:
 33472         -/ ATM_Determinant(blob atm)
 33473         -/
 33474         -/ will return the Determinant from a BLOB-encoded Affine Transform Matrix
 33475         -/ or 0.0 on failure
 33476         -*/
 33477         -    const unsigned char *iblob;
 33478         -    int iblob_sz;
 33479         -    double det = 0.0;
 33480         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33481         -
 33482         -/* validating the input args */
 33483         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 33484         -      {
 33485         -	  iblob = sqlite3_value_blob (argv[0]);
 33486         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
 33487         -      }
 33488         -    else
 33489         -      {
 33490         -	  sqlite3_result_double (context, det);
 33491         -	  return;
 33492         -      }
 33493         -
 33494         -/* evaluating the Affine Transform Matrix */
 33495         -    det = gaia_matrix_determinant (iblob, iblob_sz);
 33496         -    sqlite3_result_double (context, det);
 33497         -}
 33498         -
 33499         -static void
 33500         -fnct_AffineTransformMatrix_IsInvertible (sqlite3_context * context, int argc,
 33501         -					 sqlite3_value ** argv)
 33502         -{
 33503         -/* SQL function:
 33504         -/ ATM_IsInvertible(blob atm)
 33505         -/
 33506         -/ will return TRUE if the a BLOB-encoded Affine Transform Matrix
 33507         -/ is Invertible, FALSE if not
 33508         -/ -1 on invalid arguments
 33509         -*/
 33510         -    const unsigned char *iblob;
 33511         -    int iblob_sz;
 33512         -    double det;
 33513         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33514         -
 33515         -/* validating the input args */
 33516         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 33517         -      {
 33518         -	  iblob = sqlite3_value_blob (argv[0]);
 33519         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
 33520         -      }
 33521         -    else
 33522         -      {
 33523         -	  sqlite3_result_int (context, -1);
 33524         -	  return;
 33525         -      }
 33526         -
 33527         -/* evaluating the Affine Transform Matrix */
 33528         -    det = gaia_matrix_determinant (iblob, iblob_sz);
 33529         -    if (det != 0.0)
 33530         -	sqlite3_result_int (context, 1);
 33531         -    else
 33532         -	sqlite3_result_int (context, 0);
 33533         -}
 33534         -
 33535         -static void
 33536         -fnct_AffineTransformMatrix_Invert (sqlite3_context * context, int argc,
 33537         -				   sqlite3_value ** argv)
 33538         -{
 33539         -/* SQL function:
 33540         -/ ATM_Invert(blob atm)
 33541         -/
 33542         -/ will create an Inverse BLOB-encoded Affine Transform Matrix
 33543         -/ 
 33544         -/ returns a BLOB-ATM object or NULL on failure
 33545         -*/
 33546         -    unsigned char *blob;
 33547         -    int blob_sz;
 33548         -    const unsigned char *iblob;
 33549         -    int iblob_sz;
 33550         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33551         -
 33552         -/* validating the input args */
 33553         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 33554         -      {
 33555         -	  iblob = sqlite3_value_blob (argv[0]);
 33556         -	  iblob_sz = sqlite3_value_bytes (argv[0]);
 33557         -      }
 33558         -    else
 33559         -      {
 33560         -	  sqlite3_result_null (context);
 33561         -	  return;
 33562         -      }
 33563         -
 33564         -/* creating the BLOB-encoded Affine Transform Matrix (Inverse) */
 33565         -    gaia_matrix_invert (iblob, iblob_sz, &blob, &blob_sz);
 33566         -    if (blob == NULL)
 33567         -	sqlite3_result_null (context);
 33568         -    else
 33569         -	sqlite3_result_blob (context, blob, blob_sz, free);
 33570         -}
 33571         -
 33572  32850   static void
 33573  32851   fnct_AffineTransformMatrix_GeometryTransform (sqlite3_context * context,
 33574  32852   					      int argc, sqlite3_value ** argv)
 33575  32853   {
 33576  32854   /* SQL function:
 33577         -/ ATM_Transform(blob geom, blob atm [ , int srid] )
        32855  +/ ATM_Transform(blob geom, blob atm)
 33578  32856   /
 33579  32857   / will create a BLOB-Geometry by applying to the input Geometry all
 33580  32858   / transformations specified by the Affine Transform Matrix
 33581  32859   / 
 33582  32860   / returns a BLOB-ATM object or NULL on failure
 33583  32861   */
 33584  32862       unsigned char *blob;
................................................................................
 33585  32863       int blob_sz;
 33586  32864       const unsigned char *iblob1;
 33587  32865       int iblob1_sz;
 33588  32866       const unsigned char *iblob2;
 33589  32867       int iblob2_sz;
 33590  32868       gaiaGeomCollPtr g1;
 33591  32869       gaiaGeomCollPtr g2;
 33592         -    int srid = -9999;
 33593         -    int gpkg_amphibious = 0;
 33594         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 33595  32870       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33596         -    if (cache != NULL)
 33597         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 33598  32871   
 33599  32872   /* validating the input args */
 33600  32873       if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 33601  32874         {
 33602  32875   	  iblob1 = sqlite3_value_blob (argv[0]);
 33603  32876   	  iblob1_sz = sqlite3_value_bytes (argv[0]);
 33604  32877         }
................................................................................
 33612  32885   	  iblob2 = sqlite3_value_blob (argv[1]);
 33613  32886   	  iblob2_sz = sqlite3_value_bytes (argv[1]);
 33614  32887         }
 33615  32888       else
 33616  32889         {
 33617  32890   	  sqlite3_result_null (context);
 33618  32891   	  return;
 33619         -      }
 33620         -    if (argc == 3)
 33621         -      {
 33622         -	  if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 33623         -	      srid = sqlite3_value_int (argv[2]);
 33624         -	  else
 33625         -	    {
 33626         -		sqlite3_result_null (context);
 33627         -		return;
 33628         -	    }
 33629  32892         }
 33630  32893   
 33631  32894   /* attempting to parse the BLOB-Geometry */
 33632         -    g1 = gaiaFromSpatiaLiteBlobWkbEx (iblob1, iblob1_sz, gpkg_amphibious);
        32895  +    g1 = gaiaFromSpatiaLiteBlobWkb (iblob1, iblob1_sz);
 33633  32896       if (g1 == NULL)
 33634  32897         {
 33635  32898   	  sqlite3_result_null (context);
 33636  32899   	  return;
 33637  32900         }
 33638  32901       g2 = gaia_matrix_transform_geometry (g1, iblob2, iblob2_sz);
 33639  32902       gaiaFreeGeomColl (g1);
 33640  32903       if (g2 == NULL)
 33641  32904         {
 33642  32905   	  sqlite3_result_null (context);
 33643  32906   	  return;
 33644  32907         }
 33645         -    if (srid != -9999)
 33646         -	g2->Srid = srid;
 33647  32908       gaiaToSpatiaLiteBlobWkb (g2, &blob, &blob_sz);
 33648  32909       gaiaFreeGeomColl (g2);
 33649  32910       if (blob == NULL)
 33650  32911   	sqlite3_result_null (context);
 33651  32912       else
 33652  32913   	sqlite3_result_blob (context, blob, blob_sz, free);
 33653  32914   }
................................................................................
 33716  32977       text = gaia_matrix_as_text (blob, blob_sz);
 33717  32978       if (text == NULL)
 33718  32979   	sqlite3_result_null (context);
 33719  32980       else
 33720  32981   	sqlite3_result_text (context, text, strlen (text), sqlite3_free);
 33721  32982   }
 33722  32983   
 33723         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
 33724         -
 33725  32984   static int
 33726  32985   get_control_point (gaiaGeomCollPtr geom, double *x, double *y, double *z,
 33727  32986   		   int *has3d)
 33728  32987   {
 33729  32988   /* checking a Control Point */
 33730  32989       gaiaPointPtr pt;
 33731  32990       if (geom == NULL)
................................................................................
 33763  33022       if (has3d_0 != cp->has3d)
 33764  33023   	return 0;
 33765  33024       if (has3d_1 != cp->has3d)
 33766  33025   	return 0;
 33767  33026       return 1;
 33768  33027   }
 33769  33028   
        33029  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
        33030  +
 33770  33031   static void
 33771         -fnct_GroundControlPoints_Compute_step (sqlite3_context * context,
 33772         -				       int argc, sqlite3_value ** argv)
        33032  +fnct_AffineTransformMatrix_ControlPoints_step (sqlite3_context * context,
        33033  +					       int argc, sqlite3_value ** argv)
 33773  33034   {
 33774  33035   /* SQL function:
 33775         -/ GCP_Compute(BLOB point1, BLOB point2 [ , int order ] )
        33036  +/ ATM_ControlPoints(BLOB point1, BLOB point2 [ , int tps ] )
 33776  33037   /
 33777  33038   / aggregate function - STEP
 33778  33039   /
 33779  33040   */
 33780  33041       unsigned char *p_blob0;
 33781  33042       int n_bytes0;
 33782  33043       unsigned char *p_blob1;
................................................................................
 33787  33048       double y0;
 33788  33049       double z0;
 33789  33050       double x1;
 33790  33051       double y1;
 33791  33052       double z1;
 33792  33053       int has3d_0;
 33793  33054       int has3d_1;
 33794         -    int order = 1;
 33795  33055       int tps = 0;
 33796  33056       GaiaControlPointsPtr *cp;
 33797         -    int gpkg_amphibious = 0;
 33798         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 33799  33057       GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33800         -    if (cache != NULL)
 33801         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 33802  33058       if (sqlite3_value_type (argv[0]) != SQLITE_BLOB)
 33803  33059         {
 33804  33060   	  sqlite3_result_null (context);
 33805  33061   	  return;
 33806  33062         }
 33807  33063       if (sqlite3_value_type (argv[1]) != SQLITE_BLOB)
 33808  33064         {
................................................................................
 33812  33068       if (argc == 3)
 33813  33069         {
 33814  33070   	  if (sqlite3_value_type (argv[2]) != SQLITE_INTEGER)
 33815  33071   	    {
 33816  33072   		sqlite3_result_null (context);
 33817  33073   		return;
 33818  33074   	    }
 33819         -	  order = sqlite3_value_int (argv[2]);
 33820         -	  if (order >= 1 && order <= 3)
 33821         -	      ;			/* 1st, 2nd or 3rd polynomial order */
 33822         -	  else if (order == 0)
 33823         -	    {
 33824         -		/* Thin Plate Splite */
 33825         -		order = 1;
 33826         -		tps = 1;
 33827         -	    }
 33828         -	  else
 33829         -	    {
 33830         -		sqlite3_result_null (context);
 33831         -		return;
 33832         -	    }
        33075  +	  tps = sqlite3_value_int (argv[2]);
 33833  33076         }
 33834  33077       p_blob0 = (unsigned char *) sqlite3_value_blob (argv[0]);
 33835  33078       n_bytes0 = sqlite3_value_bytes (argv[0]);
 33836  33079       p_blob1 = (unsigned char *) sqlite3_value_blob (argv[1]);
 33837  33080       n_bytes1 = sqlite3_value_bytes (argv[1]);
 33838         -    geom0 = gaiaFromSpatiaLiteBlobWkbEx (p_blob0, n_bytes0, gpkg_amphibious);
 33839         -    geom1 = gaiaFromSpatiaLiteBlobWkbEx (p_blob1, n_bytes1, gpkg_amphibious);
        33081  +    geom0 = gaiaFromSpatiaLiteBlobWkb (p_blob0, n_bytes0);
        33082  +    geom1 = gaiaFromSpatiaLiteBlobWkb (p_blob1, n_bytes1);
 33840  33083       if (!get_control_point (geom0, &x0, &y0, &z0, &has3d_0))
 33841  33084   	goto error;
 33842  33085       if (!get_control_point (geom1, &x1, &y1, &z1, &has3d_1))
 33843  33086   	goto error;
 33844  33087       if (has3d_0 != has3d_1)
 33845  33088   	goto error;
 33846  33089       cp = sqlite3_aggregate_context (context,
 33847  33090   				    sizeof (struct gaia_control_points));
 33848  33091       if (*cp == NULL)
 33849  33092         {
 33850  33093   	  /* this is the first row */
 33851         -	  *cp = gaiaCreateControlPoints (1024, has3d_0, order, tps);
        33094  +	  *cp = gaiaCreateControlPoints (1024, has3d_0, tps);
 33852  33095   	  if (has3d_0)
 33853  33096   	      gaiaAddControlPoint3D (*cp, x0, y0, z0, x1, y1, z1);
 33854  33097   	  else
 33855  33098   	      gaiaAddControlPoint2D (*cp, x0, y0, x1, y1);
 33856  33099         }
 33857  33100       else
 33858  33101         {
................................................................................
 33873  33116   	gaiaFreeGeomColl (geom0);
 33874  33117       if (geom1 != NULL)
 33875  33118   	gaiaFreeGeomColl (geom1);
 33876  33119       sqlite3_result_null (context);
 33877  33120   }
 33878  33121   
 33879  33122   static void
 33880         -fnct_GroundControlPoints_Compute_final (sqlite3_context * context)
        33123  +fnct_AffineTransformMatrix_ControlPoints_final (sqlite3_context * context)
 33881  33124   {
 33882  33125   /* SQL function:
 33883         -/ GCP_Compute(BLOB point1, BLOB point2 [ , int order ] )
        33126  +/ ATM_ControlPoints(BLOB point1, BLOB point2 [ , int tps ] )
 33884  33127   /
 33885  33128   / aggregate function - FINAL
 33886  33129   /
 33887  33130   */
        33131  +    double a = 1.0;
        33132  +    double b = 0.0;
        33133  +    double c = 0.0;
        33134  +    double d = 0.0;
        33135  +    double e = 1.0;
        33136  +    double f = 0.0;
        33137  +    double g = 0.0;
        33138  +    double h = 0.0;
        33139  +    double i = 1.0;
        33140  +    double xoff = 0.0;
        33141  +    double yoff = 0.0;
        33142  +    double zoff = 0.0;
 33888  33143       unsigned char *blob = NULL;
 33889  33144       int blob_sz;
 33890  33145       int ret;
 33891  33146       GaiaControlPointsPtr *cp = sqlite3_aggregate_context (context, 0);
 33892  33147       if (cp == NULL)
 33893  33148         {
 33894  33149   	  sqlite3_result_null (context);
 33895  33150   	  return;
 33896  33151         }
 33897         -    ret = gaiaCreatePolynomialCoeffs (*cp, &blob, &blob_sz);
        33152  +    ret = gaiaAffineFromControlPoints (*cp);
        33153  +    if (ret)
        33154  +      {
        33155  +	  struct gaia_control_points *xcp = (struct gaia_control_points *) *cp;
        33156  +	  if (xcp->affine_valid)
        33157  +	    {
        33158  +		if (xcp->has3d)
        33159  +		  {
        33160  +		      /* 3D affine transform matrix */
        33161  +		      a = xcp->a;
        33162  +		      b = xcp->b;
        33163  +		      c = xcp->c;
        33164  +		      d = xcp->d;
        33165  +		      e = xcp->e;
        33166  +		      f = xcp->f;
        33167  +		      g = xcp->g;
        33168  +		      h = xcp->h;
        33169  +		      i = xcp->i;
        33170  +		      xoff = xcp->xoff;
        33171  +		      yoff = xcp->yoff;
        33172  +		      zoff = xcp->zoff;
        33173  +		  }
        33174  +		else
        33175  +		  {
        33176  +		      /* 2D affine transform matrix */
        33177  +		      a = xcp->a;
        33178  +		      b = xcp->b;
        33179  +		      d = xcp->d;
        33180  +		      e = xcp->e;
        33181  +		      xoff = xcp->xoff;
        33182  +		      yoff = xcp->yoff;
        33183  +		  }
        33184  +	    }
        33185  +      }
        33186  +    gaiaFreeControlPoints (*cp);
 33898  33187       if (!ret)
 33899  33188   	sqlite3_result_null (context);
 33900  33189       else
 33901         -	sqlite3_result_blob (context, blob, blob_sz, free);
 33902         -    gaiaFreeControlPoints (*cp);
 33903         -}
 33904         -
 33905         -static void
 33906         -fnct_GroundControlPoints_GeometryTransform (sqlite3_context * context,
 33907         -					    int argc, sqlite3_value ** argv)
 33908         -{
 33909         -/* SQL function:
 33910         -/ GCP_Transform(blob geom, blob gcp [ , int srid ] )
 33911         -/
 33912         -/ will create a BLOB-Geometry by applying to the input Geometry all
 33913         -/ transformations specified by the Polynomial coefficients
 33914         -/ 
 33915         -/ returns a BLOB-ATM object or NULL on failure
 33916         -*/
 33917         -    unsigned char *blob;
 33918         -    int blob_sz;
 33919         -    const unsigned char *iblob1;
 33920         -    int iblob1_sz;
 33921         -    const unsigned char *iblob2;
 33922         -    int iblob2_sz;
 33923         -    gaiaGeomCollPtr g1;
 33924         -    gaiaGeomCollPtr g2;
 33925         -    int srid = -9999;
 33926         -    int gpkg_amphibious = 0;
 33927         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 33928         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 33929         -    if (cache != NULL)
 33930         -	gpkg_amphibious = cache->gpkg_amphibious_mode;
 33931         -
 33932         -/* validating the input args */
 33933         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 33934  33190         {
 33935         -	  iblob1 = sqlite3_value_blob (argv[0]);
 33936         -	  iblob1_sz = sqlite3_value_bytes (argv[0]);
 33937         -      }
 33938         -    else
 33939         -      {
 33940         -	  sqlite3_result_null (context);
 33941         -	  return;
 33942         -      }
 33943         -    if (sqlite3_value_type (argv[1]) == SQLITE_BLOB)
 33944         -      {
 33945         -	  iblob2 = sqlite3_value_blob (argv[1]);
 33946         -	  iblob2_sz = sqlite3_value_bytes (argv[1]);
 33947         -      }
 33948         -    else
 33949         -      {
 33950         -	  sqlite3_result_null (context);
 33951         -	  return;
 33952         -      }
 33953         -    if (argc == 3)
 33954         -      {
 33955         -	  if (sqlite3_value_type (argv[2]) == SQLITE_INTEGER)
 33956         -	      srid = sqlite3_value_int (argv[2]);
        33191  +	  /* creating the BLOB-encoded Affine Transform Matrix */
        33192  +	  gaia_matrix_create (a, b, c, d, e, f, g, h, i, xoff, yoff, zoff,
        33193  +			      &blob, &blob_sz);
        33194  +	  if (blob == NULL)
        33195  +	      sqlite3_result_null (context);
 33957  33196   	  else
 33958         -	    {
 33959         -		sqlite3_result_null (context);
 33960         -		return;
 33961         -	    }
        33197  +	      sqlite3_result_blob (context, blob, blob_sz, free);
 33962  33198         }
 33963         -
 33964         -/* attempting to parse the BLOB-Geometry */
 33965         -    g1 = gaiaFromSpatiaLiteBlobWkbEx (iblob1, iblob1_sz, gpkg_amphibious);
 33966         -    if (g1 == NULL)
 33967         -      {
 33968         -	  sqlite3_result_null (context);
 33969         -	  return;
 33970         -      }
 33971         -    g2 = gaiaPolynomialTransformGeometry (g1, iblob2, iblob2_sz);
 33972         -    gaiaFreeGeomColl (g1);
 33973         -    if (g2 == NULL)
 33974         -      {
 33975         -	  sqlite3_result_null (context);
 33976         -	  return;
 33977         -      }
 33978         -    if (srid != -9999)
 33979         -	g2->Srid = srid;
 33980         -    gaiaToSpatiaLiteBlobWkb (g2, &blob, &blob_sz);
 33981         -    gaiaFreeGeomColl (g2);
 33982         -    if (blob == NULL)
 33983         -	sqlite3_result_null (context);
 33984         -    else
 33985         -	sqlite3_result_blob (context, blob, blob_sz, free);
 33986  33199   }
 33987  33200   
 33988         -static void
 33989         -fnct_GroundControlPoints_IsValid (sqlite3_context * context, int argc,
 33990         -				  sqlite3_value ** argv)
 33991         -{
 33992         -/* SQL function:
 33993         -/ GCO_IsValid(BLOB polynomail)
 33994         -/
 33995         -/ returns TRUE if the current BLOB is a valid BLOB-GCP, FALSE if not 
 33996         -/ or -1 if any error is encountered
 33997         -*/
 33998         -    const unsigned char *blob;
 33999         -    int blob_sz;
 34000         -    int ret;
 34001         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34002         -/* validating the input args */
 34003         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 34004         -      {
 34005         -	  blob = (const unsigned char *) sqlite3_value_blob (argv[0]);
 34006         -	  blob_sz = sqlite3_value_bytes (argv[0]);
 34007         -      }
 34008         -    else
 34009         -      {
 34010         -	  sqlite3_result_int (context, -1);
 34011         -	  return;
 34012         -      }
 34013         -
 34014         -/* verifying the BLOB-Polynomail */
 34015         -    ret = gaiaPolynomialIsValid (blob, blob_sz);
 34016         -    if (ret)
 34017         -	sqlite3_result_int (context, 1);
 34018         -    else
 34019         -	sqlite3_result_int (context, 0);
 34020         -}
 34021         -
 34022         -static void
 34023         -fnct_GroundControlPoints_AsText (sqlite3_context * context, int argc,
 34024         -				 sqlite3_value ** argv)
 34025         -{
 34026         -/* SQL function:
 34027         -/ GCP_AsText(BLOB polynomail)
 34028         -/
 34029         -/ returns a textual representaion of the BLOB-Polynomial
 34030         -/ or NULL if any error is encountered
 34031         -*/
 34032         -    const unsigned char *blob;
 34033         -    int blob_sz;
 34034         -    char *text;
 34035         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34036         -/* validating the input args */
 34037         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 34038         -      {
 34039         -	  blob = (const unsigned char *) sqlite3_value_blob (argv[0]);
 34040         -	  blob_sz = sqlite3_value_bytes (argv[0]);
 34041         -      }
 34042         -    else
 34043         -      {
 34044         -	  sqlite3_result_null (context);
 34045         -	  return;
 34046         -      }
 34047         -
 34048         -/* retrieving the textual representation from the BLOB-Matrix */
 34049         -    text = gaiaPolynomialAsText (blob, blob_sz);
 34050         -    if (text == NULL)
 34051         -	sqlite3_result_null (context);
 34052         -    else
 34053         -	sqlite3_result_text (context, text, strlen (text), sqlite3_free);
 34054         -}
 34055         -
 34056         -static void
 34057         -fnct_GroundControlPoints_ToATM (sqlite3_context * context, int argc,
 34058         -				sqlite3_value ** argv)
 34059         -{
 34060         -/* SQL function:
 34061         -/ GCP2ATM(BLOB polynomail)
 34062         -/
 34063         -/ returns a BLOB-Atm corresponding to a BLOB-Polynomial (first order only)
 34064         -/ or NULL if any error is encountered
 34065         -*/
 34066         -    const unsigned char *blob;
 34067         -    int blob_sz;
 34068         -    unsigned char *oblob;
 34069         -    int oblob_sz;
 34070         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34071         -/* validating the input args */
 34072         -    if (sqlite3_value_type (argv[0]) == SQLITE_BLOB)
 34073         -      {
 34074         -	  blob = (const unsigned char *) sqlite3_value_blob (argv[0]);
 34075         -	  blob_sz = sqlite3_value_bytes (argv[0]);
 34076         -      }
 34077         -    else
 34078         -      {
 34079         -	  sqlite3_result_null (context);
 34080         -	  return;
 34081         -      }
 34082         -
 34083         -/* converting Polynomial coefficients into an Affine Transformation matrix */
 34084         -    if (!gaiaPolynomialToMatrix (blob, blob_sz, &oblob, &oblob_sz))
 34085         -	sqlite3_result_null (context);
 34086         -    else
 34087         -	sqlite3_result_blob (context, oblob, oblob_sz, free);
 34088         -}
 34089         -
 34090         -#endif /* end including GCP */
 34091         -
 34092         -static void
 34093         -fnct_enableGpkgAmphibiousMode (sqlite3_context * context, int argc,
 34094         -			       sqlite3_value ** argv)
 34095         -{
 34096         -/* SQL function:
 34097         -/ EnableGpkgAmphibiousMode ( void )
 34098         -/
 34099         -/ returns: nothing
 34100         -*/
 34101         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 34102         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34103         -    if (cache == NULL)
 34104         -	return;
 34105         -    cache->gpkg_amphibious_mode = 1;
 34106         -}
 34107         -
 34108         -static void
 34109         -fnct_disableGpkgAmphibiousMode (sqlite3_context * context, int argc,
 34110         -				sqlite3_value ** argv)
 34111         -{
 34112         -/* SQL function:
 34113         -/ DisableGpkgAmphibiousMode ( void )
 34114         -/
 34115         -/ returns: nothing
 34116         -*/
 34117         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 34118         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34119         -    if (cache == NULL)
 34120         -	return;
 34121         -    cache->gpkg_amphibious_mode = 0;
 34122         -}
 34123         -
 34124         -static void
 34125         -fnct_getGpkgAmphibiousMode (sqlite3_context * context, int argc,
 34126         -			    sqlite3_value ** argv)
 34127         -{
 34128         -/* SQL function:
 34129         -/ GetGpkgAmphibiousMode ( void )
 34130         -/
 34131         -/ returns: TRUE or FALSE
 34132         -*/
 34133         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 34134         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34135         -    if (cache == NULL)
 34136         -      {
 34137         -	  sqlite3_result_int (context, 0);
 34138         -	  return;
 34139         -      }
 34140         -    sqlite3_result_int (context, cache->gpkg_amphibious_mode);
 34141         -}
 34142         -
 34143         -static void
 34144         -fnct_setDecimalPrecision (sqlite3_context * context, int argc,
 34145         -			  sqlite3_value ** argv)
 34146         -{
 34147         -/* SQL function:
 34148         -/ SetDecimalPrecision ( int precision )
 34149         -/ a negative precision identifies the default setting
 34150         -/
 34151         -/ returns: nothing
 34152         -*/
 34153         -    int precision = -1;
 34154         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 34155         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34156         -    if (cache == NULL)
 34157         -	return;
 34158         -    if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER)
 34159         -	precision = sqlite3_value_int (argv[0]);
 34160         -    else
 34161         -	return;
 34162         -    if (precision < 0)
 34163         -	precision = -1;
 34164         -    else if (precision == 6)
 34165         -	precision = -1;
 34166         -    else if (precision > 18)
 34167         -	precision = 18;
 34168         -    cache->decimal_precision = precision;
 34169         -}
 34170         -
 34171         -static void
 34172         -fnct_getDecimalPrecision (sqlite3_context * context, int argc,
 34173         -			  sqlite3_value ** argv)
 34174         -{
 34175         -/* SQL function:
 34176         -/ GetDecimalPrecision ( void )
 34177         -/
 34178         -/ returns: the currently set Decimal Precision
 34179         -*/
 34180         -    struct splite_internal_cache *cache = sqlite3_user_data (context);
 34181         -    GAIA_UNUSED ();		/* LCOV_EXCL_LINE */
 34182         -    if (cache == NULL)
 34183         -      {
 34184         -	  sqlite3_result_int (context, -1);
 34185         -	  return;
 34186         -      }
 34187         -    sqlite3_result_int (context, cache->decimal_precision);
 34188         -}
        33201  +#endif /* end including CONTROL_POINTS */
 34189  33202   
 34190  33203   #ifdef LOADABLE_EXTENSION
 34191  33204   static void
 34192  33205   splite_close_callback (void *p_cache)
 34193  33206   {
 34194  33207   /*
 34195  33208   / the DB connection has been terminated 
 34196  33209   /
 34197  33210   / this callback function is expected to be invoked only if 
 34198         -/ SpatiaLite was loaded as a dynamic extension and will
        33211  +/ SpatiaLite wasloaded as a dynamic extension and will
 34199  33212   / perform a final clean-up releasing the internal cache
 34200  33213   /
 34201  33214   */
 34202  33215       struct splite_internal_cache *cache =
 34203  33216   	(struct splite_internal_cache *) p_cache;
 34204  33217   
 34205  33218       if (cache == NULL)
................................................................................
 34509  33522       sqlite3_create_function_v2 (db, "UpdateMetaCatalogStatistics", 3,
 34510  33523   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34511  33524   				fnct_UpdateMetaCatalogStatistics, 0, 0, 0);
 34512  33525       sqlite3_create_function_v2 (db, "UpdateMetaCatalogStatistics", 4,
 34513  33526   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34514  33527   				fnct_UpdateMetaCatalogStatistics, 0, 0, 0);
 34515  33528       sqlite3_create_function_v2 (db, "AsText", 1,
 34516         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33529  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34517  33530   				fnct_AsText, 0, 0, 0);
 34518  33531       sqlite3_create_function_v2 (db, "ST_AsText", 1,
 34519         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33532  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34520  33533   				fnct_AsText, 0, 0, 0);
 34521  33534       sqlite3_create_function_v2 (db, "AsWkt", 1,
 34522         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33535  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34523  33536   				fnct_AsWkt, 0, 0, 0);
 34524  33537       sqlite3_create_function_v2 (db, "AsWkt", 2,
 34525         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33538  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34526  33539   				fnct_AsWkt, 0, 0, 0);
 34527  33540       sqlite3_create_function_v2 (db, "AsSvg", 1,
 34528         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33541  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34529  33542   				fnct_AsSvg1, 0, 0, 0);
 34530  33543       sqlite3_create_function_v2 (db, "AsSvg", 2,
 34531         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33544  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34532  33545   				fnct_AsSvg2, 0, 0, 0);
 34533  33546       sqlite3_create_function_v2 (db, "AsSvg", 3,
 34534         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33547  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34535  33548   				fnct_AsSvg3, 0, 0, 0);
 34536  33549       sqlite3_create_function_v2 (db, "CloneTable", 4,
 34537  33550   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34538  33551   				fnct_CloneTable, 0, 0, 0);
 34539  33552       sqlite3_create_function_v2 (db, "CloneTable", 5,
 34540  33553   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34541  33554   				fnct_CloneTable, 0, 0, 0);
................................................................................
 34579  33592   				fnct_AsKml, 0, 0, 0);
 34580  33593       sqlite3_create_function_v2 (db, "AsKml", 4,
 34581  33594   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 34582  33595   				fnct_AsKml, 0, 0, 0);
 34583  33596   #endif /* end including PROJ.4 */
 34584  33597   
 34585  33598       sqlite3_create_function_v2 (db, "AsGml", 1,
 34586         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33599  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34587  33600   				fnct_AsGml, 0, 0, 0);
 34588  33601       sqlite3_create_function_v2 (db, "AsGml", 2,
 34589         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33602  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34590  33603   				fnct_AsGml, 0, 0, 0);
 34591  33604       sqlite3_create_function_v2 (db, "AsGml", 3,
 34592         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33605  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34593  33606   				fnct_AsGml, 0, 0, 0);
 34594  33607       sqlite3_create_function_v2 (db, "GeomFromGml", 1,
 34595  33608   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 34596  33609   				fnct_FromGml, 0, 0, 0);
 34597  33610       sqlite3_create_function_v2 (db, "AsGeoJSON", 1,
 34598         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33611  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34599  33612   				fnct_AsGeoJSON, 0, 0, 0);
 34600  33613       sqlite3_create_function_v2 (db, "AsGeoJSON", 2,
 34601         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33614  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34602  33615   				fnct_AsGeoJSON, 0, 0, 0);
 34603  33616       sqlite3_create_function_v2 (db, "AsGeoJSON", 3,
 34604         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33617  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34605  33618   				fnct_AsGeoJSON, 0, 0, 0);
 34606  33619       sqlite3_create_function_v2 (db, "GeomFromGeoJSON", 1,
 34607  33620   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34608  33621   				fnct_FromGeoJSON, 0, 0, 0);
 34609  33622       sqlite3_create_function_v2 (db, "GeomFromKml", 1,
 34610  33623   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34611  33624   				fnct_FromKml, 0, 0, 0);
 34612  33625       sqlite3_create_function_v2 (db, "AsFGF", 2,
 34613         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33626  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34614  33627   				fnct_AsFGF, 0, 0, 0);
 34615  33628       sqlite3_create_function_v2 (db, "GeomFromEWKB", 1,
 34616  33629   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34617  33630   				fnct_FromEWKB, 0, 0, 0);
 34618  33631       sqlite3_create_function_v2 (db, "AsEWKB", 1,
 34619         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33632  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34620  33633   				fnct_ToEWKB, 0, 0, 0);
 34621  33634       sqlite3_create_function_v2 (db, "AsEWKT", 1,
 34622         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33635  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34623  33636   				fnct_ToEWKT, 0, 0, 0);
 34624  33637       sqlite3_create_function_v2 (db, "GeomFromEWKT", 1,
 34625  33638   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34626  33639   				fnct_FromEWKT, 0, 0, 0);
 34627  33640       sqlite3_create_function_v2 (db, "AsBinary", 1,
 34628         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33641  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34629  33642   				fnct_AsBinary, 0, 0, 0);
 34630  33643       sqlite3_create_function_v2 (db, "ST_AsBinary", 1,
 34631         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        33644  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34632  33645   				fnct_AsBinary, 0, 0, 0);
 34633  33646       sqlite3_create_function_v2 (db, "GeomFromText", 1,
 34634  33647   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34635  33648   				fnct_GeomFromText1, 0, 0, 0);
 34636  33649       sqlite3_create_function_v2 (db, "GeomFromText", 2,
 34637  33650   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 34638  33651   				fnct_GeomFromText2, 0, 0, 0);
................................................................................
 34999  34012       sqlite3_create_function_v2 (db, "GeomFromFGF", 1,
 35000  34013   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35001  34014   				fnct_GeometryFromFGF1, 0, 0, 0);
 35002  34015       sqlite3_create_function_v2 (db, "GeomFromFGF", 2,
 35003  34016   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35004  34017   				fnct_GeometryFromFGF2, 0, 0, 0);
 35005  34018       sqlite3_create_function_v2 (db, "CompressGeometry", 1,
 35006         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34019  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35007  34020   				fnct_CompressGeometry, 0, 0, 0);
 35008  34021       sqlite3_create_function_v2 (db, "UncompressGeometry", 1,
 35009         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34022  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35010  34023   				fnct_UncompressGeometry, 0, 0, 0);
 35011  34024       sqlite3_create_function_v2 (db, "SanitizeGeometry", 1,
 35012         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34025  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35013  34026   				fnct_SanitizeGeometry, 0, 0, 0);
 35014  34027       sqlite3_create_function_v2 (db, "CastToInteger", 1,
 35015  34028   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35016  34029   				fnct_CastToInteger, 0, 0, 0);
 35017  34030       sqlite3_create_function_v2 (db, "CastToDouble", 1,
 35018  34031   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35019  34032   				fnct_CastToDouble, 0, 0, 0);
................................................................................
 35056  34069       sqlite3_create_function_v2 (db, "FileNameFromPath", 1,
 35057  34070   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35058  34071   				fnct_FileNameFromPath, 0, 0, 0);
 35059  34072       sqlite3_create_function_v2 (db, "FileExtFromPath", 1,
 35060  34073   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35061  34074   				fnct_FileExtFromPath, 0, 0, 0);
 35062  34075       sqlite3_create_function_v2 (db, "CastToPoint", 1,
 35063         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34076  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35064  34077   				fnct_CastToPoint, 0, 0, 0);
 35065  34078       sqlite3_create_function_v2 (db, "CastToLinestring", 1,
 35066         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34079  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35067  34080   				fnct_CastToLinestring, 0, 0, 0);
 35068  34081       sqlite3_create_function_v2 (db, "CastToPolygon", 1,
 35069         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34082  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35070  34083   				fnct_CastToPolygon, 0, 0, 0);
 35071  34084       sqlite3_create_function_v2 (db, "CastToMultiPoint", 1,
 35072         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34085  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35073  34086   				fnct_CastToMultiPoint, 0, 0, 0);
 35074  34087       sqlite3_create_function_v2 (db, "CastToMultiLinestring", 1,
 35075         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34088  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35076  34089   				fnct_CastToMultiLinestring, 0, 0, 0);
 35077  34090       sqlite3_create_function_v2 (db, "CastToMultiPolygon", 1,
 35078         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34091  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35079  34092   				fnct_CastToMultiPolygon, 0, 0, 0);
 35080  34093       sqlite3_create_function_v2 (db, "CastToGeometryCollection", 1,
 35081         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34094  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35082  34095   				fnct_CastToGeometryCollection, 0, 0, 0);
 35083  34096       sqlite3_create_function_v2 (db, "CastToMulti", 1,
 35084         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34097  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35085  34098   				fnct_CastToMulti, 0, 0, 0);
 35086  34099       sqlite3_create_function_v2 (db, "ST_Multi", 1,
 35087         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34100  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35088  34101   				fnct_CastToMulti, 0, 0, 0);
 35089  34102       sqlite3_create_function_v2 (db, "CastToSingle", 1,
 35090         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34103  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35091  34104   				fnct_CastToSingle, 0, 0, 0);
 35092  34105       sqlite3_create_function_v2 (db, "CastToXY", 1,
 35093         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34106  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35094  34107   				fnct_CastToXY, 0, 0, 0);
 35095  34108       sqlite3_create_function_v2 (db, "CastToXYZ", 1,
 35096         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34109  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35097  34110   				fnct_CastToXYZ, 0, 0, 0);
 35098  34111       sqlite3_create_function_v2 (db, "CastToXYM", 1,
 35099         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34112  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35100  34113   				fnct_CastToXYM, 0, 0, 0);
 35101  34114       sqlite3_create_function_v2 (db, "CastToXYZM", 1,
 35102         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34115  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35103  34116   				fnct_CastToXYZM, 0, 0, 0);
 35104  34117       sqlite3_create_function_v2 (db, "ExtractMultiPoint", 1,
 35105         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34118  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35106  34119   				fnct_ExtractMultiPoint, 0, 0, 0);
 35107  34120       sqlite3_create_function_v2 (db, "ExtractMultiLinestring", 1,
 35108         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34121  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35109  34122   				fnct_ExtractMultiLinestring, 0, 0, 0);
 35110  34123       sqlite3_create_function_v2 (db, "ExtractMultiPolygon", 1,
 35111         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34124  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35112  34125   				fnct_ExtractMultiPolygon, 0, 0, 0);
 35113  34126       sqlite3_create_function_v2 (db, "ST_Reverse", 1,
 35114         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34127  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35115  34128   				fnct_Reverse, 0, 0, 0);
 35116  34129       sqlite3_create_function_v2 (db, "ST_ForceLHR", 1,
 35117         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34130  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35118  34131   				fnct_ForceLHR, 0, 0, 0);
 35119  34132       sqlite3_create_function_v2 (db, "Dimension", 1,
 35120         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34133  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35121  34134   				fnct_Dimension, 0, 0, 0);
 35122  34135       sqlite3_create_function_v2 (db, "ST_Dimension", 1,
 35123         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34136  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35124  34137   				fnct_Dimension, 0, 0, 0);
 35125  34138       sqlite3_create_function_v2 (db, "CoordDimension", 1,
 35126         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34139  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35127  34140   				fnct_CoordDimension, 0, 0, 0);
 35128  34141       sqlite3_create_function_v2 (db, "ST_NDims", 1,
 35129         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34142  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35130  34143   				fnct_NDims, 0, 0, 0);
 35131  34144       sqlite3_create_function_v2 (db, "GeometryType", 1,
 35132  34145   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35133  34146   				fnct_GeometryType, 0, 0, 0);
 35134  34147       sqlite3_create_function_v2 (db, "ST_GeometryType", 1,
 35135  34148   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35136  34149   				fnct_GeometryType, 0, 0, 0);
 35137  34150       sqlite3_create_function_v2 (db, "GeometryAliasType", 1,
 35138         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34151  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35139  34152   				fnct_GeometryAliasType, 0, 0, 0);
 35140  34153       sqlite3_create_function_v2 (db, "SridFromAuthCRS", 2,
 35141  34154   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35142  34155   				fnct_SridFromAuthCRS, 0, 0, 0);
 35143  34156       sqlite3_create_function_v2 (db, "SRID", 1,
 35144  34157   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35145  34158   				fnct_SRID, 0, 0, 0);
 35146  34159       sqlite3_create_function_v2 (db, "ST_SRID", 1,
 35147  34160   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35148  34161   				fnct_SRID, 0, 0, 0);
 35149  34162       sqlite3_create_function_v2 (db, "SetSRID", 2,
 35150         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34163  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35151  34164   				fnct_SetSRID, 0, 0, 0);
 35152  34165       sqlite3_create_function_v2 (db, "IsEmpty", 1,
 35153  34166   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35154  34167   				fnct_IsEmpty, 0, 0, 0);
 35155  34168       sqlite3_create_function_v2 (db, "ST_IsEmpty", 1,
 35156  34169   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35157  34170   				fnct_IsEmpty, 0, 0, 0);
................................................................................
 35164  34177       sqlite3_create_function_v2 (db, "Envelope", 1,
 35165  34178   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35166  34179   				fnct_Envelope, 0, 0, 0);
 35167  34180       sqlite3_create_function_v2 (db, "ST_Envelope", 1,
 35168  34181   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35169  34182   				fnct_Envelope, 0, 0, 0);
 35170  34183       sqlite3_create_function_v2 (db, "ST_Expand", 2,
 35171         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34184  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35172  34185   				fnct_Expand, 0, 0, 0);
 35173  34186       sqlite3_create_function_v2 (db, "X", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
 35174         -				cache, fnct_X, 0, 0, 0);
        34187  +				0, fnct_X, 0, 0, 0);
 35175  34188       sqlite3_create_function_v2 (db, "Y", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
 35176         -				cache, fnct_Y, 0, 0, 0);
        34189  +				0, fnct_Y, 0, 0, 0);
 35177  34190       sqlite3_create_function_v2 (db, "Z", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
 35178         -				cache, fnct_Z, 0, 0, 0);
        34191  +				0, fnct_Z, 0, 0, 0);
 35179  34192       sqlite3_create_function_v2 (db, "M", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
 35180         -				cache, fnct_M, 0, 0, 0);
        34193  +				0, fnct_M, 0, 0, 0);
 35181  34194       sqlite3_create_function_v2 (db, "ST_X", 1,
 35182         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35183         -				fnct_X, 0, 0, 0);
        34195  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, fnct_X,
        34196  +				0, 0, 0);
 35184  34197       sqlite3_create_function_v2 (db, "ST_Y", 1,
 35185         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35186         -				fnct_Y, 0, 0, 0);
        34198  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, fnct_Y,
        34199  +				0, 0, 0);
 35187  34200       sqlite3_create_function_v2 (db, "ST_Z", 1,
 35188         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35189         -				fnct_Z, 0, 0, 0);
        34201  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, fnct_Z,
        34202  +				0, 0, 0);
 35190  34203       sqlite3_create_function_v2 (db, "ST_M", 1,
 35191         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35192         -				fnct_M, 0, 0, 0);
        34204  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, fnct_M,
        34205  +				0, 0, 0);
 35193  34206       sqlite3_create_function_v2 (db, "ST_MinX", 1,
 35194  34207   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35195  34208   				fnct_MbrMinX, 0, 0, 0);
 35196  34209       sqlite3_create_function_v2 (db, "ST_MinY", 1,
 35197  34210   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35198  34211   				fnct_MbrMinY, 0, 0, 0);
 35199  34212       sqlite3_create_function_v2 (db, "ST_MinZ", 1,
................................................................................
 35211  34224       sqlite3_create_function_v2 (db, "ST_MaxZ", 1,
 35212  34225   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35213  34226   				fnct_MaxZ, 0, 0, 0);
 35214  34227       sqlite3_create_function_v2 (db, "ST_MaxM", 1,
 35215  34228   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35216  34229   				fnct_MaxM, 0, 0, 0);
 35217  34230       sqlite3_create_function_v2 (db, "NumPoints", 1,
 35218         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34231  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35219  34232   				fnct_NumPoints, 0, 0, 0);
 35220  34233       sqlite3_create_function_v2 (db, "ST_NumPoints", 1,
 35221         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34234  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35222  34235   				fnct_NumPoints, 0, 0, 0);
 35223  34236       sqlite3_create_function_v2 (db, "StartPoint", 1,
 35224         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34237  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35225  34238   				fnct_StartPoint, 0, 0, 0);
 35226  34239       sqlite3_create_function_v2 (db, "EndPoint", 1,
 35227         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34240  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35228  34241   				fnct_EndPoint, 0, 0, 0);
 35229  34242       sqlite3_create_function_v2 (db, "ST_StartPoint", 1,
 35230         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34243  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35231  34244   				fnct_StartPoint, 0, 0, 0);
 35232  34245       sqlite3_create_function_v2 (db, "ST_EndPoint", 1,
 35233         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34246  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35234  34247   				fnct_EndPoint, 0, 0, 0);
 35235  34248       sqlite3_create_function_v2 (db, "PointN", 2,
 35236         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34249  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35237  34250   				fnct_PointN, 0, 0, 0);
 35238  34251       sqlite3_create_function_v2 (db, "ST_PointN", 2,
 35239         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34252  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35240  34253   				fnct_PointN, 0, 0, 0);
 35241  34254       sqlite3_create_function_v2 (db, "ExteriorRing", 1,
 35242         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34255  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35243  34256   				fnct_ExteriorRing, 0, 0, 0);
 35244  34257       sqlite3_create_function_v2 (db, "ST_ExteriorRing", 1,
 35245         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34258  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35246  34259   				fnct_ExteriorRing, 0, 0, 0);
 35247  34260       sqlite3_create_function_v2 (db, "NumInteriorRing", 1,
 35248         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34261  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35249  34262   				fnct_NumInteriorRings, 0, 0, 0);
 35250  34263       sqlite3_create_function_v2 (db, "NumInteriorRings", 1,
 35251         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34264  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35252  34265   				fnct_NumInteriorRings, 0, 0, 0);
 35253  34266       sqlite3_create_function_v2 (db, "ST_NumInteriorRing", 1,
 35254         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34267  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35255  34268   				fnct_NumInteriorRings, 0, 0, 0);
 35256  34269       sqlite3_create_function_v2 (db, "InteriorRingN", 2,
 35257         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34270  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35258  34271   				fnct_InteriorRingN, 0, 0, 0);
 35259  34272       sqlite3_create_function_v2 (db, "ST_InteriorRingN", 2,
 35260         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34273  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35261  34274   				fnct_InteriorRingN, 0, 0, 0);
 35262  34275       sqlite3_create_function_v2 (db, "NumGeometries", 1,
 35263         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34276  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35264  34277   				fnct_NumGeometries, 0, 0, 0);
 35265  34278       sqlite3_create_function_v2 (db, "ST_NumGeometries", 1,
 35266         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34279  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35267  34280   				fnct_NumGeometries, 0, 0, 0);
 35268  34281       sqlite3_create_function_v2 (db, "GeometryN", 2,
 35269         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34282  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35270  34283   				fnct_GeometryN, 0, 0, 0);
 35271  34284       sqlite3_create_function_v2 (db, "ST_GeometryN", 2,
 35272         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34285  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35273  34286   				fnct_GeometryN, 0, 0, 0);
 35274  34287       sqlite3_create_function_v2 (db, "MBRContains", 2,
 35275  34288   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35276  34289   				fnct_MbrContains, 0, 0, 0);
 35277  34290       sqlite3_create_function_v2 (db, "MbrDisjoint", 2,
 35278  34291   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35279  34292   				fnct_MbrDisjoint, 0, 0, 0);
................................................................................
 35283  34296       sqlite3_create_function_v2 (db, "MbrIntersects", 2,
 35284  34297   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35285  34298   				fnct_MbrIntersects, 0, 0, 0);
 35286  34299       sqlite3_create_function_v2 (db, "ST_EnvIntersects", 2,
 35287  34300   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35288  34301   				fnct_MbrIntersects, 0, 0, 0);
 35289  34302       sqlite3_create_function_v2 (db, "ST_EnvIntersects", 5,
 35290         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34303  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35291  34304   				fnct_EnvIntersects, 0, 0, 0);
 35292  34305       sqlite3_create_function_v2 (db, "ST_EnvelopesIntersects", 2,
 35293  34306   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35294  34307   				fnct_MbrIntersects, 0, 0, 0);
 35295  34308       sqlite3_create_function_v2 (db, "ST_EnvelopesIntersects", 5,
 35296         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34309  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35297  34310   				fnct_EnvIntersects, 0, 0, 0);
 35298  34311       sqlite3_create_function_v2 (db, "MBROverlaps", 2,
 35299  34312   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35300  34313   				fnct_MbrOverlaps, 0, 0, 0);
 35301  34314       sqlite3_create_function_v2 (db, "MbrTouches", 2,
 35302  34315   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35303  34316   				fnct_MbrTouches, 0, 0, 0);
 35304  34317       sqlite3_create_function_v2 (db, "MbrWithin", 2,
 35305  34318   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35306  34319   				fnct_MbrWithin, 0, 0, 0);
 35307  34320       sqlite3_create_function_v2 (db, "ShiftCoords", 3,
 35308         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34321  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35309  34322   				fnct_ShiftCoords, 0, 0, 0);
 35310  34323       sqlite3_create_function_v2 (db, "ShiftCoordinates", 3,
 35311         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34324  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35312  34325   				fnct_ShiftCoords, 0, 0, 0);
 35313  34326       sqlite3_create_function_v2 (db, "ST_Translate", 4,
 35314         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34327  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35315  34328   				fnct_Translate, 0, 0, 0);
 35316  34329       sqlite3_create_function_v2 (db, "ST_Shift_Longitude", 1,
 35317         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34330  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35318  34331   				fnct_ShiftLongitude, 0, 0, 0);
 35319  34332       sqlite3_create_function_v2 (db, "NormalizeLonLat", 1,
 35320         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34333  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35321  34334   				fnct_NormalizeLonLat, 0, 0, 0);
 35322  34335       sqlite3_create_function_v2 (db, "ScaleCoords", 2,
 35323         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34336  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35324  34337   				fnct_ScaleCoords, 0, 0, 0);
 35325  34338       sqlite3_create_function_v2 (db, "ScaleCoordinates", 2,
 35326         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34339  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35327  34340   				fnct_ScaleCoords, 0, 0, 0);
 35328  34341       sqlite3_create_function_v2 (db, "ScaleCoords", 3,
 35329         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34342  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35330  34343   				fnct_ScaleCoords, 0, 0, 0);
 35331  34344       sqlite3_create_function_v2 (db, "ScaleCoordinates", 3,
 35332         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34345  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35333  34346   				fnct_ScaleCoords, 0, 0, 0);
 35334  34347       sqlite3_create_function_v2 (db, "RotateCoords", 2,
 35335         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34348  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35336  34349   				fnct_RotateCoords, 0, 0, 0);
 35337  34350       sqlite3_create_function_v2 (db, "RotateCoordinates", 2,
 35338         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34351  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35339  34352   				fnct_RotateCoords, 0, 0, 0);
 35340  34353       sqlite3_create_function_v2 (db, "ReflectCoords", 3,
 35341         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34354  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35342  34355   				fnct_ReflectCoords, 0, 0, 0);
 35343  34356       sqlite3_create_function_v2 (db, "ReflectCoordinates", 3,
 35344         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34357  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35345  34358   				fnct_ReflectCoords, 0, 0, 0);
 35346  34359       sqlite3_create_function_v2 (db, "SwapCoords", 1,
 35347         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34360  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35348  34361   				fnct_SwapCoords, 0, 0, 0);
 35349  34362       sqlite3_create_function_v2 (db, "SwapCoordinates", 1,
 35350         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34363  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35351  34364   				fnct_SwapCoords, 0, 0, 0);
 35352  34365       sqlite3_create_function_v2 (db, "BuildMbr", 4,
 35353  34366   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35354  34367   				fnct_BuildMbr1, 0, 0, 0);
 35355  34368       sqlite3_create_function_v2 (db, "BuildMbr", 5,
 35356  34369   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35357  34370   				fnct_BuildMbr2, 0, 0, 0);
................................................................................
 35358  34371       sqlite3_create_function_v2 (db, "BuildCircleMbr", 3,
 35359  34372   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35360  34373   				fnct_BuildCircleMbr1, 0, 0, 0);
 35361  34374       sqlite3_create_function_v2 (db, "BuildCircleMbr", 4,
 35362  34375   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35363  34376   				fnct_BuildCircleMbr2, 0, 0, 0);
 35364  34377       sqlite3_create_function_v2 (db, "Extent", 1,
 35365         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache, 0,
        34378  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, 0,
 35366  34379   				fnct_Extent_step, fnct_Extent_final, 0);
 35367  34380       sqlite3_create_function_v2 (db, "MbrMinX", 1,
 35368  34381   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35369  34382   				fnct_MbrMinX, 0, 0, 0);
 35370  34383       sqlite3_create_function_v2 (db, "MbrMaxX", 1,
 35371  34384   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35372  34385   				fnct_MbrMaxX, 0, 0, 0);
................................................................................
 35400  34413       sqlite3_create_function_v2 (db, "MakePointZM", 4,
 35401  34414   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35402  34415   				fnct_MakePointZM1, 0, 0, 0);
 35403  34416       sqlite3_create_function_v2 (db, "MakePointZM", 5,
 35404  34417   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35405  34418   				fnct_MakePointZM2, 0, 0, 0);
 35406  34419       sqlite3_create_function_v2 (db, "MakeLine", 1,
 35407         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache, 0,
        34420  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, 0,
 35408  34421   				fnct_MakeLine_step, fnct_MakeLine_final, 0);
 35409  34422       sqlite3_create_function_v2 (db, "MakeLine", 2,
 35410         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34423  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35411  34424   				fnct_MakeLine, 0, 0, 0);
 35412  34425       sqlite3_create_function_v2 (db, "MakeCircle", 3,
 35413  34426   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35414  34427   				fnct_MakeCircle, 0, 0, 0);
 35415  34428       sqlite3_create_function_v2 (db, "MakeCircle", 4,
 35416  34429   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35417  34430   				fnct_MakeCircle, 0, 0, 0);
................................................................................
 35493  34506       sqlite3_create_function_v2 (db, "FilterMbrContains", 4,
 35494  34507   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35495  34508   				fnct_FilterMbrContains, 0, 0, 0);
 35496  34509       sqlite3_create_function_v2 (db, "FilterMbrIntersects", 4,
 35497  34510   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35498  34511   				fnct_FilterMbrIntersects, 0, 0, 0);
 35499  34512       sqlite3_create_function_v2 (db, "LinesFromRings", 1,
 35500         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34513  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35501  34514   				fnct_LinesFromRings, 0, 0, 0);
 35502  34515       sqlite3_create_function_v2 (db, "ST_LinesFromRings", 1,
 35503         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34516  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35504  34517   				fnct_LinesFromRings, 0, 0, 0);
 35505  34518       sqlite3_create_function_v2 (db, "LinesFromRings", 2,
 35506         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34519  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35507  34520   				fnct_LinesFromRings, 0, 0, 0);
 35508  34521       sqlite3_create_function_v2 (db, "ST_LinesFromRings", 2,
 35509         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34522  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35510  34523   				fnct_LinesFromRings, 0, 0, 0);
 35511  34524       sqlite3_create_function_v2 (db, "ST_NPoints", 1,
 35512         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34525  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35513  34526   				fnct_NPoints, 0, 0, 0);
 35514  34527       sqlite3_create_function_v2 (db, "ST_nrings", 1,
 35515         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34528  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35516  34529   				fnct_NRings, 0, 0, 0);
 35517  34530       sqlite3_create_function_v2 (db, "ToGARS", 1,
 35518         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34531  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35519  34532   				fnct_ToGARS, 0, 0, 0);
 35520  34533       sqlite3_create_function_v2 (db, "GARSMbr", 1,
 35521  34534   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35522  34535   				fnct_GARSMbr, 0, 0, 0);
 35523  34536       sqlite3_create_function_v2 (db, "SnapToGrid", 2,
 35524         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34537  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35525  34538   				fnct_SnapToGrid, 0, 0, 0);
 35526  34539       sqlite3_create_function_v2 (db, "ST_SnapToGrid", 2,
 35527         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34540  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35528  34541   				fnct_SnapToGrid, 0, 0, 0);
 35529  34542       sqlite3_create_function_v2 (db, "SnapToGrid", 3,
 35530         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34543  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35531  34544   				fnct_SnapToGrid, 0, 0, 0);
 35532  34545       sqlite3_create_function_v2 (db, "ST_SnapToGrid", 3,
 35533         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34546  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35534  34547   				fnct_SnapToGrid, 0, 0, 0);
 35535  34548       sqlite3_create_function_v2 (db, "SnapToGrid", 5,
 35536         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34549  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35537  34550   				fnct_SnapToGrid, 0, 0, 0);
 35538  34551       sqlite3_create_function_v2 (db, "ST_SnapToGrid", 5,
 35539         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34552  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35540  34553   				fnct_SnapToGrid, 0, 0, 0);
 35541  34554       sqlite3_create_function_v2 (db, "SnapToGrid", 6,
 35542         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34555  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35543  34556   				fnct_SnapToGrid, 0, 0, 0);
 35544  34557       sqlite3_create_function_v2 (db, "ST_SnapToGrid", 6,
 35545         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34558  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35546  34559   				fnct_SnapToGrid, 0, 0, 0);
 35547  34560       sqlite3_create_function_v2 (db, "AddPoint", 2,
 35548         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34561  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35549  34562   				fnct_AddPoint, 0, 0, 0);
 35550  34563       sqlite3_create_function_v2 (db, "ST_AddPoint", 2,
 35551         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34564  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35552  34565   				fnct_AddPoint, 0, 0, 0);
 35553  34566       sqlite3_create_function_v2 (db, "AddPoint", 3,
 35554         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34567  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35555  34568   				fnct_AddPoint, 0, 0, 0);
 35556  34569       sqlite3_create_function_v2 (db, "ST_AddPoint", 3,
 35557         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34570  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35558  34571   				fnct_AddPoint, 0, 0, 0);
 35559  34572       sqlite3_create_function_v2 (db, "RemovePoint", 2,
 35560         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34573  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35561  34574   				fnct_RemovePoint, 0, 0, 0);
 35562  34575       sqlite3_create_function_v2 (db, "ST_RemovePoint", 2,
 35563         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34576  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35564  34577   				fnct_RemovePoint, 0, 0, 0);
 35565  34578       sqlite3_create_function_v2 (db, "SetPoint", 3,
 35566         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34579  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35567  34580   				fnct_SetPoint, 0, 0, 0);
 35568  34581       sqlite3_create_function_v2 (db, "ST_SetPoint", 3,
 35569         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34582  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35570  34583   				fnct_SetPoint, 0, 0, 0);
 35571  34584       sqlite3_create_function_v2 (db, "SetStartPoint", 2,
 35572         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34585  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35573  34586   				fnct_SetStartPoint, 0, 0, 0);
 35574  34587       sqlite3_create_function_v2 (db, "ST_SetStartPoint", 2,
 35575         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34588  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35576  34589   				fnct_SetStartPoint, 0, 0, 0);
 35577  34590       sqlite3_create_function_v2 (db, "SetEndPoint", 2,
 35578         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34591  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35579  34592   				fnct_SetEndPoint, 0, 0, 0);
 35580  34593       sqlite3_create_function_v2 (db, "ST_SetEndPoint", 2,
 35581         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34594  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35582  34595   				fnct_SetEndPoint, 0, 0, 0);
 35583  34596       sqlite3_create_function_v2 (db, "MakePolygon", 1,
 35584         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34597  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35585  34598   				fnct_MakePolygon, 0, 0, 0);
 35586  34599       sqlite3_create_function_v2 (db, "ST_MakePolygon", 1,
 35587         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34600  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35588  34601   				fnct_MakePolygon, 0, 0, 0);
 35589  34602       sqlite3_create_function_v2 (db, "MakePolygon", 2,
 35590         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34603  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35591  34604   				fnct_MakePolygon, 0, 0, 0);
 35592  34605       sqlite3_create_function_v2 (db, "ST_MakePolygon", 2,
 35593         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34606  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35594  34607   				fnct_MakePolygon, 0, 0, 0);
 35595  34608   
 35596  34609       sqlite3_create_function_v2 (db, "ATM_Create", 0,
 35597  34610   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35598  34611   				fnct_AffineTransformMatrix_Create, 0, 0, 0);
 35599  34612       sqlite3_create_function_v2 (db, "ATM_Create", 6,
 35600  34613   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
................................................................................
 35657  34670   				fnct_AffineTransformMatrix_XRoll, 0, 0, 0);
 35658  34671       sqlite3_create_function_v2 (db, "ATM_YRoll", 2,
 35659  34672   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35660  34673   				fnct_AffineTransformMatrix_YRoll, 0, 0, 0);
 35661  34674       sqlite3_create_function_v2 (db, "ATM_ZRoll", 2,
 35662  34675   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35663  34676   				fnct_AffineTransformMatrix_Rotate, 0, 0, 0);
 35664         -    sqlite3_create_function_v2 (db, "ATM_Determinant", 1,
 35665         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35666         -				fnct_AffineTransformMatrix_Determinant, 0, 0,
 35667         -				0);
 35668         -    sqlite3_create_function_v2 (db, "ATM_IsInvertible", 1,
 35669         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35670         -				fnct_AffineTransformMatrix_IsInvertible, 0, 0,
 35671         -				0);
 35672         -    sqlite3_create_function_v2 (db, "ATM_Invert", 1,
 35673         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35674         -				fnct_AffineTransformMatrix_Invert, 0, 0, 0);
 35675  34677       sqlite3_create_function_v2 (db, "ATM_IsValid", 1,
 35676  34678   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35677  34679   				fnct_AffineTransformMatrix_IsValid, 0, 0, 0);
 35678  34680       sqlite3_create_function_v2 (db, "ATM_AsText", 1,
 35679  34681   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35680  34682   				fnct_AffineTransformMatrix_AsText, 0, 0, 0);
 35681  34683       sqlite3_create_function_v2 (db, "ATM_Transform", 2,
 35682         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35683         -				fnct_AffineTransformMatrix_GeometryTransform, 0,
 35684         -				0, 0);
 35685         -    sqlite3_create_function_v2 (db, "ATM_Transform", 3,
 35686         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34684  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35687  34685   				fnct_AffineTransformMatrix_GeometryTransform, 0,
 35688  34686   				0, 0);
 35689  34687   
 35690         -#ifdef ENABLE_GCP		/* only if ControlPoints enabled */
 35691         -    sqlite3_create_function_v2 (db, "GCP_Compute", 2,
 35692         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache, 0,
 35693         -				fnct_GroundControlPoints_Compute_step,
 35694         -				fnct_GroundControlPoints_Compute_final, 0);
 35695         -    sqlite3_create_function_v2 (db, "GCP_Compute", 3,
 35696         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache, 0,
 35697         -				fnct_GroundControlPoints_Compute_step,
 35698         -				fnct_GroundControlPoints_Compute_final, 0);
 35699         -    sqlite3_create_function_v2 (db, "GCP_Transform", 2,
 35700         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35701         -				fnct_GroundControlPoints_GeometryTransform, 0,
 35702         -				0, 0);
 35703         -    sqlite3_create_function_v2 (db, "GCP_Transform", 3,
 35704         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35705         -				fnct_GroundControlPoints_GeometryTransform, 0,
 35706         -				0, 0);
 35707         -    sqlite3_create_function_v2 (db, "GCP_IsValid", 1,
 35708         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35709         -				fnct_GroundControlPoints_IsValid, 0, 0, 0);
 35710         -    sqlite3_create_function_v2 (db, "GCP_AsText", 1,
 35711         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35712         -				fnct_GroundControlPoints_AsText, 0, 0, 0);
 35713         -    sqlite3_create_function_v2 (db, "GCP2ATM", 1,
 35714         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35715         -				fnct_GroundControlPoints_ToATM, 0, 0, 0);
 35716         -#endif /* end including GCP */
        34688  +#ifdef ENABLE_CONTROL_POINTS	/* only if ControlPoints enabled */
        34689  +    sqlite3_create_function_v2 (db, "ATM_ControlPoints", 2,
        34690  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, 0,
        34691  +				fnct_AffineTransformMatrix_ControlPoints_step,
        34692  +				fnct_AffineTransformMatrix_ControlPoints_final,
        34693  +				0);
        34694  +    sqlite3_create_function_v2 (db, "ATM_ControlPoints", 3,
        34695  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, 0,
        34696  +				fnct_AffineTransformMatrix_ControlPoints_step,
        34697  +				fnct_AffineTransformMatrix_ControlPoints_final,
        34698  +				0);
        34699  +#endif /* end including CONTROL_POINTS */
 35717  34700   
 35718  34701   #ifndef OMIT_GEOS		/* including GEOS */
 35719  34702       sqlite3_create_function_v2 (db, "BuildArea", 1,
 35720  34703   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35721  34704   				fnct_BuildArea, 0, 0, 0);
 35722  34705       sqlite3_create_function_v2 (db, "ST_BuildArea", 1,
 35723  34706   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
................................................................................
 35727  34710   				fnct_Polygonize_step, fnct_Polygonize_final, 0);
 35728  34711       sqlite3_create_function_v2 (db, "ST_Polygonize", 1,
 35729  34712   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache, 0,
 35730  34713   				fnct_Polygonize_step, fnct_Polygonize_final, 0);
 35731  34714   #endif /* end including GEOS */
 35732  34715   
 35733  34716       sqlite3_create_function_v2 (db, "DissolveSegments", 1,
 35734         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34717  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35735  34718   				fnct_DissolveSegments, 0, 0, 0);
 35736  34719       sqlite3_create_function_v2 (db, "ST_DissolveSegments", 1,
 35737         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34720  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35738  34721   				fnct_DissolveSegments, 0, 0, 0);
 35739  34722       sqlite3_create_function_v2 (db, "DissolvePoints", 1,
 35740         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34723  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35741  34724   				fnct_DissolvePoints, 0, 0, 0);
 35742  34725       sqlite3_create_function_v2 (db, "ST_DissolvePoints", 1,
 35743         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34726  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35744  34727   				fnct_DissolvePoints, 0, 0, 0);
 35745  34728       sqlite3_create_function_v2 (db, "CollectionExtract", 2,
 35746         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34729  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35747  34730   				fnct_CollectionExtract, 0, 0, 0);
 35748  34731       sqlite3_create_function_v2 (db, "ST_CollectionExtract", 2,
 35749         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34732  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35750  34733   				fnct_CollectionExtract, 0, 0, 0);
 35751  34734       sqlite3_create_function_v2 (db, "ST_Locate_Along_Measure", 2,
 35752         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34735  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35753  34736   				fnct_LocateBetweenMeasures, 0, 0, 0);
 35754  34737       sqlite3_create_function_v2 (db, "ST_LocateAlong", 2,
 35755         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34738  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35756  34739   				fnct_LocateBetweenMeasures, 0, 0, 0);
 35757  34740       sqlite3_create_function_v2 (db, "ST_Locate_Between_Measures", 3,
 35758         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34741  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35759  34742   				fnct_LocateBetweenMeasures, 0, 0, 0);
 35760  34743       sqlite3_create_function_v2 (db, "ST_LocateBetween", 3,
 35761         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34744  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35762  34745   				fnct_LocateBetweenMeasures, 0, 0, 0);
 35763  34746   #ifndef OMIT_GEOCALLBACKS	/* supporting RTree geometry callbacks */
 35764  34747       sqlite3_rtree_geometry_callback (db, "RTreeWithin", fnct_RTreeIntersects,
 35765  34748   				     0);
 35766  34749       sqlite3_rtree_geometry_callback (db, "RTreeContains",
 35767  34750   				     fnct_RTreeIntersects, 0);
 35768  34751       sqlite3_rtree_geometry_callback (db, "RTreeIntersects",
................................................................................
 35872  34855   	  sqlite3_create_function_v2 (db, "ImportDXFfromDir", 1,
 35873  34856   				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35874  34857   				      fnct_ImportDXFfromDir, 0, 0, 0);
 35875  34858   	  sqlite3_create_function_v2 (db, "ImportDXFfromDir", 8,
 35876  34859   				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 35877  34860   				      fnct_ImportDXFfromDir, 0, 0, 0);
 35878  34861   	  sqlite3_create_function_v2 (db, "ExportDXF", 9,
 35879         -				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34862  +				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35880  34863   				      fnct_ExportDXF, 0, 0, 0);
 35881  34864   	  sqlite3_create_function_v2 (db, "ExportDXF", 10,
 35882         -				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34865  +				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35883  34866   				      fnct_ExportDXF, 0, 0, 0);
 35884  34867   	  sqlite3_create_function_v2 (db, "ImportDBF", 3,
 35885  34868   				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35886  34869   				      fnct_ImportDBF, 0, 0, 0);
 35887  34870   	  sqlite3_create_function_v2 (db, "ImportDBF", 4,
 35888  34871   				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35889  34872   				      fnct_ImportDBF, 0, 0, 0);
................................................................................
 35992  34975   	  sqlite3_create_function_v2 (db, "ImportXLS", 4,
 35993  34976   				      SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 35994  34977   				      fnct_ImportXLS, 0, 0, 0);
 35995  34978   #endif /* end FREEXL support */
 35996  34979   
 35997  34980         }
 35998  34981   
 35999         -
 36000         -/* global settings */
 36001         -    sqlite3_create_function_v2 (db, "EnableGpkgAmphibiousMode", 0,
 36002         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36003         -				fnct_enableGpkgAmphibiousMode, 0, 0, 0);
 36004         -    sqlite3_create_function_v2 (db, "DisableGpkgAmphibiousMode", 0,
 36005         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36006         -				fnct_disableGpkgAmphibiousMode, 0, 0, 0);
 36007         -    sqlite3_create_function_v2 (db, "GetGpkgAmphibiousMode", 0,
 36008         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36009         -				fnct_getGpkgAmphibiousMode, 0, 0, 0);
 36010         -    sqlite3_create_function_v2 (db, "SetDecimalPrecision", 1,
 36011         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36012         -				fnct_setDecimalPrecision, 0, 0, 0);
 36013         -    sqlite3_create_function_v2 (db, "GetDecimalPrecision", 0,
 36014         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36015         -				fnct_getDecimalPrecision, 0, 0, 0);
 36016         -
 36017  34982   /* some Geodesic functions */
 36018  34983       sqlite3_create_function_v2 (db, "GreatCircleLength", 1,
 36019         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34984  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36020  34985   				fnct_GreatCircleLength, 0, 0, 0);
 36021  34986       sqlite3_create_function_v2 (db, "GeodesicLength", 1,
 36022         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        34987  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36023  34988   				fnct_GeodesicLength, 0, 0, 0);
 36024  34989   
 36025  34990   /* some Length Unit conversion functions */
 36026  34991       sqlite3_create_function_v2 (db, "CvtToKm", 1,
 36027  34992   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36028  34993   				fnct_cvtToKm, 0, 0, 0);
 36029  34994       sqlite3_create_function_v2 (db, "CvtToDm", 1,
................................................................................
 36163  35128   				fnct_math_acos, 0, 0, 0);
 36164  35129       sqlite3_create_function_v2 (db, "asin", 1,
 36165  35130   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36166  35131   				fnct_math_asin, 0, 0, 0);
 36167  35132       sqlite3_create_function_v2 (db, "atan", 1,
 36168  35133   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36169  35134   				fnct_math_atan, 0, 0, 0);
 36170         -    sqlite3_create_function_v2 (db, "atan2", 2,
 36171         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36172         -				fnct_math_atan2, 0, 0, 0);
 36173  35135       sqlite3_create_function_v2 (db, "ceil", 1,
 36174  35136   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36175  35137   				fnct_math_ceil, 0, 0, 0);
 36176  35138       sqlite3_create_function_v2 (db, "ceiling", 1,
 36177  35139   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36178  35140   				fnct_math_ceil, 0, 0, 0);
 36179  35141       sqlite3_create_function_v2 (db, "cos", 1,
................................................................................
 36284  35246       sqlite3_create_function_v2 (db, "Boundary", 1,
 36285  35247   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36286  35248   				fnct_Boundary, 0, 0, 0);
 36287  35249       sqlite3_create_function_v2 (db, "ST_Boundary", 1,
 36288  35250   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36289  35251   				fnct_Boundary, 0, 0, 0);
 36290  35252       sqlite3_create_function_v2 (db, "IsClosed", 1,
 36291         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35253  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36292  35254   				fnct_IsClosed, 0, 0, 0);
 36293  35255       sqlite3_create_function_v2 (db, "ST_IsClosed", 1,
 36294         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35256  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36295  35257   				fnct_IsClosed, 0, 0, 0);
 36296  35258       sqlite3_create_function_v2 (db, "IsSimple", 1,
 36297  35259   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36298  35260   				fnct_IsSimple, 0, 0, 0);
 36299  35261       sqlite3_create_function_v2 (db, "ST_IsSimple", 1,
 36300  35262   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36301  35263   				fnct_IsSimple, 0, 0, 0);
................................................................................
 36683  35645       sqlite3_create_function_v2 (db, "ST_HexagonalGrid", 3,
 36684  35646   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36685  35647   				fnct_HexagonalGrid, 0, 0, 0);
 36686  35648       sqlite3_create_function_v2 (db, "ST_HexagonalGrid", 4,
 36687  35649   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36688  35650   				fnct_HexagonalGrid, 0, 0, 0);
 36689  35651       sqlite3_create_function_v2 (db, "LinesCutAtNodes", 2,
 36690         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35652  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36691  35653   				fnct_LinesCutAtNodes, 0, 0, 0);
 36692  35654       sqlite3_create_function_v2 (db, "ST_LinesCutAtNodes", 2,
 36693         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35655  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36694  35656   				fnct_LinesCutAtNodes, 0, 0, 0);
 36695  35657       sqlite3_create_function_v2 (db, "RingsCutAtNodes", 1,
 36696         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35658  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36697  35659   				fnct_RingsCutAtNodes, 0, 0, 0);
 36698  35660       sqlite3_create_function_v2 (db, "ST_RingsCutAtNodes", 1,
 36699         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35661  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36700  35662   				fnct_RingsCutAtNodes, 0, 0, 0);
 36701  35663   
 36702  35664   #ifdef GEOS_ADVANCED		/* GEOS advanced features - 3.4.0 */
 36703  35665   
 36704  35666       sqlite3_create_function_v2 (db, "DelaunayTriangulation", 1,
 36705  35667   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
 36706  35668   				fnct_DelaunayTriangulation, 0, 0, 0);
................................................................................
 36774  35736   
 36775  35737       sqlite3_create_function_v2 (db, "LWGEOM_GetLastErrorMsg", 0, SQLITE_UTF8,
 36776  35738   				0, fnct_LWGEOM_GetLastErrorMsg, 0, 0, 0);
 36777  35739       sqlite3_create_function_v2 (db, "LWGEOM_GetLastWarningMsg", 0, SQLITE_UTF8,
 36778  35740   				0, fnct_LWGEOM_GetLastWarningMsg, 0, 0, 0);
 36779  35741   
 36780  35742       sqlite3_create_function_v2 (db, "MakeValid", 1,
 36781         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35743  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36782  35744   				fnct_MakeValid, 0, 0, 0);
 36783  35745       sqlite3_create_function_v2 (db, "ST_MakeValid", 1,
 36784         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35746  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36785  35747   				fnct_MakeValid, 0, 0, 0);
 36786  35748       sqlite3_create_function_v2 (db, "MakeValidDiscarded", 1,
 36787  35749   				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36788  35750   				fnct_MakeValidDiscarded, 0, 0, 0);
 36789  35751       sqlite3_create_function_v2 (db, "ST_MakeValidDiscarded", 1,
 36790         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35752  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36791  35753   				fnct_MakeValidDiscarded, 0, 0, 0);
 36792  35754       sqlite3_create_function_v2 (db, "Area", 2,
 36793         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35755  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36794  35756   				fnct_Area, 0, 0, 0);
 36795  35757       sqlite3_create_function_v2 (db, "ST_Area", 2,
 36796         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35758  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36797  35759   				fnct_Area, 0, 0, 0);
 36798  35760       sqlite3_create_function_v2 (db, "Segmentize", 2,
 36799         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35761  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36800  35762   				fnct_Segmentize, 0, 0, 0);
 36801  35763       sqlite3_create_function_v2 (db, "ST_Segmentize", 2,
 36802         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35764  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36803  35765   				fnct_Segmentize, 0, 0, 0);
 36804  35766       sqlite3_create_function_v2 (db, "Azimuth", 2,
 36805         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35767  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36806  35768   				fnct_Azimuth, 0, 0, 0);
 36807  35769       sqlite3_create_function_v2 (db, "ST_Azimuth", 2,
 36808         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35770  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36809  35771   				fnct_Azimuth, 0, 0, 0);
 36810  35772       sqlite3_create_function_v2 (db, "Project", 3,
 36811         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35773  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36812  35774   				fnct_Project, 0, 0, 0);
 36813  35775       sqlite3_create_function_v2 (db, "ST_Project", 3,
 36814         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35776  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36815  35777   				fnct_Project, 0, 0, 0);
 36816  35778       sqlite3_create_function_v2 (db, "GeoHash", 1,
 36817         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35779  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36818  35780   				fnct_GeoHash, 0, 0, 0);
 36819  35781       sqlite3_create_function_v2 (db, "GeoHash", 2,
 36820         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35782  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36821  35783   				fnct_GeoHash, 0, 0, 0);
 36822  35784       sqlite3_create_function_v2 (db, "ST_GeoHash", 1,
 36823         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35785  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36824  35786   				fnct_GeoHash, 0, 0, 0);
 36825  35787       sqlite3_create_function_v2 (db, "ST_GeoHash", 2,
 36826         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35788  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36827  35789   				fnct_GeoHash, 0, 0, 0);
 36828  35790       sqlite3_create_function_v2 (db, "AsX3D", 1,
 36829         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35791  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36830  35792   				fnct_AsX3D, 0, 0, 0);
 36831  35793       sqlite3_create_function_v2 (db, "AsX3D", 2,
 36832         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35794  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36833  35795   				fnct_AsX3D, 0, 0, 0);
 36834  35796       sqlite3_create_function_v2 (db, "AsX3D", 3,
 36835         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35797  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36836  35798   				fnct_AsX3D, 0, 0, 0);
 36837  35799       sqlite3_create_function_v2 (db, "AsX3D", 4,
 36838         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35800  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36839  35801   				fnct_AsX3D, 0, 0, 0);
 36840  35802       sqlite3_create_function_v2 (db, "ST_AsX3D", 1,
 36841         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35803  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36842  35804   				fnct_AsX3D, 0, 0, 0);
 36843  35805       sqlite3_create_function_v2 (db, "ST_AsX3D", 2,
 36844         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35806  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36845  35807   				fnct_AsX3D, 0, 0, 0);
 36846  35808       sqlite3_create_function_v2 (db, "ST_AsX3D", 3,
 36847         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35809  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36848  35810   				fnct_AsX3D, 0, 0, 0);
 36849  35811       sqlite3_create_function_v2 (db, "ST_AsX3D", 4,
 36850         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35812  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36851  35813   				fnct_AsX3D, 0, 0, 0);
 36852  35814       sqlite3_create_function_v2 (db, "ST_3DDistance", 2,
 36853         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35815  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36854  35816   				fnct_3DDistance, 0, 0, 0);
 36855  35817       sqlite3_create_function_v2 (db, "MaxDistance", 2,
 36856         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35818  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36857  35819   				fnct_MaxDistance, 0, 0, 0);
 36858  35820       sqlite3_create_function_v2 (db, "ST_MaxDistance", 2,
 36859         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35821  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36860  35822   				fnct_MaxDistance, 0, 0, 0);
 36861  35823       sqlite3_create_function_v2 (db, "ST_3DMaxDistance", 2,
 36862         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35824  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36863  35825   				fnct_3DMaxDistance, 0, 0, 0);
 36864  35826       sqlite3_create_function_v2 (db, "Split", 2,
 36865         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35827  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36866  35828   				fnct_Split, 0, 0, 0);
 36867  35829       sqlite3_create_function_v2 (db, "ST_Split", 2,
 36868         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35830  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36869  35831   				fnct_Split, 0, 0, 0);
 36870  35832       sqlite3_create_function_v2 (db, "SplitLeft", 2,
 36871         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35833  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36872  35834   				fnct_SplitLeft, 0, 0, 0);
 36873  35835       sqlite3_create_function_v2 (db, "ST_SplitLeft", 2,
 36874         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35836  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36875  35837   				fnct_SplitLeft, 0, 0, 0);
 36876  35838       sqlite3_create_function_v2 (db, "SplitRight", 2,
 36877         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35839  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36878  35840   				fnct_SplitRight, 0, 0, 0);
 36879  35841       sqlite3_create_function_v2 (db, "ST_SplitRight", 2,
 36880         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35842  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36881  35843   				fnct_SplitRight, 0, 0, 0);
 36882  35844       sqlite3_create_function_v2 (db, "ST_Node", 1,
 36883         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35845  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36884  35846   				fnct_Node, 0, 0, 0);
 36885  35847       sqlite3_create_function_v2 (db, "SelfIntersections", 1,
 36886         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35848  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36887  35849   				fnct_SelfIntersections, 0, 0, 0);
 36888  35850       sqlite3_create_function_v2 (db, "ST_SelfIntersections", 1,
 36889         -				SQLITE_UTF8 | SQLITE_DETERMINISTIC, cache,
        35851  +				SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
 36890  35852   				fnct_SelfIntersections, 0, 0, 0);
 36891  35853   
 36892  35854   #endif /* end LWGEOM support */
 36893  35855   
 36894  35856   #endif /* end including GEOS */
 36895  35857   
 36896  35858   #ifdef ENABLE_LIBXML2		/* including LIBXML2 */

Changes to src/spatialite/srid_aux.c.

    52     52   (implementing XML support - ISO Metadata and SLD/SE Styles) 
    53     53   
    54     54   */
    55     55   
    56     56   #include <stdlib.h>
    57     57   #include <stdio.h>
    58     58   #include <string.h>
    59         -#include <errno.h>
    60     59   
    61     60   #if defined(_WIN32) && !defined(__MINGW32__)
    62     61   #include "config-msvc.h"
    63     62   #else
    64     63   #include "config.h"
    65     64   #endif
    66     65   
    67     66   #include <spatialite/sqlite.h>
    68     67   #include <spatialite/debug.h>
    69     68   #include <spatialite.h>
    70         -#include <spatialite_private.h>
    71     69   
    72     70   #ifdef _WIN32
    73     71   #define strcasecmp	_stricmp
    74     72   #endif /* not WIN32 */
    75     73   
    76     74   static int
    77     75   parse_proj4 (const char *proj4, const char *key, char **value)
................................................................................
  1730   1728   	  sqlite3_finalize (stmt);
  1731   1729   	  stmt = NULL;
  1732   1730   	  if (result != NULL)
  1733   1731   	      return result;
  1734   1732         }
  1735   1733       return NULL;
  1736   1734   }
  1737         -
  1738         -static void
  1739         -getProjParamsFromSpatialReferenceSystemTable (sqlite3 * sqlite, int srid,
  1740         -					      char **proj_params)
  1741         -{
  1742         -/* retrives the PROJ params from SPATIAL_SYS_REF table, if possible */
  1743         -    char *sql;
  1744         -    char **results;
  1745         -    int rows;
  1746         -    int columns;
  1747         -    int i;
  1748         -    int ret;
  1749         -    int len;
  1750         -    const char *proj4text;
  1751         -    char *errMsg = NULL;
  1752         -    *proj_params = NULL;
  1753         -    sql =
  1754         -	sqlite3_mprintf
  1755         -	("SELECT proj4text FROM spatial_ref_sys WHERE srid = %d", srid);
  1756         -    ret = sqlite3_get_table (sqlite, sql, &results, &rows, &columns, &errMsg);
  1757         -    sqlite3_free (sql);
  1758         -    if (ret != SQLITE_OK)
  1759         -      {
  1760         -	  spatialite_e ("unknown SRID: %d\t<%s>\n", srid, errMsg);
  1761         -	  sqlite3_free (errMsg);
  1762         -	  return;
  1763         -      }
  1764         -    for (i = 1; i <= rows; i++)
  1765         -      {
  1766         -	  proj4text = results[(i * columns)];
  1767         -	  if (proj4text != NULL)
  1768         -	    {
  1769         -		len = strlen (proj4text);
  1770         -		*proj_params = malloc (len + 1);
  1771         -		strcpy (*proj_params, proj4text);
  1772         -	    }
  1773         -      }
  1774         -    if (*proj_params == NULL)
  1775         -      {
  1776         -	  spatialite_e ("unknown SRID: %d\n", srid);
  1777         -      }
  1778         -    sqlite3_free_table (results);
  1779         -}
  1780         -
  1781         -static int
  1782         -coordinates_system_matches (struct epsg_defs *iter, const char *organization,
  1783         -			    const int organization_coordsys_id)
  1784         -{
  1785         -    if (organization == NULL)
  1786         -      {
  1787         -	  /* we didn't have a good lookup on the target database, so use best-efforts lookup */
  1788         -	  return ((iter->srid == organization_coordsys_id)
  1789         -		  && (iter->proj4text != NULL));
  1790         -      }
  1791         -    else
  1792         -      {
  1793         -	  return ((strcasecmp (iter->auth_name, organization) == 0)
  1794         -		  && (iter->auth_srid == organization_coordsys_id)
  1795         -		  && (iter->proj4text != NULL));
  1796         -      }
  1797         -}
  1798         -
  1799         -static void
  1800         -getProjParamsFromGeopackageTable (sqlite3 * sqlite, int srid,
  1801         -				  char **proj_params)
  1802         -{
  1803         -    char *sql;
  1804         -    char **results;
  1805         -    int rows;
  1806         -    int columns;
  1807         -    int ret;
  1808         -    int len;
  1809         -    char *errMsg = NULL;
  1810         -    struct epsg_defs *first = NULL;
  1811         -    struct epsg_defs *last = NULL;
  1812         -    struct epsg_defs *iter = NULL;
  1813         -    const char *organization = NULL;
  1814         -    int organization_coordsys_id = -1;
  1815         -
  1816         -    *proj_params = NULL;
  1817         -
  1818         -    sql =
  1819         -	sqlite3_mprintf
  1820         -	("SELECT organization, organization_coordsys_id FROM gpkg_spatial_ref_sys WHERE srs_id = %d",
  1821         -	 srid);
  1822         -    ret = sqlite3_get_table (sqlite, sql, &results, &rows, &columns, &errMsg);
  1823         -    sqlite3_free (sql);
  1824         -    if (ret != SQLITE_OK)
  1825         -      {
  1826         -	  spatialite_e ("unknown SRID: %d\t<%s>\n", srid, errMsg);
  1827         -	  sqlite3_free (errMsg);
  1828         -	  return;
  1829         -      }
  1830         -    if (rows == 0)
  1831         -      {
  1832         -	  printf
  1833         -	      ("unknown SRID: %d\t(not in local database, ignoring authority and using best efforts...)\n",
  1834         -	       srid);
  1835         -	  organization_coordsys_id = srid;
  1836         -      }
  1837         -    else if (rows == 1)
  1838         -      {
  1839         -	  /* there are 'columns' entries in the header row (result indexes 0 to columns - 1), and our data is the next row */
  1840         -	  organization = results[columns];
  1841         -	  errno = 0;
  1842         -	  organization_coordsys_id = strtol (results[columns + 1], NULL, 10);
  1843         -	  if ((errno != 0) || (organization_coordsys_id == 0))
  1844         -	    {
  1845         -		spatialite_e ("Invalid organization_coordsys_id format: %s\n",
  1846         -			      results[columns + 1]);
  1847         -		sqlite3_free_table (results);
  1848         -		return;
  1849         -	    }
  1850         -      }
  1851         -    else if (rows > 1)
  1852         -      {
  1853         -	  spatialite_e
  1854         -	      ("invalid or corrupt gpkg_spatial_ref_sys table - duplicate entries for : %d\n",
  1855         -	       srid);
  1856         -	  sqlite3_free_table (results);
  1857         -	  return;
  1858         -      }
  1859         -
  1860         -    if (organization == NULL)
  1861         -      {
  1862         -	  /* best-effort mode */
  1863         -	  initialize_epsg (srid, &first, &last);
  1864         -      }
  1865         -    else
  1866         -      {
  1867         -	  initialize_epsg (GAIA_EPSG_ANY, &first, &last);
  1868         -      }
  1869         -    iter = first;
  1870         -    while (iter)
  1871         -      {
  1872         -	  if (coordinates_system_matches
  1873         -	      (iter, organization, organization_coordsys_id))
  1874         -	    {
  1875         -		len = strlen (iter->proj4text);
  1876         -		*proj_params = malloc (len + 1);
  1877         -		strcpy (*proj_params, iter->proj4text);
  1878         -		free_epsg (first);
  1879         -		sqlite3_free_table (results);
  1880         -		return;
  1881         -	    }
  1882         -	  iter = iter->next;
  1883         -      }
  1884         -    /* if we get here, we didn't find a match */
  1885         -    free_epsg (first);
  1886         -    sqlite3_free_table (results);
  1887         -    spatialite_e ("unknown SRID: %d\n", srid);
  1888         -}
  1889         -
  1890         -static int
  1891         -exists_gpkg_spatial_ref_sys (void *p_sqlite)
  1892         -{
  1893         -/* checking if the GPKG_SPATIAL_REF_SYS table exists */
  1894         -    int ret;
  1895         -    int ok = 0;
  1896         -    char sql[1024];
  1897         -    char **results;
  1898         -    int n_rows;
  1899         -    int n_columns;
  1900         -    char *err_msg = NULL;
  1901         -
  1902         -    sqlite3 *handle = (sqlite3 *) p_sqlite;
  1903         -
  1904         -    strcpy (sql,
  1905         -	    "SELECT name FROM sqlite_master WHERE type = 'table' AND name LIKE 'gpkg_spatial_ref_sys'");
  1906         -    ret =
  1907         -	sqlite3_get_table (handle, sql, &results, &n_rows, &n_columns,
  1908         -			   &err_msg);
  1909         -    if (ret != SQLITE_OK)
  1910         -      {
  1911         -/* some error occurred */
  1912         -	  spatialite_e ("XX %s\n", err_msg);
  1913         -	  sqlite3_free (err_msg);
  1914         -	  return 0;
  1915         -      }
  1916         -    if (n_rows > 0)
  1917         -	ok = 1;
  1918         -    sqlite3_free_table (results);
  1919         -    return ok;
  1920         -}
  1921         -
  1922         -SPATIALITE_PRIVATE void
  1923         -getProjParamsEx (void *p_sqlite, int srid, char **proj_params,
  1924         -		 int gpkg_amphibious_mode)
  1925         -{
  1926         -/* retrives the PROJ params - generic interface */
  1927         -    sqlite3 *sqlite = (sqlite3 *) p_sqlite;
  1928         -    *proj_params = NULL;
  1929         -    if (exists_spatial_ref_sys (sqlite))
  1930         -      {
  1931         -	  /* normal Spatialite case */
  1932         -	  getProjParamsFromSpatialReferenceSystemTable (sqlite, srid,
  1933         -							proj_params);
  1934         -      }
  1935         -    else if (exists_gpkg_spatial_ref_sys (sqlite) && gpkg_amphibious_mode)
  1936         -      {
  1937         -	  /* geopackage case */
  1938         -	  getProjParamsFromGeopackageTable (sqlite, srid, proj_params);
  1939         -      }
  1940         -}
  1941         -
  1942         -SPATIALITE_PRIVATE void
  1943         -getProjParams (void *p_sqlite, int srid, char **proj_params)
  1944         -{
  1945         -/* 
  1946         -* retrives the PROJ params from SPATIAL_SYS_REF table, if possible 
  1947         -* convenience method - disabling GPKG amphibious mode
  1948         -*/
  1949         -    getProjParamsEx (p_sqlite, srid, proj_params, 0);
  1950         -}

Changes to src/spatialite/statistics.c.

  2141   2141   	return 0;
  2142   2142   
  2143   2143   /* identifying any possible R*Tree supporting the main target */
  2144   2144       q_prefix = gaiaDoubleQuotedSql (prefix);
  2145   2145       sql =
  2146   2146   	sqlite3_mprintf
  2147   2147   	("SELECT name FROM \"%s\".sqlite_master WHERE type = 'table' AND "
  2148         -	 "Lower(name) IN (SELECT "
  2149         -	 "Lower('idx_' || f_table_name || '_' || f_geometry_column) "
         2148  +	 "name IN (SELECT 'idx_' || f_table_name || '_' || f_geometry_column "
  2150   2149   	 "FROM geometry_columns WHERE Lower(f_table_name) = Lower(%Q)) "
  2151   2150   	 "AND sql LIKE('%cvirtual%c') AND sql LIKE('%crtree%c')",
  2152   2151   	 q_prefix, table, jolly, jolly, jolly, jolly);
  2153   2152       free (q_prefix);
  2154   2153       ret = sqlite3_get_table (sqlite, sql, &results, &rows, &columns, NULL);
  2155   2154       sqlite3_free (sql);
  2156   2155       if (ret != SQLITE_OK)

Changes to src/srsinit/epsg_inlined_00.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   376    376       add_proj4text (p, 1,
   377    377           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   378    378       add_srs_wkt (p, 0,
   379    379           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 2 (deprecated)\",GEOG");
   380    380       add_srs_wkt (p, 1,
   381    381           "CS[\"NAD27(CGQ77)\",DATUM[\"North_American_Datum_1927_CG");
   382    382       add_srs_wkt (p, 2,
   383         -        "Q77\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821389");
          383  +        "Q77\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821390");
   384    384       add_srs_wkt (p, 3,
   385         -        "82,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"66");
          385  +        "06,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"66");
   386    386       add_srs_wkt (p, 4,
   387    387           "09\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   388    388       add_srs_wkt (p, 5,
   389    389           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   390    390       add_srs_wkt (p, 6,
   391    391           ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
   392    392       add_srs_wkt (p, 7,
................................................................................
   413    413       add_proj4text (p, 1,
   414    414           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   415    415       add_srs_wkt (p, 0,
   416    416           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 3\",GEOGCS[\"NAD27(CG");
   417    417       add_srs_wkt (p, 1,
   418    418           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   419    419       add_srs_wkt (p, 2,
   420         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          420  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   421    421       add_srs_wkt (p, 3,
   422    422           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   423    423       add_srs_wkt (p, 4,
   424    424           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   425    425       add_srs_wkt (p, 5,
   426    426           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   427    427       add_srs_wkt (p, 6,
................................................................................
   450    450       add_proj4text (p, 1,
   451    451           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   452    452       add_srs_wkt (p, 0,
   453    453           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 4\",GEOGCS[\"NAD27(CG");
   454    454       add_srs_wkt (p, 1,
   455    455           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   456    456       add_srs_wkt (p, 2,
   457         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          457  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   458    458       add_srs_wkt (p, 3,
   459    459           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   460    460       add_srs_wkt (p, 4,
   461    461           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   462    462       add_srs_wkt (p, 5,
   463    463           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   464    464       add_srs_wkt (p, 6,
................................................................................
   487    487       add_proj4text (p, 1,
   488    488           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   489    489       add_srs_wkt (p, 0,
   490    490           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 5\",GEOGCS[\"NAD27(CG");
   491    491       add_srs_wkt (p, 1,
   492    492           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   493    493       add_srs_wkt (p, 2,
   494         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          494  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   495    495       add_srs_wkt (p, 3,
   496    496           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   497    497       add_srs_wkt (p, 4,
   498    498           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   499    499       add_srs_wkt (p, 5,
   500    500           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   501    501       add_srs_wkt (p, 6,
................................................................................
   524    524       add_proj4text (p, 1,
   525    525           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   526    526       add_srs_wkt (p, 0,
   527    527           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 6\",GEOGCS[\"NAD27(CG");
   528    528       add_srs_wkt (p, 1,
   529    529           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   530    530       add_srs_wkt (p, 2,
   531         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          531  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   532    532       add_srs_wkt (p, 3,
   533    533           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   534    534       add_srs_wkt (p, 4,
   535    535           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   536    536       add_srs_wkt (p, 5,
   537    537           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   538    538       add_srs_wkt (p, 6,
................................................................................
   561    561       add_proj4text (p, 1,
   562    562           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   563    563       add_srs_wkt (p, 0,
   564    564           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 7\",GEOGCS[\"NAD27(CG");
   565    565       add_srs_wkt (p, 1,
   566    566           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   567    567       add_srs_wkt (p, 2,
   568         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          568  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   569    569       add_srs_wkt (p, 3,
   570    570           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   571    571       add_srs_wkt (p, 4,
   572    572           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   573    573       add_srs_wkt (p, 5,
   574    574           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   575    575       add_srs_wkt (p, 6,
................................................................................
   598    598       add_proj4text (p, 1,
   599    599           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   600    600       add_srs_wkt (p, 0,
   601    601           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 8\",GEOGCS[\"NAD27(CG");
   602    602       add_srs_wkt (p, 1,
   603    603           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   604    604       add_srs_wkt (p, 2,
   605         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          605  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   606    606       add_srs_wkt (p, 3,
   607    607           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   608    608       add_srs_wkt (p, 4,
   609    609           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   610    610       add_srs_wkt (p, 5,
   611    611           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   612    612       add_srs_wkt (p, 6,
................................................................................
   635    635       add_proj4text (p, 1,
   636    636           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   637    637       add_srs_wkt (p, 0,
   638    638           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 9\",GEOGCS[\"NAD27(CG");
   639    639       add_srs_wkt (p, 1,
   640    640           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
   641    641       add_srs_wkt (p, 2,
   642         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
          642  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
   643    643       add_srs_wkt (p, 3,
   644    644           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
   645    645       add_srs_wkt (p, 4,
   646    646           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   647    647       add_srs_wkt (p, 5,
   648    648           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   649    649       add_srs_wkt (p, 6,
................................................................................
   672    672       add_proj4text (p, 1,
   673    673           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   674    674       add_srs_wkt (p, 0,
   675    675           "PROJCS[\"NAD27(CGQ77) / SCoPQ zone 10\",GEOGCS[\"NAD27(C");
   676    676       add_srs_wkt (p, 1,
   677    677           "GQ77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHERO");
   678    678       add_srs_wkt (p, 2,
   679         -        "ID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY");
          679  +        "ID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY");
   680    680       add_srs_wkt (p, 3,
   681    681           "[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIME");
   682    682       add_srs_wkt (p, 4,
   683    683           "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   684    684       add_srs_wkt (p, 5,
   685    685           "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   686    686       add_srs_wkt (p, 6,
................................................................................
   709    709       add_proj4text (p, 1,
   710    710           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   711    711       add_srs_wkt (p, 0,
   712    712           "PROJCS[\"NAD27(76) / MTM zone 8\",GEOGCS[\"NAD27(76)\",D");
   713    713       add_srs_wkt (p, 1,
   714    714           "ATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clark");
   715    715       add_srs_wkt (p, 2,
   716         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
          716  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
   717    717       add_srs_wkt (p, 3,
   718    718           "\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Greenw");
   719    719       add_srs_wkt (p, 4,
   720    720           "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
   721    721       add_srs_wkt (p, 5,
   722    722           "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
   723    723       add_srs_wkt (p, 6,
................................................................................
   746    746       add_proj4text (p, 1,
   747    747           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   748    748       add_srs_wkt (p, 0,
   749    749           "PROJCS[\"NAD27(76) / MTM zone 9\",GEOGCS[\"NAD27(76)\",D");
   750    750       add_srs_wkt (p, 1,
   751    751           "ATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clark");
   752    752       add_srs_wkt (p, 2,
   753         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
          753  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
   754    754       add_srs_wkt (p, 3,
   755    755           "\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Greenw");
   756    756       add_srs_wkt (p, 4,
   757    757           "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
   758    758       add_srs_wkt (p, 5,
   759    759           "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
   760    760       add_srs_wkt (p, 6,
................................................................................
   783    783       add_proj4text (p, 1,
   784    784           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   785    785       add_srs_wkt (p, 0,
   786    786           "PROJCS[\"NAD27(76) / MTM zone 10\",GEOGCS[\"NAD27(76)\",");
   787    787       add_srs_wkt (p, 1,
   788    788           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   789    789       add_srs_wkt (p, 2,
   790         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          790  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   791    791       add_srs_wkt (p, 3,
   792    792           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   793    793       add_srs_wkt (p, 4,
   794    794           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   795    795       add_srs_wkt (p, 5,
   796    796           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   797    797       add_srs_wkt (p, 6,
................................................................................
   820    820       add_proj4text (p, 1,
   821    821           "+y_0=0 +ellps=clrk66 +units=m +no_defs");
   822    822       add_srs_wkt (p, 0,
   823    823           "PROJCS[\"NAD27(76) / MTM zone 11\",GEOGCS[\"NAD27(76)\",");
   824    824       add_srs_wkt (p, 1,
   825    825           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   826    826       add_srs_wkt (p, 2,
   827         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          827  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   828    828       add_srs_wkt (p, 3,
   829    829           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   830    830       add_srs_wkt (p, 4,
   831    831           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   832    832       add_srs_wkt (p, 5,
   833    833           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   834    834       add_srs_wkt (p, 6,
................................................................................
   857    857       add_proj4text (p, 1,
   858    858           "_0=0 +ellps=clrk66 +units=m +no_defs");
   859    859       add_srs_wkt (p, 0,
   860    860           "PROJCS[\"NAD27(76) / MTM zone 12\",GEOGCS[\"NAD27(76)\",");
   861    861       add_srs_wkt (p, 1,
   862    862           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   863    863       add_srs_wkt (p, 2,
   864         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          864  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   865    865       add_srs_wkt (p, 3,
   866    866           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   867    867       add_srs_wkt (p, 4,
   868    868           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   869    869       add_srs_wkt (p, 5,
   870    870           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   871    871       add_srs_wkt (p, 6,
................................................................................
   894    894       add_proj4text (p, 1,
   895    895           "_0=0 +ellps=clrk66 +units=m +no_defs");
   896    896       add_srs_wkt (p, 0,
   897    897           "PROJCS[\"NAD27(76) / MTM zone 13\",GEOGCS[\"NAD27(76)\",");
   898    898       add_srs_wkt (p, 1,
   899    899           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   900    900       add_srs_wkt (p, 2,
   901         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          901  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   902    902       add_srs_wkt (p, 3,
   903    903           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   904    904       add_srs_wkt (p, 4,
   905    905           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   906    906       add_srs_wkt (p, 5,
   907    907           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   908    908       add_srs_wkt (p, 6,
................................................................................
   931    931       add_proj4text (p, 1,
   932    932           "_0=0 +ellps=clrk66 +units=m +no_defs");
   933    933       add_srs_wkt (p, 0,
   934    934           "PROJCS[\"NAD27(76) / MTM zone 14\",GEOGCS[\"NAD27(76)\",");
   935    935       add_srs_wkt (p, 1,
   936    936           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   937    937       add_srs_wkt (p, 2,
   938         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          938  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   939    939       add_srs_wkt (p, 3,
   940    940           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   941    941       add_srs_wkt (p, 4,
   942    942           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   943    943       add_srs_wkt (p, 5,
   944    944           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   945    945       add_srs_wkt (p, 6,
................................................................................
   968    968       add_proj4text (p, 1,
   969    969           "_0=0 +ellps=clrk66 +units=m +no_defs");
   970    970       add_srs_wkt (p, 0,
   971    971           "PROJCS[\"NAD27(76) / MTM zone 15\",GEOGCS[\"NAD27(76)\",");
   972    972       add_srs_wkt (p, 1,
   973    973           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
   974    974       add_srs_wkt (p, 2,
   975         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          975  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   976    976       add_srs_wkt (p, 3,
   977    977           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
   978    978       add_srs_wkt (p, 4,
   979    979           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   980    980       add_srs_wkt (p, 5,
   981    981           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   982    982       add_srs_wkt (p, 6,
................................................................................
  1005   1005       add_proj4text (p, 1,
  1006   1006           "_0=0 +ellps=clrk66 +units=m +no_defs");
  1007   1007       add_srs_wkt (p, 0,
  1008   1008           "PROJCS[\"NAD27(76) / MTM zone 16\",GEOGCS[\"NAD27(76)\",");
  1009   1009       add_srs_wkt (p, 1,
  1010   1010           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
  1011   1011       add_srs_wkt (p, 2,
  1012         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1012  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1013   1013       add_srs_wkt (p, 3,
  1014   1014           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1015   1015       add_srs_wkt (p, 4,
  1016   1016           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1017   1017       add_srs_wkt (p, 5,
  1018   1018           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1019   1019       add_srs_wkt (p, 6,
................................................................................
  1042   1042       add_proj4text (p, 1,
  1043   1043           "_0=0 +ellps=clrk66 +units=m +no_defs");
  1044   1044       add_srs_wkt (p, 0,
  1045   1045           "PROJCS[\"NAD27(76) / MTM zone 17\",GEOGCS[\"NAD27(76)\",");
  1046   1046       add_srs_wkt (p, 1,
  1047   1047           "DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Clar");
  1048   1048       add_srs_wkt (p, 2,
  1049         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1049  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1050   1050       add_srs_wkt (p, 3,
  1051   1051           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1052   1052       add_srs_wkt (p, 4,
  1053   1053           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1054   1054       add_srs_wkt (p, 5,
  1055   1055           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1056   1056       add_srs_wkt (p, 6,
................................................................................
  1077   1077       add_proj4text (p, 0,
  1078   1078           "+proj=utm +zone=15 +ellps=clrk66 +units=m +no_defs");
  1079   1079       add_srs_wkt (p, 0,
  1080   1080           "PROJCS[\"NAD27(76) / UTM zone 15N\",GEOGCS[\"NAD27(76)\"");
  1081   1081       add_srs_wkt (p, 1,
  1082   1082           ",DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Cla");
  1083   1083       add_srs_wkt (p, 2,
  1084         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1084  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1085   1085       add_srs_wkt (p, 3,
  1086   1086           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1087   1087       add_srs_wkt (p, 4,
  1088   1088           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1089   1089       add_srs_wkt (p, 5,
  1090   1090           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1091   1091       add_srs_wkt (p, 6,
................................................................................
  1112   1112       add_proj4text (p, 0,
  1113   1113           "+proj=utm +zone=16 +ellps=clrk66 +units=m +no_defs");
  1114   1114       add_srs_wkt (p, 0,
  1115   1115           "PROJCS[\"NAD27(76) / UTM zone 16N\",GEOGCS[\"NAD27(76)\"");
  1116   1116       add_srs_wkt (p, 1,
  1117   1117           ",DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Cla");
  1118   1118       add_srs_wkt (p, 2,
  1119         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1119  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1120   1120       add_srs_wkt (p, 3,
  1121   1121           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1122   1122       add_srs_wkt (p, 4,
  1123   1123           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1124   1124       add_srs_wkt (p, 5,
  1125   1125           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1126   1126       add_srs_wkt (p, 6,
................................................................................
  1147   1147       add_proj4text (p, 0,
  1148   1148           "+proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs");
  1149   1149       add_srs_wkt (p, 0,
  1150   1150           "PROJCS[\"NAD27(76) / UTM zone 17N\",GEOGCS[\"NAD27(76)\"");
  1151   1151       add_srs_wkt (p, 1,
  1152   1152           ",DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Cla");
  1153   1153       add_srs_wkt (p, 2,
  1154         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1154  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1155   1155       add_srs_wkt (p, 3,
  1156   1156           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1157   1157       add_srs_wkt (p, 4,
  1158   1158           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1159   1159       add_srs_wkt (p, 5,
  1160   1160           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1161   1161       add_srs_wkt (p, 6,
................................................................................
  1182   1182       add_proj4text (p, 0,
  1183   1183           "+proj=utm +zone=18 +ellps=clrk66 +units=m +no_defs");
  1184   1184       add_srs_wkt (p, 0,
  1185   1185           "PROJCS[\"NAD27(76) / UTM zone 18N\",GEOGCS[\"NAD27(76)\"");
  1186   1186       add_srs_wkt (p, 1,
  1187   1187           ",DATUM[\"North_American_Datum_1927_1976\",SPHEROID[\"Cla");
  1188   1188       add_srs_wkt (p, 2,
  1189         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1189  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1190   1190       add_srs_wkt (p, 3,
  1191   1191           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6608\"]],PRIMEM[\"Green");
  1192   1192       add_srs_wkt (p, 4,
  1193   1193           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  1194   1194       add_srs_wkt (p, 5,
  1195   1195           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  1196   1196       add_srs_wkt (p, 6,
................................................................................
  1217   1217       add_proj4text (p, 0,
  1218   1218           "+proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs");
  1219   1219       add_srs_wkt (p, 0,
  1220   1220           "PROJCS[\"NAD27(CGQ77) / UTM zone 17N\",GEOGCS[\"NAD27(CG");
  1221   1221       add_srs_wkt (p, 1,
  1222   1222           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
  1223   1223       add_srs_wkt (p, 2,
  1224         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         1224  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  1225   1225       add_srs_wkt (p, 3,
  1226   1226           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
  1227   1227       add_srs_wkt (p, 4,
  1228   1228           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1229   1229       add_srs_wkt (p, 5,
  1230   1230           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1231   1231       add_srs_wkt (p, 6,
................................................................................
  1252   1252       add_proj4text (p, 0,
  1253   1253           "+proj=utm +zone=18 +ellps=clrk66 +units=m +no_defs");
  1254   1254       add_srs_wkt (p, 0,
  1255   1255           "PROJCS[\"NAD27(CGQ77) / UTM zone 18N\",GEOGCS[\"NAD27(CG");
  1256   1256       add_srs_wkt (p, 1,
  1257   1257           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
  1258   1258       add_srs_wkt (p, 2,
  1259         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         1259  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  1260   1260       add_srs_wkt (p, 3,
  1261   1261           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
  1262   1262       add_srs_wkt (p, 4,
  1263   1263           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1264   1264       add_srs_wkt (p, 5,
  1265   1265           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1266   1266       add_srs_wkt (p, 6,
................................................................................
  1287   1287       add_proj4text (p, 0,
  1288   1288           "+proj=utm +zone=19 +ellps=clrk66 +units=m +no_defs");
  1289   1289       add_srs_wkt (p, 0,
  1290   1290           "PROJCS[\"NAD27(CGQ77) / UTM zone 19N\",GEOGCS[\"NAD27(CG");
  1291   1291       add_srs_wkt (p, 1,
  1292   1292           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
  1293   1293       add_srs_wkt (p, 2,
  1294         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         1294  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  1295   1295       add_srs_wkt (p, 3,
  1296   1296           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
  1297   1297       add_srs_wkt (p, 4,
  1298   1298           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1299   1299       add_srs_wkt (p, 5,
  1300   1300           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1301   1301       add_srs_wkt (p, 6,
................................................................................
  1322   1322       add_proj4text (p, 0,
  1323   1323           "+proj=utm +zone=20 +ellps=clrk66 +units=m +no_defs");
  1324   1324       add_srs_wkt (p, 0,
  1325   1325           "PROJCS[\"NAD27(CGQ77) / UTM zone 20N\",GEOGCS[\"NAD27(CG");
  1326   1326       add_srs_wkt (p, 1,
  1327   1327           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
  1328   1328       add_srs_wkt (p, 2,
  1329         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         1329  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  1330   1330       add_srs_wkt (p, 3,
  1331   1331           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
  1332   1332       add_srs_wkt (p, 4,
  1333   1333           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1334   1334       add_srs_wkt (p, 5,
  1335   1335           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1336   1336       add_srs_wkt (p, 6,
................................................................................
  1357   1357       add_proj4text (p, 0,
  1358   1358           "+proj=utm +zone=21 +ellps=clrk66 +units=m +no_defs");
  1359   1359       add_srs_wkt (p, 0,
  1360   1360           "PROJCS[\"NAD27(CGQ77) / UTM zone 21N\",GEOGCS[\"NAD27(CG");
  1361   1361       add_srs_wkt (p, 1,
  1362   1362           "Q77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHEROI");
  1363   1363       add_srs_wkt (p, 2,
  1364         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         1364  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  1365   1365       add_srs_wkt (p, 3,
  1366   1366           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIMEM");
  1367   1367       add_srs_wkt (p, 4,
  1368   1368           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1369   1369       add_srs_wkt (p, 5,
  1370   1370           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1371   1371       add_srs_wkt (p, 6,
................................................................................
  2404   2404           "Madrid_1870_Madrid", "Lambert_Conformal_Conic_1SP", "metre",
  2405   2405           "X", "East", "Y", "North");
  2406   2406       add_proj4text (p, 0,
  2407   2407           "+proj=lcc +lat_1=40 +lat_0=40 +lon_0=0 +k_0=0.9988085293");
  2408   2408       add_proj4text (p, 1,
  2409   2409           " +x_0=600000 +y_0=600000 +a=6378298.3 +b=6356657.1426695");
  2410   2410       add_proj4text (p, 2,
  2411         -        "62 +pm=madrid +units=m +no_defs");
         2411  +        "61 +pm=madrid +units=m +no_defs");
  2412   2412       add_srs_wkt (p, 0,
  2413   2413           "PROJCS[\"Madrid 1870 (Madrid) / Spain\",GEOGCS[\"Madrid ");
  2414   2414       add_srs_wkt (p, 1,
  2415   2415           "1870 (Madrid)\",DATUM[\"Madrid_1870_Madrid\",SPHEROID[\"");
  2416   2416       add_srs_wkt (p, 2,
  2417   2417           "Struve 1860\",6378298.3,294.73,AUTHORITY[\"EPSG\",\"7028");
  2418   2418       add_srs_wkt (p, 3,
................................................................................
  2447   2447       add_proj4text (p, 1,
  2448   2448           "259,-9,0,0,0,0 +units=m +no_defs");
  2449   2449       add_srs_wkt (p, 0,
  2450   2450           "PROJCS[\"Dabola 1981 / UTM zone 28N (deprecated)\",GEOGC");
  2451   2451       add_srs_wkt (p, 1,
  2452   2452           "S[\"Conakry 1905\",DATUM[\"Conakry_1905\",SPHEROID[\"Cla");
  2453   2453       add_srs_wkt (p, 2,
  2454         -        "rke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"");
         2454  +        "rke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"");
  2455   2455       add_srs_wkt (p, 3,
  2456   2456           "EPSG\",\"7011\"]],TOWGS84[-23,259,-9,0,0,0,0],AUTHORITY[");
  2457   2457       add_srs_wkt (p, 4,
  2458   2458           "\"EPSG\",\"6315\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2459   2459       add_srs_wkt (p, 5,
  2460   2460           "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2461   2461       add_srs_wkt (p, 6,
................................................................................
  2484   2484       add_proj4text (p, 1,
  2485   2485           "259,-9,0,0,0,0 +units=m +no_defs");
  2486   2486       add_srs_wkt (p, 0,
  2487   2487           "PROJCS[\"Dabola 1981 / UTM zone 29N (deprecated)\",GEOGC");
  2488   2488       add_srs_wkt (p, 1,
  2489   2489           "S[\"Conakry 1905\",DATUM[\"Conakry_1905\",SPHEROID[\"Cla");
  2490   2490       add_srs_wkt (p, 2,
  2491         -        "rke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"");
         2491  +        "rke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"");
  2492   2492       add_srs_wkt (p, 3,
  2493   2493           "EPSG\",\"7011\"]],TOWGS84[-23,259,-9,0,0,0,0],AUTHORITY[");
  2494   2494       add_srs_wkt (p, 4,
  2495   2495           "\"EPSG\",\"6315\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2496   2496       add_srs_wkt (p, 5,
  2497   2497           "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2498   2498       add_srs_wkt (p, 6,
................................................................................
  2568   2568       add_proj4text (p, 3,
  2569   2569           " +no_defs");
  2570   2570       add_srs_wkt (p, 0,
  2571   2571           "PROJCS[\"Mount Dillon / Tobago Grid\",GEOGCS[\"Mount Dil");
  2572   2572       add_srs_wkt (p, 1,
  2573   2573           "lon\",DATUM[\"Mount_Dillon\",SPHEROID[\"Clarke 1858\",63");
  2574   2574       add_srs_wkt (p, 2,
  2575         -        "78293.645208759,294.2606763692606,AUTHORITY[\"EPSG\",\"7");
         2575  +        "78293.645208759,294.2606763692569,AUTHORITY[\"EPSG\",\"7");
  2576   2576       add_srs_wkt (p, 3,
  2577   2577           "007\"]],AUTHORITY[\"EPSG\",\"6157\"]],PRIMEM[\"Greenwich");
  2578   2578       add_srs_wkt (p, 4,
  2579   2579           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  2580   2580       add_srs_wkt (p, 5,
  2581   2581           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  2582   2582       add_srs_wkt (p, 6,
................................................................................
  2636   2636           "ELD79 / Libya zone 5", 0, 0,
  2637   2637           "International 1924", "Greenwich",
  2638   2638           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2639   2639           "X", "East", "Y", "North");
  2640   2640       add_proj4text (p, 0,
  2641   2641           "+proj=tmerc +lat_0=0 +lon_0=9 +k=0.9999 +x_0=200000 +y_0");
  2642   2642       add_proj4text (p, 1,
  2643         -        "=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,0");
         2643  +        "=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,0");
  2644   2644       add_proj4text (p, 2,
  2645         -        ",0,0 +units=m +no_defs");
         2645  +        ",0 +units=m +no_defs");
  2646   2646       add_srs_wkt (p, 0,
  2647   2647           "PROJCS[\"ELD79 / Libya zone 5\",GEOGCS[\"ELD79\",DATUM[\"");
  2648   2648       add_srs_wkt (p, 1,
  2649   2649           "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2650   2650       add_srs_wkt (p, 2,
  2651   2651           "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  2652   2652       add_srs_wkt (p, 3,
  2653         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  2654         -    add_srs_wkt (p, 4,
  2655         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2656         -    add_srs_wkt (p, 5,
  2657         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2658         -    add_srs_wkt (p, 6,
  2659         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2660         -    add_srs_wkt (p, 7,
  2661         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  2662         -    add_srs_wkt (p, 8,
  2663         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  2664         -    add_srs_wkt (p, 9,
  2665         -        ",PARAMETER[\"central_meridian\",9],PARAMETER[\"scale_fac");
  2666         -    add_srs_wkt (p, 10,
  2667         -        "tor\",0.9999],PARAMETER[\"false_easting\",200000],PARAME");
  2668         -    add_srs_wkt (p, 11,
  2669         -        "TER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"E");
  2670         -    add_srs_wkt (p, 12,
  2671         -        "PSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTH");
  2672         -    add_srs_wkt (p, 13,
  2673         -        "ORITY[\"EPSG\",\"2068\"]]");
         2653  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         2654  +    add_srs_wkt (p, 4,
         2655  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2656  +    add_srs_wkt (p, 5,
         2657  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2658  +    add_srs_wkt (p, 6,
         2659  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2660  +    add_srs_wkt (p, 7,
         2661  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         2662  +    add_srs_wkt (p, 8,
         2663  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         2664  +    add_srs_wkt (p, 9,
         2665  +        "ARAMETER[\"central_meridian\",9],PARAMETER[\"scale_facto");
         2666  +    add_srs_wkt (p, 10,
         2667  +        "r\",0.9999],PARAMETER[\"false_easting\",200000],PARAMETE");
         2668  +    add_srs_wkt (p, 11,
         2669  +        "R[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPS");
         2670  +    add_srs_wkt (p, 12,
         2671  +        "G\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHOR");
         2672  +    add_srs_wkt (p, 13,
         2673  +        "ITY[\"EPSG\",\"2068\"]]");
  2674   2674       p = add_epsg_def_ex (filter, first, last, 2069, "epsg", 2069,
  2675   2675           "ELD79 / Libya zone 6", 0, 0,
  2676   2676           "International 1924", "Greenwich",
  2677   2677           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2678   2678           "X", "East", "Y", "North");
  2679   2679       add_proj4text (p, 0,
  2680   2680           "+proj=tmerc +lat_0=0 +lon_0=11 +k=0.9999 +x_0=200000 +y_");
  2681   2681       add_proj4text (p, 1,
  2682         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
         2682  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
  2683   2683       add_proj4text (p, 2,
  2684         -        "0,0,0 +units=m +no_defs");
         2684  +        "0,0 +units=m +no_defs");
  2685   2685       add_srs_wkt (p, 0,
  2686   2686           "PROJCS[\"ELD79 / Libya zone 6\",GEOGCS[\"ELD79\",DATUM[\"");
  2687   2687       add_srs_wkt (p, 1,
  2688   2688           "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2689   2689       add_srs_wkt (p, 2,
  2690   2690           "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  2691   2691       add_srs_wkt (p, 3,
  2692         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  2693         -    add_srs_wkt (p, 4,
  2694         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2695         -    add_srs_wkt (p, 5,
  2696         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2697         -    add_srs_wkt (p, 6,
  2698         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2699         -    add_srs_wkt (p, 7,
  2700         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  2701         -    add_srs_wkt (p, 8,
  2702         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  2703         -    add_srs_wkt (p, 9,
  2704         -        ",PARAMETER[\"central_meridian\",11],PARAMETER[\"scale_fa");
  2705         -    add_srs_wkt (p, 10,
  2706         -        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  2707         -    add_srs_wkt (p, 11,
  2708         -        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2709         -    add_srs_wkt (p, 12,
  2710         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2711         -    add_srs_wkt (p, 13,
  2712         -        "HORITY[\"EPSG\",\"2069\"]]");
         2692  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         2693  +    add_srs_wkt (p, 4,
         2694  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2695  +    add_srs_wkt (p, 5,
         2696  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2697  +    add_srs_wkt (p, 6,
         2698  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2699  +    add_srs_wkt (p, 7,
         2700  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         2701  +    add_srs_wkt (p, 8,
         2702  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         2703  +    add_srs_wkt (p, 9,
         2704  +        "ARAMETER[\"central_meridian\",11],PARAMETER[\"scale_fact");
         2705  +    add_srs_wkt (p, 10,
         2706  +        "or\",0.9999],PARAMETER[\"false_easting\",200000],PARAMET");
         2707  +    add_srs_wkt (p, 11,
         2708  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         2709  +    add_srs_wkt (p, 12,
         2710  +        "SG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHO");
         2711  +    add_srs_wkt (p, 13,
         2712  +        "RITY[\"EPSG\",\"2069\"]]");
  2713   2713       p = add_epsg_def_ex (filter, first, last, 2070, "epsg", 2070,
  2714   2714           "ELD79 / Libya zone 7", 0, 0,
  2715   2715           "International 1924", "Greenwich",
  2716   2716           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2717   2717           "X", "East", "Y", "North");
  2718   2718       add_proj4text (p, 0,
  2719   2719           "+proj=tmerc +lat_0=0 +lon_0=13 +k=0.9999 +x_0=200000 +y_");
  2720   2720       add_proj4text (p, 1,
  2721         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
         2721  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
  2722   2722       add_proj4text (p, 2,
  2723         -        "0,0,0 +units=m +no_defs");
         2723  +        "0,0 +units=m +no_defs");
  2724   2724       add_srs_wkt (p, 0,
  2725   2725           "PROJCS[\"ELD79 / Libya zone 7\",GEOGCS[\"ELD79\",DATUM[\"");
  2726   2726       add_srs_wkt (p, 1,
  2727   2727           "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2728   2728       add_srs_wkt (p, 2,
  2729   2729           "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  2730   2730       add_srs_wkt (p, 3,
  2731         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  2732         -    add_srs_wkt (p, 4,
  2733         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2734         -    add_srs_wkt (p, 5,
  2735         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2736         -    add_srs_wkt (p, 6,
  2737         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2738         -    add_srs_wkt (p, 7,
  2739         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  2740         -    add_srs_wkt (p, 8,
  2741         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  2742         -    add_srs_wkt (p, 9,
  2743         -        ",PARAMETER[\"central_meridian\",13],PARAMETER[\"scale_fa");
  2744         -    add_srs_wkt (p, 10,
  2745         -        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  2746         -    add_srs_wkt (p, 11,
  2747         -        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2748         -    add_srs_wkt (p, 12,
  2749         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2750         -    add_srs_wkt (p, 13,
  2751         -        "HORITY[\"EPSG\",\"2070\"]]");
         2731  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         2732  +    add_srs_wkt (p, 4,
         2733  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2734  +    add_srs_wkt (p, 5,
         2735  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2736  +    add_srs_wkt (p, 6,
         2737  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2738  +    add_srs_wkt (p, 7,
         2739  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         2740  +    add_srs_wkt (p, 8,
         2741  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         2742  +    add_srs_wkt (p, 9,
         2743  +        "ARAMETER[\"central_meridian\",13],PARAMETER[\"scale_fact");
         2744  +    add_srs_wkt (p, 10,
         2745  +        "or\",0.9999],PARAMETER[\"false_easting\",200000],PARAMET");
         2746  +    add_srs_wkt (p, 11,
         2747  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         2748  +    add_srs_wkt (p, 12,
         2749  +        "SG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHO");
         2750  +    add_srs_wkt (p, 13,
         2751  +        "RITY[\"EPSG\",\"2070\"]]");
  2752   2752       p = add_epsg_def_ex (filter, first, last, 2071, "epsg", 2071,
  2753   2753           "ELD79 / Libya zone 8", 0, 0,
  2754   2754           "International 1924", "Greenwich",
  2755   2755           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2756   2756           "X", "East", "Y", "North");
  2757   2757       add_proj4text (p, 0,
  2758   2758           "+proj=tmerc +lat_0=0 +lon_0=15 +k=0.9999 +x_0=200000 +y_");
  2759   2759       add_proj4text (p, 1,
  2760         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
         2760  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
  2761   2761       add_proj4text (p, 2,
  2762         -        "0,0,0 +units=m +no_defs");
         2762  +        "0,0 +units=m +no_defs");
  2763   2763       add_srs_wkt (p, 0,
  2764   2764           "PROJCS[\"ELD79 / Libya zone 8\",GEOGCS[\"ELD79\",DATUM[\"");
  2765   2765       add_srs_wkt (p, 1,
  2766   2766           "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2767   2767       add_srs_wkt (p, 2,
  2768   2768           "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  2769   2769       add_srs_wkt (p, 3,
  2770         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
         2770  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         2771  +    add_srs_wkt (p, 4,
         2772  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2773  +    add_srs_wkt (p, 5,
         2774  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2775  +    add_srs_wkt (p, 6,
         2776  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2777  +    add_srs_wkt (p, 7,
         2778  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         2779  +    add_srs_wkt (p, 8,
         2780  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         2781  +    add_srs_wkt (p, 9,
         2782  +        "ARAMETER[\"central_meridian\",15],PARAMETER[\"scale_fact");
         2783  +    add_srs_wkt (p, 10,
         2784  +        "or\",0.9999],PARAMETER[\"false_easting\",200000],PARAMET");
         2785  +    add_srs_wkt (p, 11,
         2786  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         2787  +    add_srs_wkt (p, 12,
         2788  +        "SG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHO");
         2789  +    add_srs_wkt (p, 13,
         2790  +        "RITY[\"EPSG\",\"2071\"]]");
         2791  +    p = add_epsg_def_ex (filter, first, last, 2072, "epsg", 2072,
         2792  +        "ELD79 / Libya zone 9", 0, 0,
         2793  +        "International 1924", "Greenwich",
         2794  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         2795  +        "X", "East", "Y", "North");
         2796  +    add_proj4text (p, 0,
         2797  +        "+proj=tmerc +lat_0=0 +lon_0=17 +k=0.9999 +x_0=200000 +y_");
         2798  +    add_proj4text (p, 1,
         2799  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
         2800  +    add_proj4text (p, 2,
         2801  +        "0,0 +units=m +no_defs");
         2802  +    add_srs_wkt (p, 0,
         2803  +        "PROJCS[\"ELD79 / Libya zone 9\",GEOGCS[\"ELD79\",DATUM[\"");
         2804  +    add_srs_wkt (p, 1,
         2805  +        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         2806  +    add_srs_wkt (p, 2,
         2807  +        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         2808  +    add_srs_wkt (p, 3,
         2809  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         2810  +    add_srs_wkt (p, 4,
         2811  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2812  +    add_srs_wkt (p, 5,
         2813  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2814  +    add_srs_wkt (p, 6,
         2815  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2816  +    add_srs_wkt (p, 7,
         2817  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         2818  +    add_srs_wkt (p, 8,
         2819  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         2820  +    add_srs_wkt (p, 9,
         2821  +        "ARAMETER[\"central_meridian\",17],PARAMETER[\"scale_fact");
         2822  +    add_srs_wkt (p, 10,
         2823  +        "or\",0.9999],PARAMETER[\"false_easting\",200000],PARAMET");
         2824  +    add_srs_wkt (p, 11,
         2825  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         2826  +    add_srs_wkt (p, 12,
         2827  +        "SG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHO");
         2828  +    add_srs_wkt (p, 13,
         2829  +        "RITY[\"EPSG\",\"2072\"]]");
         2830  +    p = add_epsg_def_ex (filter, first, last, 2073, "epsg", 2073,
         2831  +        "ELD79 / Libya zone 10", 0, 0,
         2832  +        "International 1924", "Greenwich",
         2833  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         2834  +        "X", "East", "Y", "North");
         2835  +    add_proj4text (p, 0,
         2836  +        "+proj=tmerc +lat_0=0 +lon_0=19 +k=0.9999 +x_0=200000 +y_");
         2837  +    add_proj4text (p, 1,
         2838  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
         2839  +    add_proj4text (p, 2,
         2840  +        "0,0 +units=m +no_defs");
         2841  +    add_srs_wkt (p, 0,
         2842  +        "PROJCS[\"ELD79 / Libya zone 10\",GEOGCS[\"ELD79\",DATUM[");
         2843  +    add_srs_wkt (p, 1,
         2844  +        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
         2845  +    add_srs_wkt (p, 2,
         2846  +        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
         2847  +    add_srs_wkt (p, 3,
         2848  +        "[-115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",");
  2771   2849       add_srs_wkt (p, 4,
  2772   2850           "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2773   2851       add_srs_wkt (p, 5,
  2774   2852           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2775   2853       add_srs_wkt (p, 6,
  2776   2854           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2777   2855       add_srs_wkt (p, 7,
  2778   2856           "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  2779   2857       add_srs_wkt (p, 8,
  2780   2858           "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  2781   2859       add_srs_wkt (p, 9,
  2782         -        ",PARAMETER[\"central_meridian\",15],PARAMETER[\"scale_fa");
         2860  +        ",PARAMETER[\"central_meridian\",19],PARAMETER[\"scale_fa");
  2783   2861       add_srs_wkt (p, 10,
  2784   2862           "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  2785   2863       add_srs_wkt (p, 11,
  2786   2864           "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2787   2865       add_srs_wkt (p, 12,
  2788         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2789         -    add_srs_wkt (p, 13,
  2790         -        "HORITY[\"EPSG\",\"2071\"]]");
  2791         -    p = add_epsg_def_ex (filter, first, last, 2072, "epsg", 2072,
  2792         -        "ELD79 / Libya zone 9", 0, 0,
  2793         -        "International 1924", "Greenwich",
  2794         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2795         -        "X", "East", "Y", "North");
  2796         -    add_proj4text (p, 0,
  2797         -        "+proj=tmerc +lat_0=0 +lon_0=17 +k=0.9999 +x_0=200000 +y_");
  2798         -    add_proj4text (p, 1,
  2799         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
  2800         -    add_proj4text (p, 2,
  2801         -        "0,0,0 +units=m +no_defs");
  2802         -    add_srs_wkt (p, 0,
  2803         -        "PROJCS[\"ELD79 / Libya zone 9\",GEOGCS[\"ELD79\",DATUM[\"");
  2804         -    add_srs_wkt (p, 1,
  2805         -        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2806         -    add_srs_wkt (p, 2,
  2807         -        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  2808         -    add_srs_wkt (p, 3,
  2809         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  2810         -    add_srs_wkt (p, 4,
  2811         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2812         -    add_srs_wkt (p, 5,
  2813         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2814         -    add_srs_wkt (p, 6,
  2815         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2816         -    add_srs_wkt (p, 7,
  2817         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  2818         -    add_srs_wkt (p, 8,
  2819         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  2820         -    add_srs_wkt (p, 9,
  2821         -        ",PARAMETER[\"central_meridian\",17],PARAMETER[\"scale_fa");
  2822         -    add_srs_wkt (p, 10,
  2823         -        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  2824         -    add_srs_wkt (p, 11,
  2825         -        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2826         -    add_srs_wkt (p, 12,
  2827         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2828         -    add_srs_wkt (p, 13,
  2829         -        "HORITY[\"EPSG\",\"2072\"]]");
  2830         -    p = add_epsg_def_ex (filter, first, last, 2073, "epsg", 2073,
  2831         -        "ELD79 / Libya zone 10", 0, 0,
  2832         -        "International 1924", "Greenwich",
  2833         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2834         -        "X", "East", "Y", "North");
  2835         -    add_proj4text (p, 0,
  2836         -        "+proj=tmerc +lat_0=0 +lon_0=19 +k=0.9999 +x_0=200000 +y_");
  2837         -    add_proj4text (p, 1,
  2838         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
  2839         -    add_proj4text (p, 2,
  2840         -        "0,0,0 +units=m +no_defs");
  2841         -    add_srs_wkt (p, 0,
  2842         -        "PROJCS[\"ELD79 / Libya zone 10\",GEOGCS[\"ELD79\",DATUM[");
  2843         -    add_srs_wkt (p, 1,
  2844         -        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
  2845         -    add_srs_wkt (p, 2,
  2846         -        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
  2847         -    add_srs_wkt (p, 3,
  2848         -        "[-115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\"");
  2849         -    add_srs_wkt (p, 4,
  2850         -        ",\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2851         -    add_srs_wkt (p, 5,
  2852         -        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2853         -    add_srs_wkt (p, 6,
  2854         -        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2855         -    add_srs_wkt (p, 7,
  2856         -        "ude\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"T");
  2857         -    add_srs_wkt (p, 8,
  2858         -        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
  2859         -    add_srs_wkt (p, 9,
  2860         -        "],PARAMETER[\"central_meridian\",19],PARAMETER[\"scale_f");
  2861         -    add_srs_wkt (p, 10,
  2862         -        "actor\",0.9999],PARAMETER[\"false_easting\",200000],PARA");
  2863         -    add_srs_wkt (p, 11,
  2864         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2865         -    add_srs_wkt (p, 12,
  2866   2866           "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2867   2867       add_srs_wkt (p, 13,
  2868   2868           "HORITY[\"EPSG\",\"2073\"]]");
  2869   2869       p = add_epsg_def_ex (filter, first, last, 2074, "epsg", 2074,
  2870   2870           "ELD79 / Libya zone 11", 0, 0,
  2871   2871           "International 1924", "Greenwich",
  2872   2872           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2873   2873           "X", "East", "Y", "North");
  2874   2874       add_proj4text (p, 0,
  2875   2875           "+proj=tmerc +lat_0=0 +lon_0=21 +k=0.9999 +x_0=200000 +y_");
  2876   2876       add_proj4text (p, 1,
  2877         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
         2877  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
  2878   2878       add_proj4text (p, 2,
  2879         -        "0,0,0 +units=m +no_defs");
         2879  +        "0,0 +units=m +no_defs");
  2880   2880       add_srs_wkt (p, 0,
  2881   2881           "PROJCS[\"ELD79 / Libya zone 11\",GEOGCS[\"ELD79\",DATUM[");
  2882   2882       add_srs_wkt (p, 1,
  2883   2883           "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
  2884   2884       add_srs_wkt (p, 2,
  2885   2885           "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
  2886   2886       add_srs_wkt (p, 3,
  2887         -        "[-115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\"");
  2888         -    add_srs_wkt (p, 4,
  2889         -        ",\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2890         -    add_srs_wkt (p, 5,
  2891         -        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2892         -    add_srs_wkt (p, 6,
  2893         -        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2894         -    add_srs_wkt (p, 7,
  2895         -        "ude\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"T");
  2896         -    add_srs_wkt (p, 8,
  2897         -        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
  2898         -    add_srs_wkt (p, 9,
  2899         -        "],PARAMETER[\"central_meridian\",21],PARAMETER[\"scale_f");
  2900         -    add_srs_wkt (p, 10,
  2901         -        "actor\",0.9999],PARAMETER[\"false_easting\",200000],PARA");
  2902         -    add_srs_wkt (p, 11,
  2903         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2904         -    add_srs_wkt (p, 12,
  2905         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2906         -    add_srs_wkt (p, 13,
  2907         -        "HORITY[\"EPSG\",\"2074\"]]");
  2908         -    p = add_epsg_def_ex (filter, first, last, 2075, "epsg", 2075,
  2909         -        "ELD79 / Libya zone 12", 0, 0,
  2910         -        "International 1924", "Greenwich",
  2911         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2912         -        "X", "East", "Y", "North");
  2913         -    add_proj4text (p, 0,
  2914         -        "+proj=tmerc +lat_0=0 +lon_0=23 +k=0.9999 +x_0=200000 +y_");
  2915         -    add_proj4text (p, 1,
  2916         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
  2917         -    add_proj4text (p, 2,
  2918         -        "0,0,0 +units=m +no_defs");
  2919         -    add_srs_wkt (p, 0,
  2920         -        "PROJCS[\"ELD79 / Libya zone 12\",GEOGCS[\"ELD79\",DATUM[");
  2921         -    add_srs_wkt (p, 1,
  2922         -        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
  2923         -    add_srs_wkt (p, 2,
  2924         -        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
  2925         -    add_srs_wkt (p, 3,
  2926         -        "[-115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\"");
  2927         -    add_srs_wkt (p, 4,
  2928         -        ",\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2929         -    add_srs_wkt (p, 5,
  2930         -        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2931         -    add_srs_wkt (p, 6,
  2932         -        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2933         -    add_srs_wkt (p, 7,
  2934         -        "ude\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"T");
  2935         -    add_srs_wkt (p, 8,
  2936         -        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
  2937         -    add_srs_wkt (p, 9,
  2938         -        "],PARAMETER[\"central_meridian\",23],PARAMETER[\"scale_f");
  2939         -    add_srs_wkt (p, 10,
  2940         -        "actor\",0.9999],PARAMETER[\"false_easting\",200000],PARA");
  2941         -    add_srs_wkt (p, 11,
  2942         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2943         -    add_srs_wkt (p, 12,
  2944         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2945         -    add_srs_wkt (p, 13,
  2946         -        "HORITY[\"EPSG\",\"2075\"]]");
  2947         -    p = add_epsg_def_ex (filter, first, last, 2076, "epsg", 2076,
  2948         -        "ELD79 / Libya zone 13", 0, 0,
  2949         -        "International 1924", "Greenwich",
  2950         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2951         -        "X", "East", "Y", "North");
  2952         -    add_proj4text (p, 0,
  2953         -        "+proj=tmerc +lat_0=0 +lon_0=25 +k=0.9999 +x_0=200000 +y_");
  2954         -    add_proj4text (p, 1,
  2955         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
  2956         -    add_proj4text (p, 2,
  2957         -        "0,0,0 +units=m +no_defs");
  2958         -    add_srs_wkt (p, 0,
  2959         -        "PROJCS[\"ELD79 / Libya zone 13\",GEOGCS[\"ELD79\",DATUM[");
  2960         -    add_srs_wkt (p, 1,
  2961         -        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
  2962         -    add_srs_wkt (p, 2,
  2963         -        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
  2964         -    add_srs_wkt (p, 3,
  2965         -        "[-115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\"");
  2966         -    add_srs_wkt (p, 4,
  2967         -        ",\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2968         -    add_srs_wkt (p, 5,
  2969         -        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2970         -    add_srs_wkt (p, 6,
  2971         -        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2972         -    add_srs_wkt (p, 7,
  2973         -        "ude\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"T");
  2974         -    add_srs_wkt (p, 8,
  2975         -        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
  2976         -    add_srs_wkt (p, 9,
  2977         -        "],PARAMETER[\"central_meridian\",25],PARAMETER[\"scale_f");
  2978         -    add_srs_wkt (p, 10,
  2979         -        "actor\",0.9999],PARAMETER[\"false_easting\",200000],PARA");
  2980         -    add_srs_wkt (p, 11,
  2981         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2982         -    add_srs_wkt (p, 12,
  2983         -        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  2984         -    add_srs_wkt (p, 13,
  2985         -        "HORITY[\"EPSG\",\"2076\"]]");
  2986         -    p = add_epsg_def_ex (filter, first, last, 2077, "epsg", 2077,
  2987         -        "ELD79 / UTM zone 32N", 0, 0,
  2988         -        "International 1924", "Greenwich",
  2989         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  2990         -        "Easting", "East", "Northing", "North");
  2991         -    add_proj4text (p, 0,
  2992         -        "+proj=utm +zone=32 +ellps=intl +towgs84=-115.8543,-99.05");
  2993         -    add_proj4text (p, 1,
  2994         -        "83,-152.4616,0,0,0,0 +units=m +no_defs");
  2995         -    add_srs_wkt (p, 0,
  2996         -        "PROJCS[\"ELD79 / UTM zone 32N\",GEOGCS[\"ELD79\",DATUM[\"");
  2997         -    add_srs_wkt (p, 1,
  2998         -        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  2999         -    add_srs_wkt (p, 2,
  3000         -        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  3001         -    add_srs_wkt (p, 3,
  3002         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  3003         -    add_srs_wkt (p, 4,
  3004         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  3005         -    add_srs_wkt (p, 5,
  3006         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  3007         -    add_srs_wkt (p, 6,
  3008         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  3009         -    add_srs_wkt (p, 7,
  3010         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  3011         -    add_srs_wkt (p, 8,
  3012         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  3013         -    add_srs_wkt (p, 9,
  3014         -        ",PARAMETER[\"central_meridian\",9],PARAMETER[\"scale_fac");
  3015         -    add_srs_wkt (p, 10,
  3016         -        "tor\",0.9996],PARAMETER[\"false_easting\",500000],PARAME");
  3017         -    add_srs_wkt (p, 11,
  3018         -        "TER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"E");
  3019         -    add_srs_wkt (p, 12,
  3020         -        "PSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
  3021         -    add_srs_wkt (p, 13,
  3022         -        ",NORTH],AUTHORITY[\"EPSG\",\"2077\"]]");
  3023         -    p = add_epsg_def_ex (filter, first, last, 2078, "epsg", 2078,
  3024         -        "ELD79 / UTM zone 33N", 0, 0,
  3025         -        "International 1924", "Greenwich",
  3026         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  3027         -        "Easting", "East", "Northing", "North");
  3028         -    add_proj4text (p, 0,
  3029         -        "+proj=utm +zone=33 +ellps=intl +towgs84=-115.8543,-99.05");
  3030         -    add_proj4text (p, 1,
  3031         -        "83,-152.4616,0,0,0,0 +units=m +no_defs");
  3032         -    add_srs_wkt (p, 0,
  3033         -        "PROJCS[\"ELD79 / UTM zone 33N\",GEOGCS[\"ELD79\",DATUM[\"");
  3034         -    add_srs_wkt (p, 1,
  3035         -        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  3036         -    add_srs_wkt (p, 2,
  3037         -        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  3038         -    add_srs_wkt (p, 3,
  3039         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
  3040         -    add_srs_wkt (p, 4,
  3041         -        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  3042         -    add_srs_wkt (p, 5,
  3043         -        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  3044         -    add_srs_wkt (p, 6,
  3045         -        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  3046         -    add_srs_wkt (p, 7,
  3047         -        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  3048         -    add_srs_wkt (p, 8,
  3049         -        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  3050         -    add_srs_wkt (p, 9,
  3051         -        ",PARAMETER[\"central_meridian\",15],PARAMETER[\"scale_fa");
  3052         -    add_srs_wkt (p, 10,
  3053         -        "ctor\",0.9996],PARAMETER[\"false_easting\",500000],PARAM");
  3054         -    add_srs_wkt (p, 11,
  3055         -        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  3056         -    add_srs_wkt (p, 12,
  3057         -        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
  3058         -    add_srs_wkt (p, 13,
  3059         -        "\",NORTH],AUTHORITY[\"EPSG\",\"2078\"]]");
  3060         -    p = add_epsg_def_ex (filter, first, last, 2079, "epsg", 2079,
  3061         -        "ELD79 / UTM zone 34N", 0, 0,
  3062         -        "International 1924", "Greenwich",
  3063         -        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  3064         -        "Easting", "East", "Northing", "North");
  3065         -    add_proj4text (p, 0,
  3066         -        "+proj=utm +zone=34 +ellps=intl +towgs84=-115.8543,-99.05");
  3067         -    add_proj4text (p, 1,
  3068         -        "83,-152.4616,0,0,0,0 +units=m +no_defs");
  3069         -    add_srs_wkt (p, 0,
  3070         -        "PROJCS[\"ELD79 / UTM zone 34N\",GEOGCS[\"ELD79\",DATUM[\"");
  3071         -    add_srs_wkt (p, 1,
  3072         -        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
  3073         -    add_srs_wkt (p, 2,
  3074         -        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  3075         -    add_srs_wkt (p, 3,
  3076         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
         2887  +        "[-115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",");
  3077   2888       add_srs_wkt (p, 4,
  3078   2889           "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  3079   2890       add_srs_wkt (p, 5,
  3080   2891           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  3081   2892       add_srs_wkt (p, 6,
  3082   2893           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  3083   2894       add_srs_wkt (p, 7,
  3084   2895           "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  3085   2896       add_srs_wkt (p, 8,
  3086   2897           "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  3087   2898       add_srs_wkt (p, 9,
  3088   2899           ",PARAMETER[\"central_meridian\",21],PARAMETER[\"scale_fa");
  3089   2900       add_srs_wkt (p, 10,
  3090         -        "ctor\",0.9996],PARAMETER[\"false_easting\",500000],PARAM");
         2901  +        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
         2902  +    add_srs_wkt (p, 11,
         2903  +        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
         2904  +    add_srs_wkt (p, 12,
         2905  +        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
         2906  +    add_srs_wkt (p, 13,
         2907  +        "HORITY[\"EPSG\",\"2074\"]]");
         2908  +    p = add_epsg_def_ex (filter, first, last, 2075, "epsg", 2075,
         2909  +        "ELD79 / Libya zone 12", 0, 0,
         2910  +        "International 1924", "Greenwich",
         2911  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         2912  +        "X", "East", "Y", "North");
         2913  +    add_proj4text (p, 0,
         2914  +        "+proj=tmerc +lat_0=0 +lon_0=23 +k=0.9999 +x_0=200000 +y_");
         2915  +    add_proj4text (p, 1,
         2916  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
         2917  +    add_proj4text (p, 2,
         2918  +        "0,0 +units=m +no_defs");
         2919  +    add_srs_wkt (p, 0,
         2920  +        "PROJCS[\"ELD79 / Libya zone 12\",GEOGCS[\"ELD79\",DATUM[");
         2921  +    add_srs_wkt (p, 1,
         2922  +        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
         2923  +    add_srs_wkt (p, 2,
         2924  +        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
         2925  +    add_srs_wkt (p, 3,
         2926  +        "[-115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",");
         2927  +    add_srs_wkt (p, 4,
         2928  +        "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
         2929  +    add_srs_wkt (p, 5,
         2930  +        "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
         2931  +    add_srs_wkt (p, 6,
         2932  +        "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
         2933  +    add_srs_wkt (p, 7,
         2934  +        "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
         2935  +    add_srs_wkt (p, 8,
         2936  +        "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
         2937  +    add_srs_wkt (p, 9,
         2938  +        ",PARAMETER[\"central_meridian\",23],PARAMETER[\"scale_fa");
         2939  +    add_srs_wkt (p, 10,
         2940  +        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  3091   2941       add_srs_wkt (p, 11,
  3092   2942           "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  3093   2943       add_srs_wkt (p, 12,
  3094         -        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
         2944  +        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
  3095   2945       add_srs_wkt (p, 13,
  3096         -        "\",NORTH],AUTHORITY[\"EPSG\",\"2079\"]]");
  3097         -    p = add_epsg_def_ex (filter, first, last, 2080, "epsg", 2080,
  3098         -        "ELD79 / UTM zone 35N", 0, 0,
         2946  +        "HORITY[\"EPSG\",\"2075\"]]");
         2947  +    p = add_epsg_def_ex (filter, first, last, 2076, "epsg", 2076,
         2948  +        "ELD79 / Libya zone 13", 0, 0,
  3099   2949           "International 1924", "Greenwich",
  3100   2950           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  3101         -        "Easting", "East", "Northing", "North");
         2951  +        "X", "East", "Y", "North");
  3102   2952       add_proj4text (p, 0,
  3103         -        "+proj=utm +zone=35 +ellps=intl +towgs84=-115.8543,-99.05");
         2953  +        "+proj=tmerc +lat_0=0 +lon_0=25 +k=0.9999 +x_0=200000 +y_");
  3104   2954       add_proj4text (p, 1,
  3105         -        "83,-152.4616,0,0,0,0 +units=m +no_defs");
         2955  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
         2956  +    add_proj4text (p, 2,
         2957  +        "0,0 +units=m +no_defs");
  3106   2958       add_srs_wkt (p, 0,
  3107         -        "PROJCS[\"ELD79 / UTM zone 35N\",GEOGCS[\"ELD79\",DATUM[\"");
         2959  +        "PROJCS[\"ELD79 / Libya zone 13\",GEOGCS[\"ELD79\",DATUM[");
  3108   2960       add_srs_wkt (p, 1,
  3109         -        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         2961  +        "\"European_Libyan_Datum_1979\",SPHEROID[\"International ");
  3110   2962       add_srs_wkt (p, 2,
  3111         -        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         2963  +        "1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84");
  3112   2964       add_srs_wkt (p, 3,
  3113         -        "115.8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",");
         2965  +        "[-115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",");
  3114   2966       add_srs_wkt (p, 4,
  3115   2967           "\"6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  3116   2968       add_srs_wkt (p, 5,
  3117   2969           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  3118   2970       add_srs_wkt (p, 6,
  3119   2971           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  3120   2972       add_srs_wkt (p, 7,
  3121   2973           "de\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tr");
  3122   2974       add_srs_wkt (p, 8,
  3123   2975           "ansverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0]");
  3124   2976       add_srs_wkt (p, 9,
  3125         -        ",PARAMETER[\"central_meridian\",27],PARAMETER[\"scale_fa");
         2977  +        ",PARAMETER[\"central_meridian\",25],PARAMETER[\"scale_fa");
  3126   2978       add_srs_wkt (p, 10,
  3127         -        "ctor\",0.9996],PARAMETER[\"false_easting\",500000],PARAM");
         2979  +        "ctor\",0.9999],PARAMETER[\"false_easting\",200000],PARAM");
  3128   2980       add_srs_wkt (p, 11,
  3129   2981           "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  3130   2982       add_srs_wkt (p, 12,
  3131         -        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
  3132         -    add_srs_wkt (p, 13,
  3133         -        "\",NORTH],AUTHORITY[\"EPSG\",\"2080\"]]");
         2983  +        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
         2984  +    add_srs_wkt (p, 13,
         2985  +        "HORITY[\"EPSG\",\"2076\"]]");
         2986  +    p = add_epsg_def_ex (filter, first, last, 2077, "epsg", 2077,
         2987  +        "ELD79 / UTM zone 32N", 0, 0,
         2988  +        "International 1924", "Greenwich",
         2989  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         2990  +        "Easting", "East", "Northing", "North");
         2991  +    add_proj4text (p, 0,
         2992  +        "+proj=utm +zone=32 +ellps=intl +towgs84=-115.854,-99.058");
         2993  +    add_proj4text (p, 1,
         2994  +        "3,-152.462,0,0,0,0 +units=m +no_defs");
         2995  +    add_srs_wkt (p, 0,
         2996  +        "PROJCS[\"ELD79 / UTM zone 32N\",GEOGCS[\"ELD79\",DATUM[\"");
         2997  +    add_srs_wkt (p, 1,
         2998  +        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         2999  +    add_srs_wkt (p, 2,
         3000  +        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         3001  +    add_srs_wkt (p, 3,
         3002  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         3003  +    add_srs_wkt (p, 4,
         3004  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         3005  +    add_srs_wkt (p, 5,
         3006  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         3007  +    add_srs_wkt (p, 6,
         3008  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         3009  +    add_srs_wkt (p, 7,
         3010  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         3011  +    add_srs_wkt (p, 8,
         3012  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         3013  +    add_srs_wkt (p, 9,
         3014  +        "ARAMETER[\"central_meridian\",9],PARAMETER[\"scale_facto");
         3015  +    add_srs_wkt (p, 10,
         3016  +        "r\",0.9996],PARAMETER[\"false_easting\",500000],PARAMETE");
         3017  +    add_srs_wkt (p, 11,
         3018  +        "R[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPS");
         3019  +    add_srs_wkt (p, 12,
         3020  +        "G\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",");
         3021  +    add_srs_wkt (p, 13,
         3022  +        "NORTH],AUTHORITY[\"EPSG\",\"2077\"]]");
         3023  +    p = add_epsg_def_ex (filter, first, last, 2078, "epsg", 2078,
         3024  +        "ELD79 / UTM zone 33N", 0, 0,
         3025  +        "International 1924", "Greenwich",
         3026  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         3027  +        "Easting", "East", "Northing", "North");
         3028  +    add_proj4text (p, 0,
         3029  +        "+proj=utm +zone=33 +ellps=intl +towgs84=-115.854,-99.058");
         3030  +    add_proj4text (p, 1,
         3031  +        "3,-152.462,0,0,0,0 +units=m +no_defs");
         3032  +    add_srs_wkt (p, 0,
         3033  +        "PROJCS[\"ELD79 / UTM zone 33N\",GEOGCS[\"ELD79\",DATUM[\"");
         3034  +    add_srs_wkt (p, 1,
         3035  +        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         3036  +    add_srs_wkt (p, 2,
         3037  +        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         3038  +    add_srs_wkt (p, 3,
         3039  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         3040  +    add_srs_wkt (p, 4,
         3041  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         3042  +    add_srs_wkt (p, 5,
         3043  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         3044  +    add_srs_wkt (p, 6,
         3045  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         3046  +    add_srs_wkt (p, 7,
         3047  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         3048  +    add_srs_wkt (p, 8,
         3049  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         3050  +    add_srs_wkt (p, 9,
         3051  +        "ARAMETER[\"central_meridian\",15],PARAMETER[\"scale_fact");
         3052  +    add_srs_wkt (p, 10,
         3053  +        "or\",0.9996],PARAMETER[\"false_easting\",500000],PARAMET");
         3054  +    add_srs_wkt (p, 11,
         3055  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         3056  +    add_srs_wkt (p, 12,
         3057  +        "SG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
         3058  +    add_srs_wkt (p, 13,
         3059  +        ",NORTH],AUTHORITY[\"EPSG\",\"2078\"]]");
         3060  +    p = add_epsg_def_ex (filter, first, last, 2079, "epsg", 2079,
         3061  +        "ELD79 / UTM zone 34N", 0, 0,
         3062  +        "International 1924", "Greenwich",
         3063  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         3064  +        "Easting", "East", "Northing", "North");
         3065  +    add_proj4text (p, 0,
         3066  +        "+proj=utm +zone=34 +ellps=intl +towgs84=-115.854,-99.058");
         3067  +    add_proj4text (p, 1,
         3068  +        "3,-152.462,0,0,0,0 +units=m +no_defs");
         3069  +    add_srs_wkt (p, 0,
         3070  +        "PROJCS[\"ELD79 / UTM zone 34N\",GEOGCS[\"ELD79\",DATUM[\"");
         3071  +    add_srs_wkt (p, 1,
         3072  +        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         3073  +    add_srs_wkt (p, 2,
         3074  +        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         3075  +    add_srs_wkt (p, 3,
         3076  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         3077  +    add_srs_wkt (p, 4,
         3078  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         3079  +    add_srs_wkt (p, 5,
         3080  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         3081  +    add_srs_wkt (p, 6,
         3082  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         3083  +    add_srs_wkt (p, 7,
         3084  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         3085  +    add_srs_wkt (p, 8,
         3086  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         3087  +    add_srs_wkt (p, 9,
         3088  +        "ARAMETER[\"central_meridian\",21],PARAMETER[\"scale_fact");
         3089  +    add_srs_wkt (p, 10,
         3090  +        "or\",0.9996],PARAMETER[\"false_easting\",500000],PARAMET");
         3091  +    add_srs_wkt (p, 11,
         3092  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         3093  +    add_srs_wkt (p, 12,
         3094  +        "SG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
         3095  +    add_srs_wkt (p, 13,
         3096  +        ",NORTH],AUTHORITY[\"EPSG\",\"2079\"]]");
         3097  +    p = add_epsg_def_ex (filter, first, last, 2080, "epsg", 2080,
         3098  +        "ELD79 / UTM zone 35N", 0, 0,
         3099  +        "International 1924", "Greenwich",
         3100  +        "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
         3101  +        "Easting", "East", "Northing", "North");
         3102  +    add_proj4text (p, 0,
         3103  +        "+proj=utm +zone=35 +ellps=intl +towgs84=-115.854,-99.058");
         3104  +    add_proj4text (p, 1,
         3105  +        "3,-152.462,0,0,0,0 +units=m +no_defs");
         3106  +    add_srs_wkt (p, 0,
         3107  +        "PROJCS[\"ELD79 / UTM zone 35N\",GEOGCS[\"ELD79\",DATUM[\"");
         3108  +    add_srs_wkt (p, 1,
         3109  +        "European_Libyan_Datum_1979\",SPHEROID[\"International 19");
         3110  +    add_srs_wkt (p, 2,
         3111  +        "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
         3112  +    add_srs_wkt (p, 3,
         3113  +        "115.854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"");
         3114  +    add_srs_wkt (p, 4,
         3115  +        "6159\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         3116  +    add_srs_wkt (p, 5,
         3117  +        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         3118  +    add_srs_wkt (p, 6,
         3119  +        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         3120  +    add_srs_wkt (p, 7,
         3121  +        "\",EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Tran");
         3122  +    add_srs_wkt (p, 8,
         3123  +        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
         3124  +    add_srs_wkt (p, 9,
         3125  +        "ARAMETER[\"central_meridian\",27],PARAMETER[\"scale_fact");
         3126  +    add_srs_wkt (p, 10,
         3127  +        "or\",0.9996],PARAMETER[\"false_easting\",500000],PARAMET");
         3128  +    add_srs_wkt (p, 11,
         3129  +        "ER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EP");
         3130  +    add_srs_wkt (p, 12,
         3131  +        "SG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
         3132  +    add_srs_wkt (p, 13,
         3133  +        ",NORTH],AUTHORITY[\"EPSG\",\"2080\"]]");
  3134   3134       p = add_epsg_def_ex (filter, first, last, 2081, "epsg", 2081,
  3135   3135           "Chos Malal 1914 / Argentina 2", 0, 1,
  3136   3136           "International 1924", "Greenwich",
  3137   3137           "Chos_Malal_1914", "Transverse_Mercator", "metre",
  3138   3138           "X", "North", "Y", "East");
  3139   3139       add_proj4text (p, 0,
  3140   3140           "+proj=tmerc +lat_0=-90 +lon_0=-69 +k=1 +x_0=2500000 +y_0");
................................................................................
  3293   3293       add_proj4text (p, 2,
  3294   3294           " +no_defs");
  3295   3295       add_srs_wkt (p, 0,
  3296   3296           "PROJCS[\"NAD27 / Cuba Norte (deprecated)\",GEOGCS[\"NAD2");
  3297   3297       add_srs_wkt (p, 1,
  3298   3298           "7\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clark");
  3299   3299       add_srs_wkt (p, 2,
  3300         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
         3300  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
  3301   3301       add_srs_wkt (p, 3,
  3302   3302           "\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenw");
  3303   3303       add_srs_wkt (p, 4,
  3304   3304           "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
  3305   3305       add_srs_wkt (p, 5,
  3306   3306           "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
  3307   3307       add_srs_wkt (p, 6,
................................................................................
  3332   3332       add_proj4text (p, 2,
  3333   3333           "0 +y_0=229126.939 +datum=NAD27 +units=m +no_defs");
  3334   3334       add_srs_wkt (p, 0,
  3335   3335           "PROJCS[\"NAD27 / Cuba Sur (deprecated)\",GEOGCS[\"NAD27\"");
  3336   3336       add_srs_wkt (p, 1,
  3337   3337           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  3338   3338       add_srs_wkt (p, 2,
  3339         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         3339  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  3340   3340       add_srs_wkt (p, 3,
  3341   3341           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  3342   3342       add_srs_wkt (p, 4,
  3343   3343           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  3344   3344       add_srs_wkt (p, 5,
  3345   3345           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  3346   3346       add_srs_wkt (p, 6,
................................................................................
  3363   3363           "ELD79 / TM 12 NE", 0, 0,
  3364   3364           "International 1924", "Greenwich",
  3365   3365           "European_Libyan_Datum_1979", "Transverse_Mercator", "metre",
  3366   3366           "Easting", "East", "Northing", "North");
  3367   3367       add_proj4text (p, 0,
  3368   3368           "+proj=tmerc +lat_0=0 +lon_0=12 +k=0.9996 +x_0=500000 +y_");
  3369   3369       add_proj4text (p, 1,
  3370         -        "0=0 +ellps=intl +towgs84=-115.8543,-99.0583,-152.4616,0,");
         3370  +        "0=0 +ellps=intl +towgs84=-115.854,-99.0583,-152.462,0,0,");
  3371   3371       add_proj4text (p, 2,
  3372         -        "0,0,0 +units=m +no_defs");
         3372  +        "0,0 +units=m +no_defs");
  3373   3373       add_srs_wkt (p, 0,
  3374   3374           "PROJCS[\"ELD79 / TM 12 NE\",GEOGCS[\"ELD79\",DATUM[\"Eur");
  3375   3375       add_srs_wkt (p, 1,
  3376   3376           "opean_Libyan_Datum_1979\",SPHEROID[\"International 1924\"");
  3377   3377       add_srs_wkt (p, 2,
  3378   3378           ",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-115.");
  3379   3379       add_srs_wkt (p, 3,
  3380         -        "8543,-99.0583,-152.4616,0,0,0,0],AUTHORITY[\"EPSG\",\"61");
         3380  +        "854,-99.0583,-152.462,0,0,0,0],AUTHORITY[\"EPSG\",\"6159");
  3381   3381       add_srs_wkt (p, 4,
  3382         -        "59\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
         3382  +        "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
  3383   3383       add_srs_wkt (p, 5,
  3384         -        "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
         3384  +        "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
  3385   3385       add_srs_wkt (p, 6,
  3386         -        ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
         3386  +        "\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",E");
  3387   3387       add_srs_wkt (p, 7,
  3388         -        "EAST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Transve");
         3388  +        "AST],AUTHORITY[\"EPSG\",\"4159\"]],PROJECTION[\"Transver");
  3389   3389       add_srs_wkt (p, 8,
  3390         -        "rse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARA");
         3390  +        "se_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAM");
  3391   3391       add_srs_wkt (p, 9,
  3392         -        "METER[\"central_meridian\",12],PARAMETER[\"scale_factor\"");
         3392  +        "ETER[\"central_meridian\",12],PARAMETER[\"scale_factor\"");
  3393   3393       add_srs_wkt (p, 10,
  3394   3394           ",0.9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"");
  3395   3395       add_srs_wkt (p, 11,
  3396   3396           "false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",");
  3397   3397       add_srs_wkt (p, 12,
  3398   3398           "\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORT");
  3399   3399       add_srs_wkt (p, 13,
................................................................................
  3410   3410       add_proj4text (p, 2,
  3411   3411           "+units=m +no_defs");
  3412   3412       add_srs_wkt (p, 0,
  3413   3413           "PROJCS[\"Carthage / TM 11 NE\",GEOGCS[\"Carthage\",DATUM");
  3414   3414       add_srs_wkt (p, 1,
  3415   3415           "[\"Carthage\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,2");
  3416   3416       add_srs_wkt (p, 2,
  3417         -        "93.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-");
         3417  +        "93.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-");
  3418   3418       add_srs_wkt (p, 3,
  3419   3419           "263,6,431,0,0,0,0],AUTHORITY[\"EPSG\",\"6223\"]],PRIMEM[");
  3420   3420       add_srs_wkt (p, 4,
  3421   3421           "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
  3422   3422       add_srs_wkt (p, 5,
  3423   3423           "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
  3424   3424       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_01.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1545   1545       add_proj4text (p, 1,
  1546   1546           "0=0 +y_0=0 +ellps=clrk66 +units=m +no_defs");
  1547   1547       add_srs_wkt (p, 0,
  1548   1548           "PROJCS[\"NAD27(CGQ77) / Quebec Lambert\",GEOGCS[\"NAD27(");
  1549   1549       add_srs_wkt (p, 1,
  1550   1550           "CGQ77)\",DATUM[\"North_American_Datum_1927_CGQ77\",SPHER");
  1551   1551       add_srs_wkt (p, 2,
  1552         -        "OID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORIT");
         1552  +        "OID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORIT");
  1553   1553       add_srs_wkt (p, 3,
  1554   1554           "Y[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6609\"]],PRIM");
  1555   1555       add_srs_wkt (p, 4,
  1556   1556           "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1557   1557       add_srs_wkt (p, 5,
  1558   1558           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1559   1559       add_srs_wkt (p, 6,
................................................................................
  2216   2216       add_srs_wkt (p, 0,
  2217   2217           "PROJCS[\"American Samoa 1962 / American Samoa Lambert (d");
  2218   2218       add_srs_wkt (p, 1,
  2219   2219           "eprecated)\",GEOGCS[\"American Samoa 1962\",DATUM[\"Amer");
  2220   2220       add_srs_wkt (p, 2,
  2221   2221           "ican_Samoa_1962\",SPHEROID[\"Clarke 1866\",6378206.4,294");
  2222   2222       add_srs_wkt (p, 3,
  2223         -        ".9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-11");
         2223  +        ".9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-11");
  2224   2224       add_srs_wkt (p, 4,
  2225   2225           "5,118,426,0,0,0,0],AUTHORITY[\"EPSG\",\"6169\"]],PRIMEM[");
  2226   2226       add_srs_wkt (p, 5,
  2227   2227           "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
  2228   2228       add_srs_wkt (p, 6,
  2229   2229           "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
  2230   2230       add_srs_wkt (p, 7,
................................................................................
  2750   2750           "Luxembourg_1930", "Transverse_Mercator", "metre",
  2751   2751           "X", "North", "Y", "East");
  2752   2752       add_proj4text (p, 0,
  2753   2753           "+proj=tmerc +lat_0=49.83333333333334 +lon_0=6.1666666666");
  2754   2754       add_proj4text (p, 1,
  2755   2755           "66667 +k=1 +x_0=80000 +y_0=100000 +ellps=intl +towgs84=-");
  2756   2756       add_proj4text (p, 2,
  2757         -        "189.6806,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0.45");
         2757  +        "189.681,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0.459");
  2758   2758       add_proj4text (p, 3,
  2759         -        "98 +units=m +no_defs");
         2759  +        "8 +units=m +no_defs");
  2760   2760       add_srs_wkt (p, 0,
  2761   2761           "PROJCS[\"Luxembourg 1930 / Gauss\",GEOGCS[\"Luxembourg 1");
  2762   2762       add_srs_wkt (p, 1,
  2763   2763           "930\",DATUM[\"Luxembourg_1930\",SPHEROID[\"International");
  2764   2764       add_srs_wkt (p, 2,
  2765   2765           " 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS8");
  2766   2766       add_srs_wkt (p, 3,
  2767         -        "4[-189.6806,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0");
         2767  +        "4[-189.681,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0.");
  2768   2768       add_srs_wkt (p, 4,
  2769         -        ".4598],AUTHORITY[\"EPSG\",\"6181\"]],PRIMEM[\"Greenwich\"");
         2769  +        "4598],AUTHORITY[\"EPSG\",\"6181\"]],PRIMEM[\"Greenwich\"");
  2770   2770       add_srs_wkt (p, 5,
  2771   2771           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2772   2772       add_srs_wkt (p, 6,
  2773   2773           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2774   2774       add_srs_wkt (p, 7,
  2775   2775           "e\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
  2776   2776       add_srs_wkt (p, 8,
................................................................................
  3482   3482       add_srs_wkt (p, 0,
  3483   3483           "PROJCS[\"American Samoa 1962 / American Samoa Lambert (d");
  3484   3484       add_srs_wkt (p, 1,
  3485   3485           "eprecated)\",GEOGCS[\"American Samoa 1962\",DATUM[\"Amer");
  3486   3486       add_srs_wkt (p, 2,
  3487   3487           "ican_Samoa_1962\",SPHEROID[\"Clarke 1866\",6378206.4,294");
  3488   3488       add_srs_wkt (p, 3,
  3489         -        ".9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-11");
         3489  +        ".9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-11");
  3490   3490       add_srs_wkt (p, 4,
  3491   3491           "5,118,426,0,0,0,0],AUTHORITY[\"EPSG\",\"6169\"]],PRIMEM[");
  3492   3492       add_srs_wkt (p, 5,
  3493   3493           "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
  3494   3494       add_srs_wkt (p, 6,
  3495   3495           "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
  3496   3496       add_srs_wkt (p, 7,
................................................................................
  3858   3858       add_proj4text (p, 2,
  3859   3859           "30480.06096012192 +datum=NAD27 +units=us-ft +no_defs");
  3860   3860       add_srs_wkt (p, 0,
  3861   3861           "PROJCS[\"NAD27 / Tennessee\",GEOGCS[\"NAD27\",DATUM[\"No");
  3862   3862       add_srs_wkt (p, 1,
  3863   3863           "rth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",63782");
  3864   3864       add_srs_wkt (p, 2,
  3865         -        "06.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUT");
         3865  +        "06.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUT");
  3866   3866       add_srs_wkt (p, 3,
  3867   3867           "HORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3868   3868       add_srs_wkt (p, 4,
  3869   3869           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3870   3870       add_srs_wkt (p, 5,
  3871   3871           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3872   3872       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_02.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   298    298       add_proj4text (p, 1,
   299    299           "9,-151.8,-41.4,0,0,0,0 +units=m +no_defs");
   300    300       add_srs_wkt (p, 0,
   301    301           "PROJCS[\"Manoca 1962 / UTM zone 32N\",GEOGCS[\"Manoca 19");
   302    302       add_srs_wkt (p, 1,
   303    303           "62\",DATUM[\"Manoca_1962\",SPHEROID[\"Clarke 1880 (IGN)\"");
   304    304       add_srs_wkt (p, 2,
   305         -        ",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"");
          305  +        ",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"");
   306    306       add_srs_wkt (p, 3,
   307    307           "]],TOWGS84[-70.9,-151.8,-41.4,0,0,0,0],AUTHORITY[\"EPSG\"");
   308    308       add_srs_wkt (p, 4,
   309    309           ",\"6193\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   310    310       add_srs_wkt (p, 5,
   311    311           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   312    312       add_srs_wkt (p, 6,
................................................................................
  3816   3816       add_proj4text (p, 3,
  3817   3817           "88,472.052,0,0,0,0 +to_meter=0.3047972654 +no_defs");
  3818   3818       add_srs_wkt (p, 0,
  3819   3819           "PROJCS[\"Trinidad 1903 / Trinidad Grid (ftCla)\",GEOGCS[");
  3820   3820       add_srs_wkt (p, 1,
  3821   3821           "\"Trinidad 1903\",DATUM[\"Trinidad_1903\",SPHEROID[\"Cla");
  3822   3822       add_srs_wkt (p, 2,
  3823         -        "rke 1858\",6378293.645208759,294.2606763692606,AUTHORITY");
         3823  +        "rke 1858\",6378293.645208759,294.2606763692569,AUTHORITY");
  3824   3824       add_srs_wkt (p, 3,
  3825   3825           "[\"EPSG\",\"7007\"]],TOWGS84[-61.702,284.488,472.052,0,0");
  3826   3826       add_srs_wkt (p, 4,
  3827   3827           ",0,0],AUTHORITY[\"EPSG\",\"6302\"]],PRIMEM[\"Greenwich\"");
  3828   3828       add_srs_wkt (p, 5,
  3829   3829           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  3830   3830       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_03.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    97     97           "Hong_Kong_1980", "Transverse_Mercator", "metre",
    98     98           "Northing", "North", "Easting", "East");
    99     99       add_proj4text (p, 0,
   100    100           "+proj=tmerc +lat_0=22.31213333333334 +lon_0=114.17855555");
   101    101       add_proj4text (p, 1,
   102    102           "55556 +k=1 +x_0=836694.05 +y_0=819069.8 +ellps=intl +tow");
   103    103       add_proj4text (p, 2,
   104         -        "gs84=-162.619,-276.959,-161.764,0.067753,-2.243649,-1.15");
          104  +        "gs84=-162.619,-276.959,-161.764,0.067753,-2.24365,-1.158");
   105    105       add_proj4text (p, 3,
   106         -        "8827,-1.094246 +units=m +no_defs");
          106  +        "83,-1.09425 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Hong Kong 1980 Grid System\",GEOGCS[\"Hong Kong");
   109    109       add_srs_wkt (p, 1,
   110    110           " 1980\",DATUM[\"Hong_Kong_1980\",SPHEROID[\"Internationa");
   111    111       add_srs_wkt (p, 2,
   112    112           "l 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS");
   113    113       add_srs_wkt (p, 3,
   114         -        "84[-162.619,-276.959,-161.764,0.067753,-2.243649,-1.1588");
   115         -    add_srs_wkt (p, 4,
   116         -        "27,-1.094246],AUTHORITY[\"EPSG\",\"6611\"]],PRIMEM[\"Gre");
   117         -    add_srs_wkt (p, 5,
   118         -        "enwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
   119         -    add_srs_wkt (p, 6,
   120         -        ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
   121         -    add_srs_wkt (p, 7,
   122         -        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
   123         -    add_srs_wkt (p, 8,
   124         -        "PSG\",\"4611\"]],PROJECTION[\"Transverse_Mercator\"],PAR");
   125         -    add_srs_wkt (p, 9,
   126         -        "AMETER[\"latitude_of_origin\",22.31213333333334],PARAMET");
   127         -    add_srs_wkt (p, 10,
   128         -        "ER[\"central_meridian\",114.1785555555556],PARAMETER[\"s");
   129         -    add_srs_wkt (p, 11,
   130         -        "cale_factor\",1],PARAMETER[\"false_easting\",836694.05],");
   131         -    add_srs_wkt (p, 12,
   132         -        "PARAMETER[\"false_northing\",819069.8],UNIT[\"metre\",1,");
   133         -    add_srs_wkt (p, 13,
   134         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Northing\",NORTH],A");
          114  +        "84[-162.619,-276.959,-161.764,0.067753,-2.24365,-1.15883");
          115  +    add_srs_wkt (p, 4,
          116  +        ",-1.09425],AUTHORITY[\"EPSG\",\"6611\"]],PRIMEM[\"Greenw");
          117  +    add_srs_wkt (p, 5,
          118  +        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
          119  +    add_srs_wkt (p, 6,
          120  +        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
          121  +    add_srs_wkt (p, 7,
          122  +        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
          123  +    add_srs_wkt (p, 8,
          124  +        "G\",\"4611\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
          125  +    add_srs_wkt (p, 9,
          126  +        "ETER[\"latitude_of_origin\",22.31213333333334],PARAMETER");
          127  +    add_srs_wkt (p, 10,
          128  +        "[\"central_meridian\",114.1785555555556],PARAMETER[\"sca");
          129  +    add_srs_wkt (p, 11,
          130  +        "le_factor\",1],PARAMETER[\"false_easting\",836694.05],PA");
          131  +    add_srs_wkt (p, 12,
          132  +        "RAMETER[\"false_northing\",819069.8],UNIT[\"metre\",1,AU");
          133  +    add_srs_wkt (p, 13,
          134  +        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"Northing\",NORTH],AXI");
   135    135       add_srs_wkt (p, 14,
   136         -        "XIS[\"Easting\",EAST],AUTHORITY[\"EPSG\",\"2326\"]]");
          136  +        "S[\"Easting\",EAST],AUTHORITY[\"EPSG\",\"2326\"]]");
   137    137       p = add_epsg_def_ex (filter, first, last, 2327, "epsg", 2327,
   138    138           "Xian 1980 / Gauss-Kruger zone 13", 0, 1,
   139    139           "IAG 1975", "Greenwich",
   140    140           "Xian_1980", "Transverse_Mercator", "metre",
   141    141           "X", "North", "Y", "East");
   142    142       add_proj4text (p, 0,
   143    143           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=13500000 +y_0=0");

Changes to src/srsinit/epsg_inlined_04.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1475   1475           "Pulkovo 1995 / Gauss-Kruger CM 21E", 0, 1,
  1476   1476           "Krassowsky 1940", "Greenwich",
  1477   1477           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1478   1478           "X", "North", "Y", "East");
  1479   1479       add_proj4text (p, 0,
  1480   1480           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
  1481   1481       add_proj4text (p, 1,
  1482         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1482  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1483   1483       add_proj4text (p, 2,
  1484         -        " +units=m +no_defs");
         1484  +        "22 +units=m +no_defs");
  1485   1485       add_srs_wkt (p, 0,
  1486   1486           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 21E\",GEOGCS[\"P");
  1487   1487       add_srs_wkt (p, 1,
  1488   1488           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1489   1489       add_srs_wkt (p, 2,
  1490   1490           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1491   1491       add_srs_wkt (p, 3,
  1492         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1493         -    add_srs_wkt (p, 4,
  1494         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1495         -    add_srs_wkt (p, 5,
  1496         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1497         -    add_srs_wkt (p, 6,
  1498         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1499         -    add_srs_wkt (p, 7,
  1500         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1501         -    add_srs_wkt (p, 8,
  1502         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1503         -    add_srs_wkt (p, 9,
  1504         -        "n\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"sc");
  1505         -    add_srs_wkt (p, 10,
  1506         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1507         -    add_srs_wkt (p, 11,
  1508         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1509         -    add_srs_wkt (p, 12,
  1510         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1511         -    add_srs_wkt (p, 13,
  1512         -        "HORITY[\"EPSG\",\"2463\"]]");
         1492  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1493  +    add_srs_wkt (p, 4,
         1494  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1495  +    add_srs_wkt (p, 5,
         1496  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1497  +    add_srs_wkt (p, 6,
         1498  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1499  +    add_srs_wkt (p, 7,
         1500  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1501  +    add_srs_wkt (p, 8,
         1502  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1503  +    add_srs_wkt (p, 9,
         1504  +        "in\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"s");
         1505  +    add_srs_wkt (p, 10,
         1506  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1507  +    add_srs_wkt (p, 11,
         1508  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1509  +    add_srs_wkt (p, 12,
         1510  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1511  +    add_srs_wkt (p, 13,
         1512  +        "UTHORITY[\"EPSG\",\"2463\"]]");
  1513   1513       p = add_epsg_def_ex (filter, first, last, 2464, "epsg", 2464,
  1514   1514           "Pulkovo 1995 / Gauss-Kruger CM 27E", 0, 1,
  1515   1515           "Krassowsky 1940", "Greenwich",
  1516   1516           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1517   1517           "X", "North", "Y", "East");
  1518   1518       add_proj4text (p, 0,
  1519   1519           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
  1520   1520       add_proj4text (p, 1,
  1521         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1521  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1522   1522       add_proj4text (p, 2,
  1523         -        " +units=m +no_defs");
         1523  +        "22 +units=m +no_defs");
  1524   1524       add_srs_wkt (p, 0,
  1525   1525           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 27E\",GEOGCS[\"P");
  1526   1526       add_srs_wkt (p, 1,
  1527   1527           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1528   1528       add_srs_wkt (p, 2,
  1529   1529           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1530   1530       add_srs_wkt (p, 3,
  1531         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1532         -    add_srs_wkt (p, 4,
  1533         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1534         -    add_srs_wkt (p, 5,
  1535         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1536         -    add_srs_wkt (p, 6,
  1537         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1538         -    add_srs_wkt (p, 7,
  1539         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1540         -    add_srs_wkt (p, 8,
  1541         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1542         -    add_srs_wkt (p, 9,
  1543         -        "n\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"sc");
  1544         -    add_srs_wkt (p, 10,
  1545         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1546         -    add_srs_wkt (p, 11,
  1547         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1548         -    add_srs_wkt (p, 12,
  1549         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1550         -    add_srs_wkt (p, 13,
  1551         -        "HORITY[\"EPSG\",\"2464\"]]");
         1531  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1532  +    add_srs_wkt (p, 4,
         1533  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1534  +    add_srs_wkt (p, 5,
         1535  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1536  +    add_srs_wkt (p, 6,
         1537  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1538  +    add_srs_wkt (p, 7,
         1539  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1540  +    add_srs_wkt (p, 8,
         1541  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1542  +    add_srs_wkt (p, 9,
         1543  +        "in\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"s");
         1544  +    add_srs_wkt (p, 10,
         1545  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1546  +    add_srs_wkt (p, 11,
         1547  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1548  +    add_srs_wkt (p, 12,
         1549  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1550  +    add_srs_wkt (p, 13,
         1551  +        "UTHORITY[\"EPSG\",\"2464\"]]");
  1552   1552       p = add_epsg_def_ex (filter, first, last, 2465, "epsg", 2465,
  1553   1553           "Pulkovo 1995 / Gauss-Kruger CM 33E", 0, 1,
  1554   1554           "Krassowsky 1940", "Greenwich",
  1555   1555           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1556   1556           "X", "North", "Y", "East");
  1557   1557       add_proj4text (p, 0,
  1558   1558           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
  1559   1559       add_proj4text (p, 1,
  1560         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1560  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1561   1561       add_proj4text (p, 2,
  1562         -        " +units=m +no_defs");
         1562  +        "22 +units=m +no_defs");
  1563   1563       add_srs_wkt (p, 0,
  1564   1564           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 33E\",GEOGCS[\"P");
  1565   1565       add_srs_wkt (p, 1,
  1566   1566           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1567   1567       add_srs_wkt (p, 2,
  1568   1568           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1569   1569       add_srs_wkt (p, 3,
  1570         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1571         -    add_srs_wkt (p, 4,
  1572         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1573         -    add_srs_wkt (p, 5,
  1574         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1575         -    add_srs_wkt (p, 6,
  1576         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1577         -    add_srs_wkt (p, 7,
  1578         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1579         -    add_srs_wkt (p, 8,
  1580         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1581         -    add_srs_wkt (p, 9,
  1582         -        "n\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"sc");
  1583         -    add_srs_wkt (p, 10,
  1584         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1585         -    add_srs_wkt (p, 11,
  1586         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1587         -    add_srs_wkt (p, 12,
  1588         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1589         -    add_srs_wkt (p, 13,
  1590         -        "HORITY[\"EPSG\",\"2465\"]]");
         1570  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1571  +    add_srs_wkt (p, 4,
         1572  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1573  +    add_srs_wkt (p, 5,
         1574  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1575  +    add_srs_wkt (p, 6,
         1576  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1577  +    add_srs_wkt (p, 7,
         1578  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1579  +    add_srs_wkt (p, 8,
         1580  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1581  +    add_srs_wkt (p, 9,
         1582  +        "in\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"s");
         1583  +    add_srs_wkt (p, 10,
         1584  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1585  +    add_srs_wkt (p, 11,
         1586  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1587  +    add_srs_wkt (p, 12,
         1588  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1589  +    add_srs_wkt (p, 13,
         1590  +        "UTHORITY[\"EPSG\",\"2465\"]]");
  1591   1591       p = add_epsg_def_ex (filter, first, last, 2466, "epsg", 2466,
  1592   1592           "Pulkovo 1995 / Gauss-Kruger CM 39E", 0, 1,
  1593   1593           "Krassowsky 1940", "Greenwich",
  1594   1594           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1595   1595           "X", "North", "Y", "East");
  1596   1596       add_proj4text (p, 0,
  1597   1597           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
  1598   1598       add_proj4text (p, 1,
  1599         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1599  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1600   1600       add_proj4text (p, 2,
  1601         -        " +units=m +no_defs");
         1601  +        "22 +units=m +no_defs");
  1602   1602       add_srs_wkt (p, 0,
  1603   1603           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 39E\",GEOGCS[\"P");
  1604   1604       add_srs_wkt (p, 1,
  1605   1605           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1606   1606       add_srs_wkt (p, 2,
  1607   1607           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1608   1608       add_srs_wkt (p, 3,
  1609         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1610         -    add_srs_wkt (p, 4,
  1611         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1612         -    add_srs_wkt (p, 5,
  1613         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1614         -    add_srs_wkt (p, 6,
  1615         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1616         -    add_srs_wkt (p, 7,
  1617         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1618         -    add_srs_wkt (p, 8,
  1619         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1620         -    add_srs_wkt (p, 9,
  1621         -        "n\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"sc");
  1622         -    add_srs_wkt (p, 10,
  1623         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1624         -    add_srs_wkt (p, 11,
  1625         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1626         -    add_srs_wkt (p, 12,
  1627         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1628         -    add_srs_wkt (p, 13,
  1629         -        "HORITY[\"EPSG\",\"2466\"]]");
         1609  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1610  +    add_srs_wkt (p, 4,
         1611  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1612  +    add_srs_wkt (p, 5,
         1613  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1614  +    add_srs_wkt (p, 6,
         1615  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1616  +    add_srs_wkt (p, 7,
         1617  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1618  +    add_srs_wkt (p, 8,
         1619  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1620  +    add_srs_wkt (p, 9,
         1621  +        "in\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"s");
         1622  +    add_srs_wkt (p, 10,
         1623  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1624  +    add_srs_wkt (p, 11,
         1625  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1626  +    add_srs_wkt (p, 12,
         1627  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1628  +    add_srs_wkt (p, 13,
         1629  +        "UTHORITY[\"EPSG\",\"2466\"]]");
  1630   1630       p = add_epsg_def_ex (filter, first, last, 2467, "epsg", 2467,
  1631   1631           "Pulkovo 1995 / Gauss-Kruger CM 45E", 0, 1,
  1632   1632           "Krassowsky 1940", "Greenwich",
  1633   1633           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1634   1634           "X", "North", "Y", "East");
  1635   1635       add_proj4text (p, 0,
  1636   1636           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
  1637   1637       add_proj4text (p, 1,
  1638         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1638  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1639   1639       add_proj4text (p, 2,
  1640         -        " +units=m +no_defs");
         1640  +        "22 +units=m +no_defs");
  1641   1641       add_srs_wkt (p, 0,
  1642   1642           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 45E\",GEOGCS[\"P");
  1643   1643       add_srs_wkt (p, 1,
  1644   1644           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1645   1645       add_srs_wkt (p, 2,
  1646   1646           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1647   1647       add_srs_wkt (p, 3,
  1648         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1649         -    add_srs_wkt (p, 4,
  1650         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1651         -    add_srs_wkt (p, 5,
  1652         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1653         -    add_srs_wkt (p, 6,
  1654         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1655         -    add_srs_wkt (p, 7,
  1656         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1657         -    add_srs_wkt (p, 8,
  1658         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1659         -    add_srs_wkt (p, 9,
  1660         -        "n\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"sc");
  1661         -    add_srs_wkt (p, 10,
  1662         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1663         -    add_srs_wkt (p, 11,
  1664         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1665         -    add_srs_wkt (p, 12,
  1666         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1667         -    add_srs_wkt (p, 13,
  1668         -        "HORITY[\"EPSG\",\"2467\"]]");
         1648  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1649  +    add_srs_wkt (p, 4,
         1650  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1651  +    add_srs_wkt (p, 5,
         1652  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1653  +    add_srs_wkt (p, 6,
         1654  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1655  +    add_srs_wkt (p, 7,
         1656  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1657  +    add_srs_wkt (p, 8,
         1658  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1659  +    add_srs_wkt (p, 9,
         1660  +        "in\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"s");
         1661  +    add_srs_wkt (p, 10,
         1662  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1663  +    add_srs_wkt (p, 11,
         1664  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1665  +    add_srs_wkt (p, 12,
         1666  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1667  +    add_srs_wkt (p, 13,
         1668  +        "UTHORITY[\"EPSG\",\"2467\"]]");
  1669   1669       p = add_epsg_def_ex (filter, first, last, 2468, "epsg", 2468,
  1670   1670           "Pulkovo 1995 / Gauss-Kruger CM 51E", 0, 1,
  1671   1671           "Krassowsky 1940", "Greenwich",
  1672   1672           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1673   1673           "X", "North", "Y", "East");
  1674   1674       add_proj4text (p, 0,
  1675   1675           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
  1676   1676       add_proj4text (p, 1,
  1677         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1677  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1678   1678       add_proj4text (p, 2,
  1679         -        " +units=m +no_defs");
         1679  +        "22 +units=m +no_defs");
  1680   1680       add_srs_wkt (p, 0,
  1681   1681           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 51E\",GEOGCS[\"P");
  1682   1682       add_srs_wkt (p, 1,
  1683   1683           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1684   1684       add_srs_wkt (p, 2,
  1685   1685           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1686   1686       add_srs_wkt (p, 3,
  1687         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1688         -    add_srs_wkt (p, 4,
  1689         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1690         -    add_srs_wkt (p, 5,
  1691         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1692         -    add_srs_wkt (p, 6,
  1693         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1694         -    add_srs_wkt (p, 7,
  1695         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1696         -    add_srs_wkt (p, 8,
  1697         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1698         -    add_srs_wkt (p, 9,
  1699         -        "n\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"sc");
  1700         -    add_srs_wkt (p, 10,
  1701         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1702         -    add_srs_wkt (p, 11,
  1703         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1704         -    add_srs_wkt (p, 12,
  1705         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1706         -    add_srs_wkt (p, 13,
  1707         -        "HORITY[\"EPSG\",\"2468\"]]");
         1687  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1688  +    add_srs_wkt (p, 4,
         1689  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1690  +    add_srs_wkt (p, 5,
         1691  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1692  +    add_srs_wkt (p, 6,
         1693  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1694  +    add_srs_wkt (p, 7,
         1695  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1696  +    add_srs_wkt (p, 8,
         1697  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1698  +    add_srs_wkt (p, 9,
         1699  +        "in\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"s");
         1700  +    add_srs_wkt (p, 10,
         1701  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1702  +    add_srs_wkt (p, 11,
         1703  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1704  +    add_srs_wkt (p, 12,
         1705  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1706  +    add_srs_wkt (p, 13,
         1707  +        "UTHORITY[\"EPSG\",\"2468\"]]");
  1708   1708       p = add_epsg_def_ex (filter, first, last, 2469, "epsg", 2469,
  1709   1709           "Pulkovo 1995 / Gauss-Kruger CM 57E", 0, 1,
  1710   1710           "Krassowsky 1940", "Greenwich",
  1711   1711           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1712   1712           "X", "North", "Y", "East");
  1713   1713       add_proj4text (p, 0,
  1714   1714           "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
  1715   1715       add_proj4text (p, 1,
  1716         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1716  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1717   1717       add_proj4text (p, 2,
  1718         -        " +units=m +no_defs");
         1718  +        "22 +units=m +no_defs");
  1719   1719       add_srs_wkt (p, 0,
  1720   1720           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 57E\",GEOGCS[\"P");
  1721   1721       add_srs_wkt (p, 1,
  1722   1722           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1723   1723       add_srs_wkt (p, 2,
  1724   1724           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1725   1725       add_srs_wkt (p, 3,
  1726         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1727         -    add_srs_wkt (p, 4,
  1728         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1729         -    add_srs_wkt (p, 5,
  1730         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1731         -    add_srs_wkt (p, 6,
  1732         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1733         -    add_srs_wkt (p, 7,
  1734         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1735         -    add_srs_wkt (p, 8,
  1736         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1737         -    add_srs_wkt (p, 9,
  1738         -        "n\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"sc");
  1739         -    add_srs_wkt (p, 10,
  1740         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1741         -    add_srs_wkt (p, 11,
  1742         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1743         -    add_srs_wkt (p, 12,
  1744         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1745         -    add_srs_wkt (p, 13,
  1746         -        "HORITY[\"EPSG\",\"2469\"]]");
         1726  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1727  +    add_srs_wkt (p, 4,
         1728  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1729  +    add_srs_wkt (p, 5,
         1730  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1731  +    add_srs_wkt (p, 6,
         1732  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1733  +    add_srs_wkt (p, 7,
         1734  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1735  +    add_srs_wkt (p, 8,
         1736  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1737  +    add_srs_wkt (p, 9,
         1738  +        "in\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"s");
         1739  +    add_srs_wkt (p, 10,
         1740  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1741  +    add_srs_wkt (p, 11,
         1742  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1743  +    add_srs_wkt (p, 12,
         1744  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1745  +    add_srs_wkt (p, 13,
         1746  +        "UTHORITY[\"EPSG\",\"2469\"]]");
  1747   1747       p = add_epsg_def_ex (filter, first, last, 2470, "epsg", 2470,
  1748   1748           "Pulkovo 1995 / Gauss-Kruger CM 63E", 0, 1,
  1749   1749           "Krassowsky 1940", "Greenwich",
  1750   1750           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1751   1751           "X", "North", "Y", "East");
  1752   1752       add_proj4text (p, 0,
  1753   1753           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
  1754   1754       add_proj4text (p, 1,
  1755         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1755  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1756   1756       add_proj4text (p, 2,
  1757         -        " +units=m +no_defs");
         1757  +        "22 +units=m +no_defs");
  1758   1758       add_srs_wkt (p, 0,
  1759   1759           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 63E\",GEOGCS[\"P");
  1760   1760       add_srs_wkt (p, 1,
  1761   1761           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1762   1762       add_srs_wkt (p, 2,
  1763   1763           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1764   1764       add_srs_wkt (p, 3,
  1765         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1766         -    add_srs_wkt (p, 4,
  1767         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1768         -    add_srs_wkt (p, 5,
  1769         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1770         -    add_srs_wkt (p, 6,
  1771         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1772         -    add_srs_wkt (p, 7,
  1773         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1774         -    add_srs_wkt (p, 8,
  1775         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1776         -    add_srs_wkt (p, 9,
  1777         -        "n\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"sc");
  1778         -    add_srs_wkt (p, 10,
  1779         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1780         -    add_srs_wkt (p, 11,
  1781         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1782         -    add_srs_wkt (p, 12,
  1783         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1784         -    add_srs_wkt (p, 13,
  1785         -        "HORITY[\"EPSG\",\"2470\"]]");
         1765  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1766  +    add_srs_wkt (p, 4,
         1767  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1768  +    add_srs_wkt (p, 5,
         1769  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1770  +    add_srs_wkt (p, 6,
         1771  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1772  +    add_srs_wkt (p, 7,
         1773  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1774  +    add_srs_wkt (p, 8,
         1775  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1776  +    add_srs_wkt (p, 9,
         1777  +        "in\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"s");
         1778  +    add_srs_wkt (p, 10,
         1779  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1780  +    add_srs_wkt (p, 11,
         1781  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1782  +    add_srs_wkt (p, 12,
         1783  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1784  +    add_srs_wkt (p, 13,
         1785  +        "UTHORITY[\"EPSG\",\"2470\"]]");
  1786   1786       p = add_epsg_def_ex (filter, first, last, 2471, "epsg", 2471,
  1787   1787           "Pulkovo 1995 / Gauss-Kruger CM 69E", 0, 1,
  1788   1788           "Krassowsky 1940", "Greenwich",
  1789   1789           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1790   1790           "X", "North", "Y", "East");
  1791   1791       add_proj4text (p, 0,
  1792   1792           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  1793   1793       add_proj4text (p, 1,
  1794         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1794  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1795   1795       add_proj4text (p, 2,
  1796         -        " +units=m +no_defs");
         1796  +        "22 +units=m +no_defs");
  1797   1797       add_srs_wkt (p, 0,
  1798   1798           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 69E\",GEOGCS[\"P");
  1799   1799       add_srs_wkt (p, 1,
  1800   1800           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1801   1801       add_srs_wkt (p, 2,
  1802   1802           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1803   1803       add_srs_wkt (p, 3,
  1804         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1805         -    add_srs_wkt (p, 4,
  1806         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1807         -    add_srs_wkt (p, 5,
  1808         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1809         -    add_srs_wkt (p, 6,
  1810         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1811         -    add_srs_wkt (p, 7,
  1812         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1813         -    add_srs_wkt (p, 8,
  1814         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1815         -    add_srs_wkt (p, 9,
  1816         -        "n\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"sc");
  1817         -    add_srs_wkt (p, 10,
  1818         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1819         -    add_srs_wkt (p, 11,
  1820         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1821         -    add_srs_wkt (p, 12,
  1822         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1823         -    add_srs_wkt (p, 13,
  1824         -        "HORITY[\"EPSG\",\"2471\"]]");
         1804  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1805  +    add_srs_wkt (p, 4,
         1806  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1807  +    add_srs_wkt (p, 5,
         1808  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1809  +    add_srs_wkt (p, 6,
         1810  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1811  +    add_srs_wkt (p, 7,
         1812  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1813  +    add_srs_wkt (p, 8,
         1814  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1815  +    add_srs_wkt (p, 9,
         1816  +        "in\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"s");
         1817  +    add_srs_wkt (p, 10,
         1818  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1819  +    add_srs_wkt (p, 11,
         1820  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1821  +    add_srs_wkt (p, 12,
         1822  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1823  +    add_srs_wkt (p, 13,
         1824  +        "UTHORITY[\"EPSG\",\"2471\"]]");
  1825   1825       p = add_epsg_def_ex (filter, first, last, 2472, "epsg", 2472,
  1826   1826           "Pulkovo 1995 / Gauss-Kruger CM 75E", 0, 1,
  1827   1827           "Krassowsky 1940", "Greenwich",
  1828   1828           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1829   1829           "X", "North", "Y", "East");
  1830   1830       add_proj4text (p, 0,
  1831   1831           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  1832   1832       add_proj4text (p, 1,
  1833         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1833  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1834   1834       add_proj4text (p, 2,
  1835         -        " +units=m +no_defs");
         1835  +        "22 +units=m +no_defs");
  1836   1836       add_srs_wkt (p, 0,
  1837   1837           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 75E\",GEOGCS[\"P");
  1838   1838       add_srs_wkt (p, 1,
  1839   1839           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1840   1840       add_srs_wkt (p, 2,
  1841   1841           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1842   1842       add_srs_wkt (p, 3,
  1843         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1844         -    add_srs_wkt (p, 4,
  1845         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1846         -    add_srs_wkt (p, 5,
  1847         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1848         -    add_srs_wkt (p, 6,
  1849         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1850         -    add_srs_wkt (p, 7,
  1851         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1852         -    add_srs_wkt (p, 8,
  1853         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1854         -    add_srs_wkt (p, 9,
  1855         -        "n\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"sc");
  1856         -    add_srs_wkt (p, 10,
  1857         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1858         -    add_srs_wkt (p, 11,
  1859         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1860         -    add_srs_wkt (p, 12,
  1861         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1862         -    add_srs_wkt (p, 13,
  1863         -        "HORITY[\"EPSG\",\"2472\"]]");
         1843  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1844  +    add_srs_wkt (p, 4,
         1845  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1846  +    add_srs_wkt (p, 5,
         1847  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1848  +    add_srs_wkt (p, 6,
         1849  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1850  +    add_srs_wkt (p, 7,
         1851  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1852  +    add_srs_wkt (p, 8,
         1853  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1854  +    add_srs_wkt (p, 9,
         1855  +        "in\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"s");
         1856  +    add_srs_wkt (p, 10,
         1857  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1858  +    add_srs_wkt (p, 11,
         1859  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1860  +    add_srs_wkt (p, 12,
         1861  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1862  +    add_srs_wkt (p, 13,
         1863  +        "UTHORITY[\"EPSG\",\"2472\"]]");
  1864   1864       p = add_epsg_def_ex (filter, first, last, 2473, "epsg", 2473,
  1865   1865           "Pulkovo 1995 / Gauss-Kruger CM 81E", 0, 1,
  1866   1866           "Krassowsky 1940", "Greenwich",
  1867   1867           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1868   1868           "X", "North", "Y", "East");
  1869   1869       add_proj4text (p, 0,
  1870   1870           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
  1871   1871       add_proj4text (p, 1,
  1872         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1872  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1873   1873       add_proj4text (p, 2,
  1874         -        " +units=m +no_defs");
         1874  +        "22 +units=m +no_defs");
  1875   1875       add_srs_wkt (p, 0,
  1876   1876           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 81E\",GEOGCS[\"P");
  1877   1877       add_srs_wkt (p, 1,
  1878   1878           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1879   1879       add_srs_wkt (p, 2,
  1880   1880           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1881   1881       add_srs_wkt (p, 3,
  1882         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1883         -    add_srs_wkt (p, 4,
  1884         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1885         -    add_srs_wkt (p, 5,
  1886         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1887         -    add_srs_wkt (p, 6,
  1888         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1889         -    add_srs_wkt (p, 7,
  1890         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1891         -    add_srs_wkt (p, 8,
  1892         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1893         -    add_srs_wkt (p, 9,
  1894         -        "n\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"sc");
  1895         -    add_srs_wkt (p, 10,
  1896         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1897         -    add_srs_wkt (p, 11,
  1898         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1899         -    add_srs_wkt (p, 12,
  1900         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1901         -    add_srs_wkt (p, 13,
  1902         -        "HORITY[\"EPSG\",\"2473\"]]");
         1882  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1883  +    add_srs_wkt (p, 4,
         1884  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1885  +    add_srs_wkt (p, 5,
         1886  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1887  +    add_srs_wkt (p, 6,
         1888  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1889  +    add_srs_wkt (p, 7,
         1890  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1891  +    add_srs_wkt (p, 8,
         1892  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1893  +    add_srs_wkt (p, 9,
         1894  +        "in\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"s");
         1895  +    add_srs_wkt (p, 10,
         1896  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1897  +    add_srs_wkt (p, 11,
         1898  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1899  +    add_srs_wkt (p, 12,
         1900  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1901  +    add_srs_wkt (p, 13,
         1902  +        "UTHORITY[\"EPSG\",\"2473\"]]");
  1903   1903       p = add_epsg_def_ex (filter, first, last, 2474, "epsg", 2474,
  1904   1904           "Pulkovo 1995 / Gauss-Kruger CM 87E", 0, 1,
  1905   1905           "Krassowsky 1940", "Greenwich",
  1906   1906           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1907   1907           "X", "North", "Y", "East");
  1908   1908       add_proj4text (p, 0,
  1909   1909           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
  1910   1910       add_proj4text (p, 1,
  1911         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1911  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1912   1912       add_proj4text (p, 2,
  1913         -        " +units=m +no_defs");
         1913  +        "22 +units=m +no_defs");
  1914   1914       add_srs_wkt (p, 0,
  1915   1915           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 87E\",GEOGCS[\"P");
  1916   1916       add_srs_wkt (p, 1,
  1917   1917           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1918   1918       add_srs_wkt (p, 2,
  1919   1919           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1920   1920       add_srs_wkt (p, 3,
  1921         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1922         -    add_srs_wkt (p, 4,
  1923         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1924         -    add_srs_wkt (p, 5,
  1925         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1926         -    add_srs_wkt (p, 6,
  1927         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1928         -    add_srs_wkt (p, 7,
  1929         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1930         -    add_srs_wkt (p, 8,
  1931         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1932         -    add_srs_wkt (p, 9,
  1933         -        "n\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"sc");
  1934         -    add_srs_wkt (p, 10,
  1935         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1936         -    add_srs_wkt (p, 11,
  1937         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1938         -    add_srs_wkt (p, 12,
  1939         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1940         -    add_srs_wkt (p, 13,
  1941         -        "HORITY[\"EPSG\",\"2474\"]]");
         1921  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1922  +    add_srs_wkt (p, 4,
         1923  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1924  +    add_srs_wkt (p, 5,
         1925  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1926  +    add_srs_wkt (p, 6,
         1927  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1928  +    add_srs_wkt (p, 7,
         1929  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1930  +    add_srs_wkt (p, 8,
         1931  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1932  +    add_srs_wkt (p, 9,
         1933  +        "in\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"s");
         1934  +    add_srs_wkt (p, 10,
         1935  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1936  +    add_srs_wkt (p, 11,
         1937  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1938  +    add_srs_wkt (p, 12,
         1939  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1940  +    add_srs_wkt (p, 13,
         1941  +        "UTHORITY[\"EPSG\",\"2474\"]]");
  1942   1942       p = add_epsg_def_ex (filter, first, last, 2475, "epsg", 2475,
  1943   1943           "Pulkovo 1995 / Gauss-Kruger CM 93E", 0, 1,
  1944   1944           "Krassowsky 1940", "Greenwich",
  1945   1945           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1946   1946           "X", "North", "Y", "East");
  1947   1947       add_proj4text (p, 0,
  1948   1948           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
  1949   1949       add_proj4text (p, 1,
  1950         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1950  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1951   1951       add_proj4text (p, 2,
  1952         -        " +units=m +no_defs");
         1952  +        "22 +units=m +no_defs");
  1953   1953       add_srs_wkt (p, 0,
  1954   1954           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 93E\",GEOGCS[\"P");
  1955   1955       add_srs_wkt (p, 1,
  1956   1956           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1957   1957       add_srs_wkt (p, 2,
  1958   1958           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1959   1959       add_srs_wkt (p, 3,
  1960         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  1961         -    add_srs_wkt (p, 4,
  1962         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1963         -    add_srs_wkt (p, 5,
  1964         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1965         -    add_srs_wkt (p, 6,
  1966         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1967         -    add_srs_wkt (p, 7,
  1968         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  1969         -    add_srs_wkt (p, 8,
  1970         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  1971         -    add_srs_wkt (p, 9,
  1972         -        "n\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"sc");
  1973         -    add_srs_wkt (p, 10,
  1974         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  1975         -    add_srs_wkt (p, 11,
  1976         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  1977         -    add_srs_wkt (p, 12,
  1978         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  1979         -    add_srs_wkt (p, 13,
  1980         -        "HORITY[\"EPSG\",\"2475\"]]");
         1960  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         1961  +    add_srs_wkt (p, 4,
         1962  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         1963  +    add_srs_wkt (p, 5,
         1964  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         1965  +    add_srs_wkt (p, 6,
         1966  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         1967  +    add_srs_wkt (p, 7,
         1968  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         1969  +    add_srs_wkt (p, 8,
         1970  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         1971  +    add_srs_wkt (p, 9,
         1972  +        "in\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"s");
         1973  +    add_srs_wkt (p, 10,
         1974  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         1975  +    add_srs_wkt (p, 11,
         1976  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         1977  +    add_srs_wkt (p, 12,
         1978  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         1979  +    add_srs_wkt (p, 13,
         1980  +        "UTHORITY[\"EPSG\",\"2475\"]]");
  1981   1981       p = add_epsg_def_ex (filter, first, last, 2476, "epsg", 2476,
  1982   1982           "Pulkovo 1995 / Gauss-Kruger CM 99E", 0, 1,
  1983   1983           "Krassowsky 1940", "Greenwich",
  1984   1984           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1985   1985           "X", "North", "Y", "East");
  1986   1986       add_proj4text (p, 0,
  1987   1987           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
  1988   1988       add_proj4text (p, 1,
  1989         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
         1989  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1990   1990       add_proj4text (p, 2,
  1991         -        " +units=m +no_defs");
         1991  +        "22 +units=m +no_defs");
  1992   1992       add_srs_wkt (p, 0,
  1993   1993           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 99E\",GEOGCS[\"P");
  1994   1994       add_srs_wkt (p, 1,
  1995   1995           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  1996   1996       add_srs_wkt (p, 2,
  1997   1997           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  1998   1998       add_srs_wkt (p, 3,
  1999         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  2000         -    add_srs_wkt (p, 4,
  2001         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  2002         -    add_srs_wkt (p, 5,
  2003         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  2004         -    add_srs_wkt (p, 6,
  2005         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  2006         -    add_srs_wkt (p, 7,
  2007         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  2008         -    add_srs_wkt (p, 8,
  2009         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  2010         -    add_srs_wkt (p, 9,
  2011         -        "n\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"sc");
  2012         -    add_srs_wkt (p, 10,
  2013         -        "ale_factor\",1],PARAMETER[\"false_easting\",500000],PARA");
  2014         -    add_srs_wkt (p, 11,
  2015         -        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
  2016         -    add_srs_wkt (p, 12,
  2017         -        "EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUT");
  2018         -    add_srs_wkt (p, 13,
  2019         -        "HORITY[\"EPSG\",\"2476\"]]");
  2020         -    p = add_epsg_def_ex (filter, first, last, 2477, "epsg", 2477,
  2021         -        "Pulkovo 1995 / Gauss-Kruger CM 105E", 0, 1,
  2022         -        "Krassowsky 1940", "Greenwich",
  2023         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2024         -        "X", "North", "Y", "East");
  2025         -    add_proj4text (p, 0,
  2026         -        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
  2027         -    add_proj4text (p, 1,
  2028         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
  2029         -    add_proj4text (p, 2,
  2030         -        "2 +units=m +no_defs");
  2031         -    add_srs_wkt (p, 0,
  2032         -        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 105E\",GEOGCS[\"");
  2033         -    add_srs_wkt (p, 1,
  2034         -        "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2035         -    add_srs_wkt (p, 2,
  2036         -        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2037         -    add_srs_wkt (p, 3,
  2038         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         1999  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
  2039   2000       add_srs_wkt (p, 4,
  2040   2001           "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2041   2002       add_srs_wkt (p, 5,
  2042   2003           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2043   2004       add_srs_wkt (p, 6,
  2044   2005           "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2045   2006       add_srs_wkt (p, 7,
  2046   2007           "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2047   2008       add_srs_wkt (p, 8,
  2048   2009           "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2049   2010       add_srs_wkt (p, 9,
  2050         -        "in\",0],PARAMETER[\"central_meridian\",105],PARAMETER[\"");
  2051         -    add_srs_wkt (p, 10,
  2052         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2053         -    add_srs_wkt (p, 11,
  2054         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2055         -    add_srs_wkt (p, 12,
  2056         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2057         -    add_srs_wkt (p, 13,
  2058         -        "AUTHORITY[\"EPSG\",\"2477\"]]");
         2011  +        "in\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"s");
         2012  +    add_srs_wkt (p, 10,
         2013  +        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
         2014  +    add_srs_wkt (p, 11,
         2015  +        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
         2016  +    add_srs_wkt (p, 12,
         2017  +        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
         2018  +    add_srs_wkt (p, 13,
         2019  +        "UTHORITY[\"EPSG\",\"2476\"]]");
         2020  +    p = add_epsg_def_ex (filter, first, last, 2477, "epsg", 2477,
         2021  +        "Pulkovo 1995 / Gauss-Kruger CM 105E", 0, 1,
         2022  +        "Krassowsky 1940", "Greenwich",
         2023  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2024  +        "X", "North", "Y", "East");
         2025  +    add_proj4text (p, 0,
         2026  +        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
         2027  +    add_proj4text (p, 1,
         2028  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
         2029  +    add_proj4text (p, 2,
         2030  +        ".22 +units=m +no_defs");
         2031  +    add_srs_wkt (p, 0,
         2032  +        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 105E\",GEOGCS[\"");
         2033  +    add_srs_wkt (p, 1,
         2034  +        "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
         2035  +    add_srs_wkt (p, 2,
         2036  +        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
         2037  +    add_srs_wkt (p, 3,
         2038  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2039  +    add_srs_wkt (p, 4,
         2040  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2041  +    add_srs_wkt (p, 5,
         2042  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2043  +    add_srs_wkt (p, 6,
         2044  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2045  +    add_srs_wkt (p, 7,
         2046  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2047  +    add_srs_wkt (p, 8,
         2048  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2049  +    add_srs_wkt (p, 9,
         2050  +        "igin\",0],PARAMETER[\"central_meridian\",105],PARAMETER[");
         2051  +    add_srs_wkt (p, 10,
         2052  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2053  +    add_srs_wkt (p, 11,
         2054  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2055  +    add_srs_wkt (p, 12,
         2056  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2057  +    add_srs_wkt (p, 13,
         2058  +        "],AUTHORITY[\"EPSG\",\"2477\"]]");
  2059   2059       p = add_epsg_def_ex (filter, first, last, 2478, "epsg", 2478,
  2060   2060           "Pulkovo 1995 / Gauss-Kruger CM 111E", 0, 1,
  2061   2061           "Krassowsky 1940", "Greenwich",
  2062   2062           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2063   2063           "X", "North", "Y", "East");
  2064   2064       add_proj4text (p, 0,
  2065   2065           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
  2066   2066       add_proj4text (p, 1,
  2067         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2067  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2068   2068       add_proj4text (p, 2,
  2069         -        "2 +units=m +no_defs");
         2069  +        ".22 +units=m +no_defs");
  2070   2070       add_srs_wkt (p, 0,
  2071   2071           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 111E\",GEOGCS[\"");
  2072   2072       add_srs_wkt (p, 1,
  2073   2073           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2074   2074       add_srs_wkt (p, 2,
  2075   2075           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2076   2076       add_srs_wkt (p, 3,
  2077         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2078         -    add_srs_wkt (p, 4,
  2079         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2080         -    add_srs_wkt (p, 5,
  2081         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2082         -    add_srs_wkt (p, 6,
  2083         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2084         -    add_srs_wkt (p, 7,
  2085         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2086         -    add_srs_wkt (p, 8,
  2087         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2088         -    add_srs_wkt (p, 9,
  2089         -        "in\",0],PARAMETER[\"central_meridian\",111],PARAMETER[\"");
  2090         -    add_srs_wkt (p, 10,
  2091         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2092         -    add_srs_wkt (p, 11,
  2093         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2094         -    add_srs_wkt (p, 12,
  2095         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2096         -    add_srs_wkt (p, 13,
  2097         -        "AUTHORITY[\"EPSG\",\"2478\"]]");
         2077  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2078  +    add_srs_wkt (p, 4,
         2079  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2080  +    add_srs_wkt (p, 5,
         2081  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2082  +    add_srs_wkt (p, 6,
         2083  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2084  +    add_srs_wkt (p, 7,
         2085  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2086  +    add_srs_wkt (p, 8,
         2087  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2088  +    add_srs_wkt (p, 9,
         2089  +        "igin\",0],PARAMETER[\"central_meridian\",111],PARAMETER[");
         2090  +    add_srs_wkt (p, 10,
         2091  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2092  +    add_srs_wkt (p, 11,
         2093  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2094  +    add_srs_wkt (p, 12,
         2095  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2096  +    add_srs_wkt (p, 13,
         2097  +        "],AUTHORITY[\"EPSG\",\"2478\"]]");
  2098   2098       p = add_epsg_def_ex (filter, first, last, 2479, "epsg", 2479,
  2099   2099           "Pulkovo 1995 / Gauss-Kruger CM 117E", 0, 1,
  2100   2100           "Krassowsky 1940", "Greenwich",
  2101   2101           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2102   2102           "X", "North", "Y", "East");
  2103   2103       add_proj4text (p, 0,
  2104   2104           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
  2105   2105       add_proj4text (p, 1,
  2106         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2106  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2107   2107       add_proj4text (p, 2,
  2108         -        "2 +units=m +no_defs");
         2108  +        ".22 +units=m +no_defs");
  2109   2109       add_srs_wkt (p, 0,
  2110   2110           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 117E\",GEOGCS[\"");
  2111   2111       add_srs_wkt (p, 1,
  2112   2112           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2113   2113       add_srs_wkt (p, 2,
  2114   2114           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2115   2115       add_srs_wkt (p, 3,
  2116         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2117         -    add_srs_wkt (p, 4,
  2118         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2119         -    add_srs_wkt (p, 5,
  2120         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2121         -    add_srs_wkt (p, 6,
  2122         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2123         -    add_srs_wkt (p, 7,
  2124         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2125         -    add_srs_wkt (p, 8,
  2126         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2127         -    add_srs_wkt (p, 9,
  2128         -        "in\",0],PARAMETER[\"central_meridian\",117],PARAMETER[\"");
  2129         -    add_srs_wkt (p, 10,
  2130         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2131         -    add_srs_wkt (p, 11,
  2132         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2133         -    add_srs_wkt (p, 12,
  2134         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2135         -    add_srs_wkt (p, 13,
  2136         -        "AUTHORITY[\"EPSG\",\"2479\"]]");
         2116  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2117  +    add_srs_wkt (p, 4,
         2118  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2119  +    add_srs_wkt (p, 5,
         2120  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2121  +    add_srs_wkt (p, 6,
         2122  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2123  +    add_srs_wkt (p, 7,
         2124  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2125  +    add_srs_wkt (p, 8,
         2126  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2127  +    add_srs_wkt (p, 9,
         2128  +        "igin\",0],PARAMETER[\"central_meridian\",117],PARAMETER[");
         2129  +    add_srs_wkt (p, 10,
         2130  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2131  +    add_srs_wkt (p, 11,
         2132  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2133  +    add_srs_wkt (p, 12,
         2134  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2135  +    add_srs_wkt (p, 13,
         2136  +        "],AUTHORITY[\"EPSG\",\"2479\"]]");
  2137   2137       p = add_epsg_def_ex (filter, first, last, 2480, "epsg", 2480,
  2138   2138           "Pulkovo 1995 / Gauss-Kruger CM 123E", 0, 1,
  2139   2139           "Krassowsky 1940", "Greenwich",
  2140   2140           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2141   2141           "X", "North", "Y", "East");
  2142   2142       add_proj4text (p, 0,
  2143   2143           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
  2144   2144       add_proj4text (p, 1,
  2145         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2145  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2146   2146       add_proj4text (p, 2,
  2147         -        "2 +units=m +no_defs");
         2147  +        ".22 +units=m +no_defs");
  2148   2148       add_srs_wkt (p, 0,
  2149   2149           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 123E\",GEOGCS[\"");
  2150   2150       add_srs_wkt (p, 1,
  2151   2151           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2152   2152       add_srs_wkt (p, 2,
  2153   2153           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2154   2154       add_srs_wkt (p, 3,
  2155         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2156         -    add_srs_wkt (p, 4,
  2157         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2158         -    add_srs_wkt (p, 5,
  2159         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2160         -    add_srs_wkt (p, 6,
  2161         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2162         -    add_srs_wkt (p, 7,
  2163         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2164         -    add_srs_wkt (p, 8,
  2165         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2166         -    add_srs_wkt (p, 9,
  2167         -        "in\",0],PARAMETER[\"central_meridian\",123],PARAMETER[\"");
  2168         -    add_srs_wkt (p, 10,
  2169         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2170         -    add_srs_wkt (p, 11,
  2171         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2172         -    add_srs_wkt (p, 12,
  2173         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2174         -    add_srs_wkt (p, 13,
  2175         -        "AUTHORITY[\"EPSG\",\"2480\"]]");
         2155  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2156  +    add_srs_wkt (p, 4,
         2157  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2158  +    add_srs_wkt (p, 5,
         2159  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2160  +    add_srs_wkt (p, 6,
         2161  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2162  +    add_srs_wkt (p, 7,
         2163  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2164  +    add_srs_wkt (p, 8,
         2165  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2166  +    add_srs_wkt (p, 9,
         2167  +        "igin\",0],PARAMETER[\"central_meridian\",123],PARAMETER[");
         2168  +    add_srs_wkt (p, 10,
         2169  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2170  +    add_srs_wkt (p, 11,
         2171  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2172  +    add_srs_wkt (p, 12,
         2173  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2174  +    add_srs_wkt (p, 13,
         2175  +        "],AUTHORITY[\"EPSG\",\"2480\"]]");
  2176   2176       p = add_epsg_def_ex (filter, first, last, 2481, "epsg", 2481,
  2177   2177           "Pulkovo 1995 / Gauss-Kruger CM 129E", 0, 1,
  2178   2178           "Krassowsky 1940", "Greenwich",
  2179   2179           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2180   2180           "X", "North", "Y", "East");
  2181   2181       add_proj4text (p, 0,
  2182   2182           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
  2183   2183       add_proj4text (p, 1,
  2184         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2184  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2185   2185       add_proj4text (p, 2,
  2186         -        "2 +units=m +no_defs");
         2186  +        ".22 +units=m +no_defs");
  2187   2187       add_srs_wkt (p, 0,
  2188   2188           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 129E\",GEOGCS[\"");
  2189   2189       add_srs_wkt (p, 1,
  2190   2190           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2191   2191       add_srs_wkt (p, 2,
  2192   2192           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2193   2193       add_srs_wkt (p, 3,
  2194         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2195         -    add_srs_wkt (p, 4,
  2196         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2197         -    add_srs_wkt (p, 5,
  2198         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2199         -    add_srs_wkt (p, 6,
  2200         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2201         -    add_srs_wkt (p, 7,
  2202         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2203         -    add_srs_wkt (p, 8,
  2204         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2205         -    add_srs_wkt (p, 9,
  2206         -        "in\",0],PARAMETER[\"central_meridian\",129],PARAMETER[\"");
  2207         -    add_srs_wkt (p, 10,
  2208         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2209         -    add_srs_wkt (p, 11,
  2210         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2211         -    add_srs_wkt (p, 12,
  2212         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2213         -    add_srs_wkt (p, 13,
  2214         -        "AUTHORITY[\"EPSG\",\"2481\"]]");
         2194  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2195  +    add_srs_wkt (p, 4,
         2196  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2197  +    add_srs_wkt (p, 5,
         2198  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2199  +    add_srs_wkt (p, 6,
         2200  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2201  +    add_srs_wkt (p, 7,
         2202  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2203  +    add_srs_wkt (p, 8,
         2204  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2205  +    add_srs_wkt (p, 9,
         2206  +        "igin\",0],PARAMETER[\"central_meridian\",129],PARAMETER[");
         2207  +    add_srs_wkt (p, 10,
         2208  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2209  +    add_srs_wkt (p, 11,
         2210  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2211  +    add_srs_wkt (p, 12,
         2212  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2213  +    add_srs_wkt (p, 13,
         2214  +        "],AUTHORITY[\"EPSG\",\"2481\"]]");
  2215   2215       p = add_epsg_def_ex (filter, first, last, 2482, "epsg", 2482,
  2216   2216           "Pulkovo 1995 / Gauss-Kruger CM 135E", 0, 1,
  2217   2217           "Krassowsky 1940", "Greenwich",
  2218   2218           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2219   2219           "X", "North", "Y", "East");
  2220   2220       add_proj4text (p, 0,
  2221   2221           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
  2222   2222       add_proj4text (p, 1,
  2223         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2223  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2224   2224       add_proj4text (p, 2,
  2225         -        "2 +units=m +no_defs");
         2225  +        ".22 +units=m +no_defs");
  2226   2226       add_srs_wkt (p, 0,
  2227   2227           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 135E\",GEOGCS[\"");
  2228   2228       add_srs_wkt (p, 1,
  2229   2229           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2230   2230       add_srs_wkt (p, 2,
  2231   2231           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2232   2232       add_srs_wkt (p, 3,
  2233         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2234         -    add_srs_wkt (p, 4,
  2235         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2236         -    add_srs_wkt (p, 5,
  2237         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2238         -    add_srs_wkt (p, 6,
  2239         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2240         -    add_srs_wkt (p, 7,
  2241         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2242         -    add_srs_wkt (p, 8,
  2243         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2244         -    add_srs_wkt (p, 9,
  2245         -        "in\",0],PARAMETER[\"central_meridian\",135],PARAMETER[\"");
  2246         -    add_srs_wkt (p, 10,
  2247         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2248         -    add_srs_wkt (p, 11,
  2249         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2250         -    add_srs_wkt (p, 12,
  2251         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2252         -    add_srs_wkt (p, 13,
  2253         -        "AUTHORITY[\"EPSG\",\"2482\"]]");
         2233  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2234  +    add_srs_wkt (p, 4,
         2235  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2236  +    add_srs_wkt (p, 5,
         2237  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2238  +    add_srs_wkt (p, 6,
         2239  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2240  +    add_srs_wkt (p, 7,
         2241  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2242  +    add_srs_wkt (p, 8,
         2243  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2244  +    add_srs_wkt (p, 9,
         2245  +        "igin\",0],PARAMETER[\"central_meridian\",135],PARAMETER[");
         2246  +    add_srs_wkt (p, 10,
         2247  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2248  +    add_srs_wkt (p, 11,
         2249  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2250  +    add_srs_wkt (p, 12,
         2251  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2252  +    add_srs_wkt (p, 13,
         2253  +        "],AUTHORITY[\"EPSG\",\"2482\"]]");
  2254   2254       p = add_epsg_def_ex (filter, first, last, 2483, "epsg", 2483,
  2255   2255           "Pulkovo 1995 / Gauss-Kruger CM 141E", 0, 1,
  2256   2256           "Krassowsky 1940", "Greenwich",
  2257   2257           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2258   2258           "X", "North", "Y", "East");
  2259   2259       add_proj4text (p, 0,
  2260   2260           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
  2261   2261       add_proj4text (p, 1,
  2262         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2262  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2263   2263       add_proj4text (p, 2,
  2264         -        "2 +units=m +no_defs");
         2264  +        ".22 +units=m +no_defs");
  2265   2265       add_srs_wkt (p, 0,
  2266   2266           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 141E\",GEOGCS[\"");
  2267   2267       add_srs_wkt (p, 1,
  2268   2268           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2269   2269       add_srs_wkt (p, 2,
  2270   2270           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2271   2271       add_srs_wkt (p, 3,
  2272         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2273         -    add_srs_wkt (p, 4,
  2274         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2275         -    add_srs_wkt (p, 5,
  2276         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2277         -    add_srs_wkt (p, 6,
  2278         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2279         -    add_srs_wkt (p, 7,
  2280         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2281         -    add_srs_wkt (p, 8,
  2282         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2283         -    add_srs_wkt (p, 9,
  2284         -        "in\",0],PARAMETER[\"central_meridian\",141],PARAMETER[\"");
  2285         -    add_srs_wkt (p, 10,
  2286         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2287         -    add_srs_wkt (p, 11,
  2288         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2289         -    add_srs_wkt (p, 12,
  2290         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2291         -    add_srs_wkt (p, 13,
  2292         -        "AUTHORITY[\"EPSG\",\"2483\"]]");
         2272  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2273  +    add_srs_wkt (p, 4,
         2274  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2275  +    add_srs_wkt (p, 5,
         2276  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2277  +    add_srs_wkt (p, 6,
         2278  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2279  +    add_srs_wkt (p, 7,
         2280  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2281  +    add_srs_wkt (p, 8,
         2282  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2283  +    add_srs_wkt (p, 9,
         2284  +        "igin\",0],PARAMETER[\"central_meridian\",141],PARAMETER[");
         2285  +    add_srs_wkt (p, 10,
         2286  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2287  +    add_srs_wkt (p, 11,
         2288  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2289  +    add_srs_wkt (p, 12,
         2290  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2291  +    add_srs_wkt (p, 13,
         2292  +        "],AUTHORITY[\"EPSG\",\"2483\"]]");
  2293   2293       p = add_epsg_def_ex (filter, first, last, 2484, "epsg", 2484,
  2294   2294           "Pulkovo 1995 / Gauss-Kruger CM 147E", 0, 1,
  2295   2295           "Krassowsky 1940", "Greenwich",
  2296   2296           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2297   2297           "X", "North", "Y", "East");
  2298   2298       add_proj4text (p, 0,
  2299   2299           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
  2300   2300       add_proj4text (p, 1,
  2301         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2301  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2302   2302       add_proj4text (p, 2,
  2303         -        "2 +units=m +no_defs");
         2303  +        ".22 +units=m +no_defs");
  2304   2304       add_srs_wkt (p, 0,
  2305   2305           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 147E\",GEOGCS[\"");
  2306   2306       add_srs_wkt (p, 1,
  2307   2307           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2308   2308       add_srs_wkt (p, 2,
  2309   2309           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2310   2310       add_srs_wkt (p, 3,
  2311         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2312         -    add_srs_wkt (p, 4,
  2313         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2314         -    add_srs_wkt (p, 5,
  2315         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2316         -    add_srs_wkt (p, 6,
  2317         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2318         -    add_srs_wkt (p, 7,
  2319         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2320         -    add_srs_wkt (p, 8,
  2321         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2322         -    add_srs_wkt (p, 9,
  2323         -        "in\",0],PARAMETER[\"central_meridian\",147],PARAMETER[\"");
  2324         -    add_srs_wkt (p, 10,
  2325         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2326         -    add_srs_wkt (p, 11,
  2327         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2328         -    add_srs_wkt (p, 12,
  2329         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2330         -    add_srs_wkt (p, 13,
  2331         -        "AUTHORITY[\"EPSG\",\"2484\"]]");
         2311  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2312  +    add_srs_wkt (p, 4,
         2313  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2314  +    add_srs_wkt (p, 5,
         2315  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2316  +    add_srs_wkt (p, 6,
         2317  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2318  +    add_srs_wkt (p, 7,
         2319  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2320  +    add_srs_wkt (p, 8,
         2321  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2322  +    add_srs_wkt (p, 9,
         2323  +        "igin\",0],PARAMETER[\"central_meridian\",147],PARAMETER[");
         2324  +    add_srs_wkt (p, 10,
         2325  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2326  +    add_srs_wkt (p, 11,
         2327  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2328  +    add_srs_wkt (p, 12,
         2329  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2330  +    add_srs_wkt (p, 13,
         2331  +        "],AUTHORITY[\"EPSG\",\"2484\"]]");
  2332   2332       p = add_epsg_def_ex (filter, first, last, 2485, "epsg", 2485,
  2333   2333           "Pulkovo 1995 / Gauss-Kruger CM 153E", 0, 1,
  2334   2334           "Krassowsky 1940", "Greenwich",
  2335   2335           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2336   2336           "X", "North", "Y", "East");
  2337   2337       add_proj4text (p, 0,
  2338   2338           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
  2339   2339       add_proj4text (p, 1,
  2340         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2340  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2341   2341       add_proj4text (p, 2,
  2342         -        "2 +units=m +no_defs");
         2342  +        ".22 +units=m +no_defs");
  2343   2343       add_srs_wkt (p, 0,
  2344   2344           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 153E\",GEOGCS[\"");
  2345   2345       add_srs_wkt (p, 1,
  2346   2346           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2347   2347       add_srs_wkt (p, 2,
  2348   2348           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2349   2349       add_srs_wkt (p, 3,
  2350         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2351         -    add_srs_wkt (p, 4,
  2352         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2353         -    add_srs_wkt (p, 5,
  2354         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2355         -    add_srs_wkt (p, 6,
  2356         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2357         -    add_srs_wkt (p, 7,
  2358         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2359         -    add_srs_wkt (p, 8,
  2360         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2361         -    add_srs_wkt (p, 9,
  2362         -        "in\",0],PARAMETER[\"central_meridian\",153],PARAMETER[\"");
  2363         -    add_srs_wkt (p, 10,
  2364         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2365         -    add_srs_wkt (p, 11,
  2366         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2367         -    add_srs_wkt (p, 12,
  2368         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2369         -    add_srs_wkt (p, 13,
  2370         -        "AUTHORITY[\"EPSG\",\"2485\"]]");
         2350  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2351  +    add_srs_wkt (p, 4,
         2352  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2353  +    add_srs_wkt (p, 5,
         2354  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2355  +    add_srs_wkt (p, 6,
         2356  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2357  +    add_srs_wkt (p, 7,
         2358  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2359  +    add_srs_wkt (p, 8,
         2360  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2361  +    add_srs_wkt (p, 9,
         2362  +        "igin\",0],PARAMETER[\"central_meridian\",153],PARAMETER[");
         2363  +    add_srs_wkt (p, 10,
         2364  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2365  +    add_srs_wkt (p, 11,
         2366  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2367  +    add_srs_wkt (p, 12,
         2368  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2369  +    add_srs_wkt (p, 13,
         2370  +        "],AUTHORITY[\"EPSG\",\"2485\"]]");
  2371   2371       p = add_epsg_def_ex (filter, first, last, 2486, "epsg", 2486,
  2372   2372           "Pulkovo 1995 / Gauss-Kruger CM 159E", 0, 1,
  2373   2373           "Krassowsky 1940", "Greenwich",
  2374   2374           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2375   2375           "X", "North", "Y", "East");
  2376   2376       add_proj4text (p, 0,
  2377   2377           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
  2378   2378       add_proj4text (p, 1,
  2379         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2379  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2380   2380       add_proj4text (p, 2,
  2381         -        "2 +units=m +no_defs");
         2381  +        ".22 +units=m +no_defs");
  2382   2382       add_srs_wkt (p, 0,
  2383   2383           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 159E\",GEOGCS[\"");
  2384   2384       add_srs_wkt (p, 1,
  2385   2385           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2386   2386       add_srs_wkt (p, 2,
  2387   2387           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2388   2388       add_srs_wkt (p, 3,
  2389         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2390         -    add_srs_wkt (p, 4,
  2391         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2392         -    add_srs_wkt (p, 5,
  2393         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2394         -    add_srs_wkt (p, 6,
  2395         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2396         -    add_srs_wkt (p, 7,
  2397         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2398         -    add_srs_wkt (p, 8,
  2399         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2400         -    add_srs_wkt (p, 9,
  2401         -        "in\",0],PARAMETER[\"central_meridian\",159],PARAMETER[\"");
  2402         -    add_srs_wkt (p, 10,
  2403         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2404         -    add_srs_wkt (p, 11,
  2405         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2406         -    add_srs_wkt (p, 12,
  2407         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2408         -    add_srs_wkt (p, 13,
  2409         -        "AUTHORITY[\"EPSG\",\"2486\"]]");
         2389  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2390  +    add_srs_wkt (p, 4,
         2391  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2392  +    add_srs_wkt (p, 5,
         2393  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2394  +    add_srs_wkt (p, 6,
         2395  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2396  +    add_srs_wkt (p, 7,
         2397  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2398  +    add_srs_wkt (p, 8,
         2399  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2400  +    add_srs_wkt (p, 9,
         2401  +        "igin\",0],PARAMETER[\"central_meridian\",159],PARAMETER[");
         2402  +    add_srs_wkt (p, 10,
         2403  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2404  +    add_srs_wkt (p, 11,
         2405  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2406  +    add_srs_wkt (p, 12,
         2407  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2408  +    add_srs_wkt (p, 13,
         2409  +        "],AUTHORITY[\"EPSG\",\"2486\"]]");
  2410   2410       p = add_epsg_def_ex (filter, first, last, 2487, "epsg", 2487,
  2411   2411           "Pulkovo 1995 / Gauss-Kruger CM 165E", 0, 1,
  2412   2412           "Krassowsky 1940", "Greenwich",
  2413   2413           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2414   2414           "X", "North", "Y", "East");
  2415   2415       add_proj4text (p, 0,
  2416   2416           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
  2417   2417       add_proj4text (p, 1,
  2418         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2418  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2419   2419       add_proj4text (p, 2,
  2420         -        "2 +units=m +no_defs");
         2420  +        ".22 +units=m +no_defs");
  2421   2421       add_srs_wkt (p, 0,
  2422   2422           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 165E\",GEOGCS[\"");
  2423   2423       add_srs_wkt (p, 1,
  2424   2424           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2425   2425       add_srs_wkt (p, 2,
  2426   2426           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2427   2427       add_srs_wkt (p, 3,
  2428         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2429         -    add_srs_wkt (p, 4,
  2430         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2431         -    add_srs_wkt (p, 5,
  2432         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2433         -    add_srs_wkt (p, 6,
  2434         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2435         -    add_srs_wkt (p, 7,
  2436         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2437         -    add_srs_wkt (p, 8,
  2438         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2439         -    add_srs_wkt (p, 9,
  2440         -        "in\",0],PARAMETER[\"central_meridian\",165],PARAMETER[\"");
  2441         -    add_srs_wkt (p, 10,
  2442         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2443         -    add_srs_wkt (p, 11,
  2444         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2445         -    add_srs_wkt (p, 12,
  2446         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2447         -    add_srs_wkt (p, 13,
  2448         -        "AUTHORITY[\"EPSG\",\"2487\"]]");
         2428  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2429  +    add_srs_wkt (p, 4,
         2430  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2431  +    add_srs_wkt (p, 5,
         2432  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2433  +    add_srs_wkt (p, 6,
         2434  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2435  +    add_srs_wkt (p, 7,
         2436  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2437  +    add_srs_wkt (p, 8,
         2438  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2439  +    add_srs_wkt (p, 9,
         2440  +        "igin\",0],PARAMETER[\"central_meridian\",165],PARAMETER[");
         2441  +    add_srs_wkt (p, 10,
         2442  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2443  +    add_srs_wkt (p, 11,
         2444  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2445  +    add_srs_wkt (p, 12,
         2446  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2447  +    add_srs_wkt (p, 13,
         2448  +        "],AUTHORITY[\"EPSG\",\"2487\"]]");
  2449   2449       p = add_epsg_def_ex (filter, first, last, 2488, "epsg", 2488,
  2450   2450           "Pulkovo 1995 / Gauss-Kruger CM 171E", 0, 1,
  2451   2451           "Krassowsky 1940", "Greenwich",
  2452   2452           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2453   2453           "X", "North", "Y", "East");
  2454   2454       add_proj4text (p, 0,
  2455   2455           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
  2456   2456       add_proj4text (p, 1,
  2457         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2457  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2458   2458       add_proj4text (p, 2,
  2459         -        "2 +units=m +no_defs");
         2459  +        ".22 +units=m +no_defs");
  2460   2460       add_srs_wkt (p, 0,
  2461   2461           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 171E\",GEOGCS[\"");
  2462   2462       add_srs_wkt (p, 1,
  2463   2463           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2464   2464       add_srs_wkt (p, 2,
  2465   2465           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2466   2466       add_srs_wkt (p, 3,
  2467         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2468         -    add_srs_wkt (p, 4,
  2469         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2470         -    add_srs_wkt (p, 5,
  2471         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2472         -    add_srs_wkt (p, 6,
  2473         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2474         -    add_srs_wkt (p, 7,
  2475         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2476         -    add_srs_wkt (p, 8,
  2477         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2478         -    add_srs_wkt (p, 9,
  2479         -        "in\",0],PARAMETER[\"central_meridian\",171],PARAMETER[\"");
  2480         -    add_srs_wkt (p, 10,
  2481         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2482         -    add_srs_wkt (p, 11,
  2483         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2484         -    add_srs_wkt (p, 12,
  2485         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2486         -    add_srs_wkt (p, 13,
  2487         -        "AUTHORITY[\"EPSG\",\"2488\"]]");
         2467  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2468  +    add_srs_wkt (p, 4,
         2469  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2470  +    add_srs_wkt (p, 5,
         2471  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2472  +    add_srs_wkt (p, 6,
         2473  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2474  +    add_srs_wkt (p, 7,
         2475  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2476  +    add_srs_wkt (p, 8,
         2477  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2478  +    add_srs_wkt (p, 9,
         2479  +        "igin\",0],PARAMETER[\"central_meridian\",171],PARAMETER[");
         2480  +    add_srs_wkt (p, 10,
         2481  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2482  +    add_srs_wkt (p, 11,
         2483  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2484  +    add_srs_wkt (p, 12,
         2485  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2486  +    add_srs_wkt (p, 13,
         2487  +        "],AUTHORITY[\"EPSG\",\"2488\"]]");
  2488   2488       p = add_epsg_def_ex (filter, first, last, 2489, "epsg", 2489,
  2489   2489           "Pulkovo 1995 / Gauss-Kruger CM 177E", 0, 1,
  2490   2490           "Krassowsky 1940", "Greenwich",
  2491   2491           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2492   2492           "X", "North", "Y", "East");
  2493   2493       add_proj4text (p, 0,
  2494   2494           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
  2495   2495       add_proj4text (p, 1,
  2496         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2496  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2497   2497       add_proj4text (p, 2,
  2498         -        "2 +units=m +no_defs");
         2498  +        ".22 +units=m +no_defs");
  2499   2499       add_srs_wkt (p, 0,
  2500   2500           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 177E\",GEOGCS[\"");
  2501   2501       add_srs_wkt (p, 1,
  2502   2502           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2503   2503       add_srs_wkt (p, 2,
  2504   2504           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2505   2505       add_srs_wkt (p, 3,
  2506         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2507         -    add_srs_wkt (p, 4,
  2508         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2509         -    add_srs_wkt (p, 5,
  2510         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2511         -    add_srs_wkt (p, 6,
  2512         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2513         -    add_srs_wkt (p, 7,
  2514         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2515         -    add_srs_wkt (p, 8,
  2516         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2517         -    add_srs_wkt (p, 9,
  2518         -        "in\",0],PARAMETER[\"central_meridian\",177],PARAMETER[\"");
  2519         -    add_srs_wkt (p, 10,
  2520         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2521         -    add_srs_wkt (p, 11,
  2522         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2523         -    add_srs_wkt (p, 12,
  2524         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2525         -    add_srs_wkt (p, 13,
  2526         -        "AUTHORITY[\"EPSG\",\"2489\"]]");
         2506  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2507  +    add_srs_wkt (p, 4,
         2508  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2509  +    add_srs_wkt (p, 5,
         2510  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2511  +    add_srs_wkt (p, 6,
         2512  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2513  +    add_srs_wkt (p, 7,
         2514  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2515  +    add_srs_wkt (p, 8,
         2516  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2517  +    add_srs_wkt (p, 9,
         2518  +        "igin\",0],PARAMETER[\"central_meridian\",177],PARAMETER[");
         2519  +    add_srs_wkt (p, 10,
         2520  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         2521  +    add_srs_wkt (p, 11,
         2522  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         2523  +    add_srs_wkt (p, 12,
         2524  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         2525  +    add_srs_wkt (p, 13,
         2526  +        "],AUTHORITY[\"EPSG\",\"2489\"]]");
  2527   2527       p = add_epsg_def_ex (filter, first, last, 2490, "epsg", 2490,
  2528   2528           "Pulkovo 1995 / Gauss-Kruger CM 177W", 0, 1,
  2529   2529           "Krassowsky 1940", "Greenwich",
  2530   2530           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2531   2531           "X", "North", "Y", "East");
  2532   2532       add_proj4text (p, 0,
  2533   2533           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
  2534   2534       add_proj4text (p, 1,
  2535         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         2535  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  2536   2536       add_proj4text (p, 2,
  2537         -        "22 +units=m +no_defs");
         2537  +        "0.22 +units=m +no_defs");
  2538   2538       add_srs_wkt (p, 0,
  2539   2539           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 177W\",GEOGCS[\"");
  2540   2540       add_srs_wkt (p, 1,
  2541   2541           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2542   2542       add_srs_wkt (p, 2,
  2543   2543           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2544   2544       add_srs_wkt (p, 3,
  2545         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2546         -    add_srs_wkt (p, 4,
  2547         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2548         -    add_srs_wkt (p, 5,
  2549         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2550         -    add_srs_wkt (p, 6,
  2551         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2552         -    add_srs_wkt (p, 7,
  2553         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2554         -    add_srs_wkt (p, 8,
  2555         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2556         -    add_srs_wkt (p, 9,
  2557         -        "in\",0],PARAMETER[\"central_meridian\",-177],PARAMETER[\"");
  2558         -    add_srs_wkt (p, 10,
  2559         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2560         -    add_srs_wkt (p, 11,
  2561         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2562         -    add_srs_wkt (p, 12,
  2563         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2564         -    add_srs_wkt (p, 13,
  2565         -        "AUTHORITY[\"EPSG\",\"2490\"]]");
         2545  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2546  +    add_srs_wkt (p, 4,
         2547  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2548  +    add_srs_wkt (p, 5,
         2549  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2550  +    add_srs_wkt (p, 6,
         2551  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2552  +    add_srs_wkt (p, 7,
         2553  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2554  +    add_srs_wkt (p, 8,
         2555  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2556  +    add_srs_wkt (p, 9,
         2557  +        "igin\",0],PARAMETER[\"central_meridian\",-177],PARAMETER");
         2558  +    add_srs_wkt (p, 10,
         2559  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         2560  +    add_srs_wkt (p, 11,
         2561  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         2562  +    add_srs_wkt (p, 12,
         2563  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         2564  +    add_srs_wkt (p, 13,
         2565  +        "T],AUTHORITY[\"EPSG\",\"2490\"]]");
  2566   2566       p = add_epsg_def_ex (filter, first, last, 2491, "epsg", 2491,
  2567   2567           "Pulkovo 1995 / Gauss-Kruger CM 171W", 0, 1,
  2568   2568           "Krassowsky 1940", "Greenwich",
  2569   2569           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2570   2570           "X", "North", "Y", "East");
  2571   2571       add_proj4text (p, 0,
  2572   2572           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
  2573   2573       add_proj4text (p, 1,
  2574         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         2574  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  2575   2575       add_proj4text (p, 2,
  2576         -        "22 +units=m +no_defs");
         2576  +        "0.22 +units=m +no_defs");
  2577   2577       add_srs_wkt (p, 0,
  2578   2578           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger CM 171W\",GEOGCS[\"");
  2579   2579       add_srs_wkt (p, 1,
  2580   2580           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  2581   2581       add_srs_wkt (p, 2,
  2582   2582           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2583   2583       add_srs_wkt (p, 3,
  2584         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  2585         -    add_srs_wkt (p, 4,
  2586         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2587         -    add_srs_wkt (p, 5,
  2588         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2589         -    add_srs_wkt (p, 6,
  2590         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2591         -    add_srs_wkt (p, 7,
  2592         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  2593         -    add_srs_wkt (p, 8,
  2594         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2595         -    add_srs_wkt (p, 9,
  2596         -        "in\",0],PARAMETER[\"central_meridian\",-171],PARAMETER[\"");
  2597         -    add_srs_wkt (p, 10,
  2598         -        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
  2599         -    add_srs_wkt (p, 11,
  2600         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2601         -    add_srs_wkt (p, 12,
  2602         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2603         -    add_srs_wkt (p, 13,
  2604         -        "AUTHORITY[\"EPSG\",\"2491\"]]");
         2584  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         2585  +    add_srs_wkt (p, 4,
         2586  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2587  +    add_srs_wkt (p, 5,
         2588  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2589  +    add_srs_wkt (p, 6,
         2590  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2591  +    add_srs_wkt (p, 7,
         2592  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         2593  +    add_srs_wkt (p, 8,
         2594  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2595  +    add_srs_wkt (p, 9,
         2596  +        "igin\",0],PARAMETER[\"central_meridian\",-171],PARAMETER");
         2597  +    add_srs_wkt (p, 10,
         2598  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         2599  +    add_srs_wkt (p, 11,
         2600  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         2601  +    add_srs_wkt (p, 12,
         2602  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         2603  +    add_srs_wkt (p, 13,
         2604  +        "T],AUTHORITY[\"EPSG\",\"2491\"]]");
  2605   2605       p = add_epsg_def_ex (filter, first, last, 2492, "epsg", 2492,
  2606   2606           "Pulkovo 1942 / Gauss-Kruger CM 9E (deprecated)", 0, 1,
  2607   2607           "Krassowsky 1940", "Greenwich",
  2608   2608           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2609   2609           "X", "North", "Y", "East");
  2610   2610       add_proj4text (p, 0,
  2611   2611           "+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=500000 +y_0=0 +e");
  2612   2612       add_proj4text (p, 1,
  2613         -        "llps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.1");
         2613  +        "llps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0.");
  2614   2614       add_proj4text (p, 2,
  2615         -        "2 +units=m +no_defs");
         2615  +        "12 +units=m +no_defs");
  2616   2616       add_srs_wkt (p, 0,
  2617   2617           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 9E (deprecated)\"");
  2618   2618       add_srs_wkt (p, 1,
  2619   2619           ",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID");
  2620   2620       add_srs_wkt (p, 2,
  2621   2621           "[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"");
  2622   2622       add_srs_wkt (p, 3,
  2623         -        "7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],");
  2624         -    add_srs_wkt (p, 4,
  2625         -        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  2626         -    add_srs_wkt (p, 5,
  2627         -        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  2628         -    add_srs_wkt (p, 6,
  2629         -        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  2630         -    add_srs_wkt (p, 7,
  2631         -        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  2632         -    add_srs_wkt (p, 8,
  2633         -        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2634         -    add_srs_wkt (p, 9,
  2635         -        "ude_of_origin\",0],PARAMETER[\"central_meridian\",9],PAR");
  2636         -    add_srs_wkt (p, 10,
  2637         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2638         -    add_srs_wkt (p, 11,
  2639         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  2640         -    add_srs_wkt (p, 12,
  2641         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  2642         -    add_srs_wkt (p, 13,
  2643         -        "\",EAST],AUTHORITY[\"EPSG\",\"2492\"]]");
         2623  +        "7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12]");
         2624  +    add_srs_wkt (p, 4,
         2625  +        ",AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AU");
         2626  +    add_srs_wkt (p, 5,
         2627  +        "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
         2628  +    add_srs_wkt (p, 6,
         2629  +        "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
         2630  +    add_srs_wkt (p, 7,
         2631  +        "ORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284");
         2632  +    add_srs_wkt (p, 8,
         2633  +        "\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"lat");
         2634  +    add_srs_wkt (p, 9,
         2635  +        "itude_of_origin\",0],PARAMETER[\"central_meridian\",9],P");
         2636  +    add_srs_wkt (p, 10,
         2637  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2638  +    add_srs_wkt (p, 11,
         2639  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         2640  +    add_srs_wkt (p, 12,
         2641  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         2642  +    add_srs_wkt (p, 13,
         2643  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2492\"]]");
  2644   2644       p = add_epsg_def_ex (filter, first, last, 2493, "epsg", 2493,
  2645   2645           "Pulkovo 1942 / Gauss-Kruger CM 15E (deprecated)", 0, 1,
  2646   2646           "Krassowsky 1940", "Greenwich",
  2647   2647           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2648   2648           "X", "North", "Y", "East");
  2649   2649       add_proj4text (p, 0,
  2650   2650           "+proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=500000 +y_0=0 +");
  2651   2651       add_proj4text (p, 1,
  2652         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2652  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2653   2653       add_proj4text (p, 2,
  2654         -        "12 +units=m +no_defs");
         2654  +        ".12 +units=m +no_defs");
  2655   2655       add_srs_wkt (p, 0,
  2656   2656           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 15E (deprecated)");
  2657   2657       add_srs_wkt (p, 1,
  2658   2658           "\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHERO");
  2659   2659       add_srs_wkt (p, 2,
  2660   2660           "ID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",");
  2661   2661       add_srs_wkt (p, 3,
  2662         -        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12");
  2663         -    add_srs_wkt (p, 4,
  2664         -        "],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,A");
  2665         -    add_srs_wkt (p, 5,
  2666         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2667         -    add_srs_wkt (p, 6,
  2668         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2669         -    add_srs_wkt (p, 7,
  2670         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"428");
  2671         -    add_srs_wkt (p, 8,
  2672         -        "4\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
  2673         -    add_srs_wkt (p, 9,
  2674         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",15]");
  2675         -    add_srs_wkt (p, 10,
  2676         -        ",PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting");
  2677         -    add_srs_wkt (p, 11,
  2678         -        "\",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2679         -    add_srs_wkt (p, 12,
  2680         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2681         -    add_srs_wkt (p, 13,
  2682         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2493\"]]");
         2662  +        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.1");
         2663  +    add_srs_wkt (p, 4,
         2664  +        "2],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,");
         2665  +    add_srs_wkt (p, 5,
         2666  +        "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
         2667  +    add_srs_wkt (p, 6,
         2668  +        "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
         2669  +    add_srs_wkt (p, 7,
         2670  +        ",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"42");
         2671  +    add_srs_wkt (p, 8,
         2672  +        "84\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"l");
         2673  +    add_srs_wkt (p, 9,
         2674  +        "atitude_of_origin\",0],PARAMETER[\"central_meridian\",15");
         2675  +    add_srs_wkt (p, 10,
         2676  +        "],PARAMETER[\"scale_factor\",1],PARAMETER[\"false_eastin");
         2677  +    add_srs_wkt (p, 11,
         2678  +        "g\",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre");
         2679  +    add_srs_wkt (p, 12,
         2680  +        "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXI");
         2681  +    add_srs_wkt (p, 13,
         2682  +        "S[\"Y\",EAST],AUTHORITY[\"EPSG\",\"2493\"]]");
  2683   2683       p = add_epsg_def_ex (filter, first, last, 2494, "epsg", 2494,
  2684   2684           "Pulkovo 1942 / Gauss-Kruger CM 21E", 0, 1,
  2685   2685           "Krassowsky 1940", "Greenwich",
  2686   2686           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2687   2687           "X", "North", "Y", "East");
  2688   2688       add_proj4text (p, 0,
  2689   2689           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
  2690   2690       add_proj4text (p, 1,
  2691         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2691  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2692   2692       add_proj4text (p, 2,
  2693         -        "12 +units=m +no_defs");
         2693  +        ".12 +units=m +no_defs");
  2694   2694       add_srs_wkt (p, 0,
  2695   2695           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 21E\",GEOGCS[\"P");
  2696   2696       add_srs_wkt (p, 1,
  2697   2697           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2698   2698       add_srs_wkt (p, 2,
  2699   2699           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2700   2700       add_srs_wkt (p, 3,
  2701         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2702         -    add_srs_wkt (p, 4,
  2703         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2704         -    add_srs_wkt (p, 5,
  2705         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2706         -    add_srs_wkt (p, 6,
  2707         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2708         -    add_srs_wkt (p, 7,
  2709         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2710         -    add_srs_wkt (p, 8,
  2711         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2712         -    add_srs_wkt (p, 9,
  2713         -        "in\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"s");
  2714         -    add_srs_wkt (p, 10,
  2715         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2716         -    add_srs_wkt (p, 11,
  2717         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2718         -    add_srs_wkt (p, 12,
  2719         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2720         -    add_srs_wkt (p, 13,
  2721         -        "UTHORITY[\"EPSG\",\"2494\"]]");
         2701  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2702  +    add_srs_wkt (p, 4,
         2703  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2704  +    add_srs_wkt (p, 5,
         2705  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2706  +    add_srs_wkt (p, 6,
         2707  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2708  +    add_srs_wkt (p, 7,
         2709  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2710  +    add_srs_wkt (p, 8,
         2711  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2712  +    add_srs_wkt (p, 9,
         2713  +        "igin\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"");
         2714  +    add_srs_wkt (p, 10,
         2715  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2716  +    add_srs_wkt (p, 11,
         2717  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2718  +    add_srs_wkt (p, 12,
         2719  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2720  +    add_srs_wkt (p, 13,
         2721  +        "AUTHORITY[\"EPSG\",\"2494\"]]");
  2722   2722       p = add_epsg_def_ex (filter, first, last, 2495, "epsg", 2495,
  2723   2723           "Pulkovo 1942 / Gauss-Kruger CM 27E", 0, 1,
  2724   2724           "Krassowsky 1940", "Greenwich",
  2725   2725           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2726   2726           "X", "North", "Y", "East");
  2727   2727       add_proj4text (p, 0,
  2728   2728           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
  2729   2729       add_proj4text (p, 1,
  2730         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2730  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2731   2731       add_proj4text (p, 2,
  2732         -        "12 +units=m +no_defs");
         2732  +        ".12 +units=m +no_defs");
  2733   2733       add_srs_wkt (p, 0,
  2734   2734           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 27E\",GEOGCS[\"P");
  2735   2735       add_srs_wkt (p, 1,
  2736   2736           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2737   2737       add_srs_wkt (p, 2,
  2738   2738           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2739   2739       add_srs_wkt (p, 3,
  2740         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2741         -    add_srs_wkt (p, 4,
  2742         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2743         -    add_srs_wkt (p, 5,
  2744         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2745         -    add_srs_wkt (p, 6,
  2746         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2747         -    add_srs_wkt (p, 7,
  2748         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2749         -    add_srs_wkt (p, 8,
  2750         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2751         -    add_srs_wkt (p, 9,
  2752         -        "in\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"s");
  2753         -    add_srs_wkt (p, 10,
  2754         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2755         -    add_srs_wkt (p, 11,
  2756         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2757         -    add_srs_wkt (p, 12,
  2758         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2759         -    add_srs_wkt (p, 13,
  2760         -        "UTHORITY[\"EPSG\",\"2495\"]]");
         2740  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2741  +    add_srs_wkt (p, 4,
         2742  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2743  +    add_srs_wkt (p, 5,
         2744  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2745  +    add_srs_wkt (p, 6,
         2746  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2747  +    add_srs_wkt (p, 7,
         2748  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2749  +    add_srs_wkt (p, 8,
         2750  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2751  +    add_srs_wkt (p, 9,
         2752  +        "igin\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"");
         2753  +    add_srs_wkt (p, 10,
         2754  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2755  +    add_srs_wkt (p, 11,
         2756  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2757  +    add_srs_wkt (p, 12,
         2758  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2759  +    add_srs_wkt (p, 13,
         2760  +        "AUTHORITY[\"EPSG\",\"2495\"]]");
  2761   2761       p = add_epsg_def_ex (filter, first, last, 2496, "epsg", 2496,
  2762   2762           "Pulkovo 1942 / Gauss-Kruger CM 33E", 0, 1,
  2763   2763           "Krassowsky 1940", "Greenwich",
  2764   2764           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2765   2765           "X", "North", "Y", "East");
  2766   2766       add_proj4text (p, 0,
  2767   2767           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
  2768   2768       add_proj4text (p, 1,
  2769         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2769  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2770   2770       add_proj4text (p, 2,
  2771         -        "12 +units=m +no_defs");
         2771  +        ".12 +units=m +no_defs");
  2772   2772       add_srs_wkt (p, 0,
  2773   2773           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 33E\",GEOGCS[\"P");
  2774   2774       add_srs_wkt (p, 1,
  2775   2775           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2776   2776       add_srs_wkt (p, 2,
  2777   2777           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2778   2778       add_srs_wkt (p, 3,
  2779         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2780         -    add_srs_wkt (p, 4,
  2781         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2782         -    add_srs_wkt (p, 5,
  2783         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2784         -    add_srs_wkt (p, 6,
  2785         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2786         -    add_srs_wkt (p, 7,
  2787         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2788         -    add_srs_wkt (p, 8,
  2789         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2790         -    add_srs_wkt (p, 9,
  2791         -        "in\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"s");
  2792         -    add_srs_wkt (p, 10,
  2793         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2794         -    add_srs_wkt (p, 11,
  2795         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2796         -    add_srs_wkt (p, 12,
  2797         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2798         -    add_srs_wkt (p, 13,
  2799         -        "UTHORITY[\"EPSG\",\"2496\"]]");
         2779  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2780  +    add_srs_wkt (p, 4,
         2781  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2782  +    add_srs_wkt (p, 5,
         2783  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2784  +    add_srs_wkt (p, 6,
         2785  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2786  +    add_srs_wkt (p, 7,
         2787  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2788  +    add_srs_wkt (p, 8,
         2789  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2790  +    add_srs_wkt (p, 9,
         2791  +        "igin\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"");
         2792  +    add_srs_wkt (p, 10,
         2793  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2794  +    add_srs_wkt (p, 11,
         2795  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2796  +    add_srs_wkt (p, 12,
         2797  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2798  +    add_srs_wkt (p, 13,
         2799  +        "AUTHORITY[\"EPSG\",\"2496\"]]");
  2800   2800       p = add_epsg_def_ex (filter, first, last, 2497, "epsg", 2497,
  2801   2801           "Pulkovo 1942 / Gauss-Kruger CM 39E", 0, 1,
  2802   2802           "Krassowsky 1940", "Greenwich",
  2803   2803           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2804   2804           "X", "North", "Y", "East");
  2805   2805       add_proj4text (p, 0,
  2806   2806           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
  2807   2807       add_proj4text (p, 1,
  2808         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2808  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2809   2809       add_proj4text (p, 2,
  2810         -        "12 +units=m +no_defs");
         2810  +        ".12 +units=m +no_defs");
  2811   2811       add_srs_wkt (p, 0,
  2812   2812           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 39E\",GEOGCS[\"P");
  2813   2813       add_srs_wkt (p, 1,
  2814   2814           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2815   2815       add_srs_wkt (p, 2,
  2816   2816           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2817   2817       add_srs_wkt (p, 3,
  2818         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2819         -    add_srs_wkt (p, 4,
  2820         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2821         -    add_srs_wkt (p, 5,
  2822         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2823         -    add_srs_wkt (p, 6,
  2824         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2825         -    add_srs_wkt (p, 7,
  2826         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2827         -    add_srs_wkt (p, 8,
  2828         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2829         -    add_srs_wkt (p, 9,
  2830         -        "in\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"s");
  2831         -    add_srs_wkt (p, 10,
  2832         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2833         -    add_srs_wkt (p, 11,
  2834         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2835         -    add_srs_wkt (p, 12,
  2836         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2837         -    add_srs_wkt (p, 13,
  2838         -        "UTHORITY[\"EPSG\",\"2497\"]]");
         2818  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2819  +    add_srs_wkt (p, 4,
         2820  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2821  +    add_srs_wkt (p, 5,
         2822  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2823  +    add_srs_wkt (p, 6,
         2824  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2825  +    add_srs_wkt (p, 7,
         2826  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2827  +    add_srs_wkt (p, 8,
         2828  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2829  +    add_srs_wkt (p, 9,
         2830  +        "igin\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"");
         2831  +    add_srs_wkt (p, 10,
         2832  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2833  +    add_srs_wkt (p, 11,
         2834  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2835  +    add_srs_wkt (p, 12,
         2836  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2837  +    add_srs_wkt (p, 13,
         2838  +        "AUTHORITY[\"EPSG\",\"2497\"]]");
  2839   2839       p = add_epsg_def_ex (filter, first, last, 2498, "epsg", 2498,
  2840   2840           "Pulkovo 1942 / Gauss-Kruger CM 45E", 0, 1,
  2841   2841           "Krassowsky 1940", "Greenwich",
  2842   2842           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2843   2843           "X", "North", "Y", "East");
  2844   2844       add_proj4text (p, 0,
  2845   2845           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
  2846   2846       add_proj4text (p, 1,
  2847         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2847  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2848   2848       add_proj4text (p, 2,
  2849         -        "12 +units=m +no_defs");
         2849  +        ".12 +units=m +no_defs");
  2850   2850       add_srs_wkt (p, 0,
  2851   2851           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 45E\",GEOGCS[\"P");
  2852   2852       add_srs_wkt (p, 1,
  2853   2853           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2854   2854       add_srs_wkt (p, 2,
  2855   2855           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2856   2856       add_srs_wkt (p, 3,
  2857         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2858         -    add_srs_wkt (p, 4,
  2859         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2860         -    add_srs_wkt (p, 5,
  2861         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2862         -    add_srs_wkt (p, 6,
  2863         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2864         -    add_srs_wkt (p, 7,
  2865         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2866         -    add_srs_wkt (p, 8,
  2867         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2868         -    add_srs_wkt (p, 9,
  2869         -        "in\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"s");
  2870         -    add_srs_wkt (p, 10,
  2871         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2872         -    add_srs_wkt (p, 11,
  2873         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2874         -    add_srs_wkt (p, 12,
  2875         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2876         -    add_srs_wkt (p, 13,
  2877         -        "UTHORITY[\"EPSG\",\"2498\"]]");
         2857  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2858  +    add_srs_wkt (p, 4,
         2859  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2860  +    add_srs_wkt (p, 5,
         2861  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2862  +    add_srs_wkt (p, 6,
         2863  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2864  +    add_srs_wkt (p, 7,
         2865  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2866  +    add_srs_wkt (p, 8,
         2867  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2868  +    add_srs_wkt (p, 9,
         2869  +        "igin\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"");
         2870  +    add_srs_wkt (p, 10,
         2871  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2872  +    add_srs_wkt (p, 11,
         2873  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2874  +    add_srs_wkt (p, 12,
         2875  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2876  +    add_srs_wkt (p, 13,
         2877  +        "AUTHORITY[\"EPSG\",\"2498\"]]");
  2878   2878       p = add_epsg_def_ex (filter, first, last, 2499, "epsg", 2499,
  2879   2879           "Pulkovo 1942 / Gauss-Kruger CM 51E", 0, 1,
  2880   2880           "Krassowsky 1940", "Greenwich",
  2881   2881           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2882   2882           "X", "North", "Y", "East");
  2883   2883       add_proj4text (p, 0,
  2884   2884           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
  2885   2885       add_proj4text (p, 1,
  2886         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2886  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2887   2887       add_proj4text (p, 2,
  2888         -        "12 +units=m +no_defs");
         2888  +        ".12 +units=m +no_defs");
  2889   2889       add_srs_wkt (p, 0,
  2890   2890           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 51E\",GEOGCS[\"P");
  2891   2891       add_srs_wkt (p, 1,
  2892   2892           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2893   2893       add_srs_wkt (p, 2,
  2894   2894           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2895   2895       add_srs_wkt (p, 3,
  2896         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2897         -    add_srs_wkt (p, 4,
  2898         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2899         -    add_srs_wkt (p, 5,
  2900         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2901         -    add_srs_wkt (p, 6,
  2902         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2903         -    add_srs_wkt (p, 7,
  2904         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2905         -    add_srs_wkt (p, 8,
  2906         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2907         -    add_srs_wkt (p, 9,
  2908         -        "in\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"s");
  2909         -    add_srs_wkt (p, 10,
  2910         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2911         -    add_srs_wkt (p, 11,
  2912         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2913         -    add_srs_wkt (p, 12,
  2914         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2915         -    add_srs_wkt (p, 13,
  2916         -        "UTHORITY[\"EPSG\",\"2499\"]]");
         2896  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2897  +    add_srs_wkt (p, 4,
         2898  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2899  +    add_srs_wkt (p, 5,
         2900  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2901  +    add_srs_wkt (p, 6,
         2902  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2903  +    add_srs_wkt (p, 7,
         2904  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2905  +    add_srs_wkt (p, 8,
         2906  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2907  +    add_srs_wkt (p, 9,
         2908  +        "igin\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"");
         2909  +    add_srs_wkt (p, 10,
         2910  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2911  +    add_srs_wkt (p, 11,
         2912  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2913  +    add_srs_wkt (p, 12,
         2914  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2915  +    add_srs_wkt (p, 13,
         2916  +        "AUTHORITY[\"EPSG\",\"2499\"]]");
  2917   2917       p = add_epsg_def_ex (filter, first, last, 2500, "epsg", 2500,
  2918   2918           "Pulkovo 1942 / Gauss-Kruger CM 57E", 0, 1,
  2919   2919           "Krassowsky 1940", "Greenwich",
  2920   2920           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2921   2921           "X", "North", "Y", "East");
  2922   2922       add_proj4text (p, 0,
  2923   2923           "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
  2924   2924       add_proj4text (p, 1,
  2925         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2925  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2926   2926       add_proj4text (p, 2,
  2927         -        "12 +units=m +no_defs");
         2927  +        ".12 +units=m +no_defs");
  2928   2928       add_srs_wkt (p, 0,
  2929   2929           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 57E\",GEOGCS[\"P");
  2930   2930       add_srs_wkt (p, 1,
  2931   2931           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2932   2932       add_srs_wkt (p, 2,
  2933   2933           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2934   2934       add_srs_wkt (p, 3,
  2935         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2936         -    add_srs_wkt (p, 4,
  2937         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2938         -    add_srs_wkt (p, 5,
  2939         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2940         -    add_srs_wkt (p, 6,
  2941         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2942         -    add_srs_wkt (p, 7,
  2943         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2944         -    add_srs_wkt (p, 8,
  2945         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2946         -    add_srs_wkt (p, 9,
  2947         -        "in\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"s");
  2948         -    add_srs_wkt (p, 10,
  2949         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2950         -    add_srs_wkt (p, 11,
  2951         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2952         -    add_srs_wkt (p, 12,
  2953         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2954         -    add_srs_wkt (p, 13,
  2955         -        "UTHORITY[\"EPSG\",\"2500\"]]");
         2935  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2936  +    add_srs_wkt (p, 4,
         2937  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2938  +    add_srs_wkt (p, 5,
         2939  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2940  +    add_srs_wkt (p, 6,
         2941  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2942  +    add_srs_wkt (p, 7,
         2943  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2944  +    add_srs_wkt (p, 8,
         2945  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2946  +    add_srs_wkt (p, 9,
         2947  +        "igin\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"");
         2948  +    add_srs_wkt (p, 10,
         2949  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2950  +    add_srs_wkt (p, 11,
         2951  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2952  +    add_srs_wkt (p, 12,
         2953  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2954  +    add_srs_wkt (p, 13,
         2955  +        "AUTHORITY[\"EPSG\",\"2500\"]]");
  2956   2956       p = add_epsg_def_ex (filter, first, last, 2501, "epsg", 2501,
  2957   2957           "Pulkovo 1942 / Gauss-Kruger CM 63E", 0, 1,
  2958   2958           "Krassowsky 1940", "Greenwich",
  2959   2959           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2960   2960           "X", "North", "Y", "East");
  2961   2961       add_proj4text (p, 0,
  2962   2962           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
  2963   2963       add_proj4text (p, 1,
  2964         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2964  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2965   2965       add_proj4text (p, 2,
  2966         -        "12 +units=m +no_defs");
         2966  +        ".12 +units=m +no_defs");
  2967   2967       add_srs_wkt (p, 0,
  2968   2968           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 63E\",GEOGCS[\"P");
  2969   2969       add_srs_wkt (p, 1,
  2970   2970           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2971   2971       add_srs_wkt (p, 2,
  2972   2972           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2973   2973       add_srs_wkt (p, 3,
  2974         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2975         -    add_srs_wkt (p, 4,
  2976         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2977         -    add_srs_wkt (p, 5,
  2978         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2979         -    add_srs_wkt (p, 6,
  2980         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2981         -    add_srs_wkt (p, 7,
  2982         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2983         -    add_srs_wkt (p, 8,
  2984         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2985         -    add_srs_wkt (p, 9,
  2986         -        "in\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"s");
  2987         -    add_srs_wkt (p, 10,
  2988         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  2989         -    add_srs_wkt (p, 11,
  2990         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2991         -    add_srs_wkt (p, 12,
  2992         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2993         -    add_srs_wkt (p, 13,
  2994         -        "UTHORITY[\"EPSG\",\"2501\"]]");
         2974  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2975  +    add_srs_wkt (p, 4,
         2976  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2977  +    add_srs_wkt (p, 5,
         2978  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2979  +    add_srs_wkt (p, 6,
         2980  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2981  +    add_srs_wkt (p, 7,
         2982  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2983  +    add_srs_wkt (p, 8,
         2984  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2985  +    add_srs_wkt (p, 9,
         2986  +        "igin\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"");
         2987  +    add_srs_wkt (p, 10,
         2988  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         2989  +    add_srs_wkt (p, 11,
         2990  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2991  +    add_srs_wkt (p, 12,
         2992  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2993  +    add_srs_wkt (p, 13,
         2994  +        "AUTHORITY[\"EPSG\",\"2501\"]]");
  2995   2995       p = add_epsg_def_ex (filter, first, last, 2502, "epsg", 2502,
  2996   2996           "Pulkovo 1942 / Gauss-Kruger CM 69E", 0, 1,
  2997   2997           "Krassowsky 1940", "Greenwich",
  2998   2998           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2999   2999           "X", "North", "Y", "East");
  3000   3000       add_proj4text (p, 0,
  3001   3001           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  3002   3002       add_proj4text (p, 1,
  3003         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3003  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3004   3004       add_proj4text (p, 2,
  3005         -        "12 +units=m +no_defs");
         3005  +        ".12 +units=m +no_defs");
  3006   3006       add_srs_wkt (p, 0,
  3007   3007           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 69E\",GEOGCS[\"P");
  3008   3008       add_srs_wkt (p, 1,
  3009   3009           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3010   3010       add_srs_wkt (p, 2,
  3011   3011           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3012   3012       add_srs_wkt (p, 3,
  3013         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3014         -    add_srs_wkt (p, 4,
  3015         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3016         -    add_srs_wkt (p, 5,
  3017         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3018         -    add_srs_wkt (p, 6,
  3019         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3020         -    add_srs_wkt (p, 7,
  3021         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3022         -    add_srs_wkt (p, 8,
  3023         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3024         -    add_srs_wkt (p, 9,
  3025         -        "in\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"s");
  3026         -    add_srs_wkt (p, 10,
  3027         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3028         -    add_srs_wkt (p, 11,
  3029         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3030         -    add_srs_wkt (p, 12,
  3031         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3032         -    add_srs_wkt (p, 13,
  3033         -        "UTHORITY[\"EPSG\",\"2502\"]]");
         3013  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         3014  +    add_srs_wkt (p, 4,
         3015  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3016  +    add_srs_wkt (p, 5,
         3017  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3018  +    add_srs_wkt (p, 6,
         3019  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3020  +    add_srs_wkt (p, 7,
         3021  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3022  +    add_srs_wkt (p, 8,
         3023  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3024  +    add_srs_wkt (p, 9,
         3025  +        "igin\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"");
         3026  +    add_srs_wkt (p, 10,
         3027  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3028  +    add_srs_wkt (p, 11,
         3029  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3030  +    add_srs_wkt (p, 12,
         3031  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3032  +    add_srs_wkt (p, 13,
         3033  +        "AUTHORITY[\"EPSG\",\"2502\"]]");
  3034   3034       p = add_epsg_def_ex (filter, first, last, 2503, "epsg", 2503,
  3035   3035           "Pulkovo 1942 / Gauss-Kruger CM 75E", 0, 1,
  3036   3036           "Krassowsky 1940", "Greenwich",
  3037   3037           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3038   3038           "X", "North", "Y", "East");
  3039   3039       add_proj4text (p, 0,
  3040   3040           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  3041   3041       add_proj4text (p, 1,
  3042         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3042  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3043   3043       add_proj4text (p, 2,
  3044         -        "12 +units=m +no_defs");
         3044  +        ".12 +units=m +no_defs");
  3045   3045       add_srs_wkt (p, 0,
  3046   3046           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 75E\",GEOGCS[\"P");
  3047   3047       add_srs_wkt (p, 1,
  3048   3048           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3049   3049       add_srs_wkt (p, 2,
  3050   3050           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3051   3051       add_srs_wkt (p, 3,
  3052         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3053         -    add_srs_wkt (p, 4,
  3054         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3055         -    add_srs_wkt (p, 5,
  3056         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3057         -    add_srs_wkt (p, 6,
  3058         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3059         -    add_srs_wkt (p, 7,
  3060         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3061         -    add_srs_wkt (p, 8,
  3062         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3063         -    add_srs_wkt (p, 9,
  3064         -        "in\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"s");
  3065         -    add_srs_wkt (p, 10,
  3066         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3067         -    add_srs_wkt (p, 11,
  3068         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3069         -    add_srs_wkt (p, 12,
  3070         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3071         -    add_srs_wkt (p, 13,
  3072         -        "UTHORITY[\"EPSG\",\"2503\"]]");
         3052  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         3053  +    add_srs_wkt (p, 4,
         3054  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3055  +    add_srs_wkt (p, 5,
         3056  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3057  +    add_srs_wkt (p, 6,
         3058  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3059  +    add_srs_wkt (p, 7,
         3060  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3061  +    add_srs_wkt (p, 8,
         3062  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3063  +    add_srs_wkt (p, 9,
         3064  +        "igin\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"");
         3065  +    add_srs_wkt (p, 10,
         3066  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3067  +    add_srs_wkt (p, 11,
         3068  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3069  +    add_srs_wkt (p, 12,
         3070  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3071  +    add_srs_wkt (p, 13,
         3072  +        "AUTHORITY[\"EPSG\",\"2503\"]]");
  3073   3073       p = add_epsg_def_ex (filter, first, last, 2504, "epsg", 2504,
  3074   3074           "Pulkovo 1942 / Gauss-Kruger CM 81E", 0, 1,
  3075   3075           "Krassowsky 1940", "Greenwich",
  3076   3076           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3077   3077           "X", "North", "Y", "East");
  3078   3078       add_proj4text (p, 0,
  3079   3079           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
  3080   3080       add_proj4text (p, 1,
  3081         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3081  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3082   3082       add_proj4text (p, 2,
  3083         -        "12 +units=m +no_defs");
         3083  +        ".12 +units=m +no_defs");
  3084   3084       add_srs_wkt (p, 0,
  3085   3085           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 81E\",GEOGCS[\"P");
  3086   3086       add_srs_wkt (p, 1,
  3087   3087           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3088   3088       add_srs_wkt (p, 2,
  3089   3089           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3090   3090       add_srs_wkt (p, 3,
  3091         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3092         -    add_srs_wkt (p, 4,
  3093         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3094         -    add_srs_wkt (p, 5,
  3095         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3096         -    add_srs_wkt (p, 6,
  3097         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3098         -    add_srs_wkt (p, 7,
  3099         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3100         -    add_srs_wkt (p, 8,
  3101         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3102         -    add_srs_wkt (p, 9,
  3103         -        "in\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"s");
  3104         -    add_srs_wkt (p, 10,
  3105         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3106         -    add_srs_wkt (p, 11,
  3107         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3108         -    add_srs_wkt (p, 12,
  3109         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3110         -    add_srs_wkt (p, 13,
  3111         -        "UTHORITY[\"EPSG\",\"2504\"]]");
         3091  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         3092  +    add_srs_wkt (p, 4,
         3093  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3094  +    add_srs_wkt (p, 5,
         3095  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3096  +    add_srs_wkt (p, 6,
         3097  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3098  +    add_srs_wkt (p, 7,
         3099  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3100  +    add_srs_wkt (p, 8,
         3101  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3102  +    add_srs_wkt (p, 9,
         3103  +        "igin\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"");
         3104  +    add_srs_wkt (p, 10,
         3105  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3106  +    add_srs_wkt (p, 11,
         3107  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3108  +    add_srs_wkt (p, 12,
         3109  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3110  +    add_srs_wkt (p, 13,
         3111  +        "AUTHORITY[\"EPSG\",\"2504\"]]");
  3112   3112       p = add_epsg_def_ex (filter, first, last, 2505, "epsg", 2505,
  3113   3113           "Pulkovo 1942 / Gauss-Kruger CM 87E", 0, 1,
  3114   3114           "Krassowsky 1940", "Greenwich",
  3115   3115           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3116   3116           "X", "North", "Y", "East");
  3117   3117       add_proj4text (p, 0,
  3118   3118           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
  3119   3119       add_proj4text (p, 1,
  3120         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3120  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3121   3121       add_proj4text (p, 2,
  3122         -        "12 +units=m +no_defs");
         3122  +        ".12 +units=m +no_defs");
  3123   3123       add_srs_wkt (p, 0,
  3124   3124           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 87E\",GEOGCS[\"P");
  3125   3125       add_srs_wkt (p, 1,
  3126   3126           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3127   3127       add_srs_wkt (p, 2,
  3128   3128           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3129   3129       add_srs_wkt (p, 3,
  3130         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3131         -    add_srs_wkt (p, 4,
  3132         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3133         -    add_srs_wkt (p, 5,
  3134         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3135         -    add_srs_wkt (p, 6,
  3136         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3137         -    add_srs_wkt (p, 7,
  3138         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3139         -    add_srs_wkt (p, 8,
  3140         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3141         -    add_srs_wkt (p, 9,
  3142         -        "in\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"s");
  3143         -    add_srs_wkt (p, 10,
  3144         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3145         -    add_srs_wkt (p, 11,
  3146         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3147         -    add_srs_wkt (p, 12,
  3148         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3149         -    add_srs_wkt (p, 13,
  3150         -        "UTHORITY[\"EPSG\",\"2505\"]]");
         3130  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         3131  +    add_srs_wkt (p, 4,
         3132  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3133  +    add_srs_wkt (p, 5,
         3134  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3135  +    add_srs_wkt (p, 6,
         3136  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3137  +    add_srs_wkt (p, 7,
         3138  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3139  +    add_srs_wkt (p, 8,
         3140  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3141  +    add_srs_wkt (p, 9,
         3142  +        "igin\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"");
         3143  +    add_srs_wkt (p, 10,
         3144  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3145  +    add_srs_wkt (p, 11,
         3146  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3147  +    add_srs_wkt (p, 12,
         3148  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3149  +    add_srs_wkt (p, 13,
         3150  +        "AUTHORITY[\"EPSG\",\"2505\"]]");
  3151   3151       p = add_epsg_def_ex (filter, first, last, 2506, "epsg", 2506,
  3152   3152           "Pulkovo 1942 / Gauss-Kruger CM 93E", 0, 1,
  3153   3153           "Krassowsky 1940", "Greenwich",
  3154   3154           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3155   3155           "X", "North", "Y", "East");
  3156   3156       add_proj4text (p, 0,
  3157   3157           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
  3158   3158       add_proj4text (p, 1,
  3159         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3159  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3160   3160       add_proj4text (p, 2,
  3161         -        "12 +units=m +no_defs");
         3161  +        ".12 +units=m +no_defs");
  3162   3162       add_srs_wkt (p, 0,
  3163   3163           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 93E\",GEOGCS[\"P");
  3164   3164       add_srs_wkt (p, 1,
  3165   3165           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3166   3166       add_srs_wkt (p, 2,
  3167   3167           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3168   3168       add_srs_wkt (p, 3,
  3169         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3170         -    add_srs_wkt (p, 4,
  3171         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3172         -    add_srs_wkt (p, 5,
  3173         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3174         -    add_srs_wkt (p, 6,
  3175         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3176         -    add_srs_wkt (p, 7,
  3177         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3178         -    add_srs_wkt (p, 8,
  3179         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3180         -    add_srs_wkt (p, 9,
  3181         -        "in\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"s");
  3182         -    add_srs_wkt (p, 10,
  3183         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3184         -    add_srs_wkt (p, 11,
  3185         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3186         -    add_srs_wkt (p, 12,
  3187         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3188         -    add_srs_wkt (p, 13,
  3189         -        "UTHORITY[\"EPSG\",\"2506\"]]");
         3169  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         3170  +    add_srs_wkt (p, 4,
         3171  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3172  +    add_srs_wkt (p, 5,
         3173  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3174  +    add_srs_wkt (p, 6,
         3175  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3176  +    add_srs_wkt (p, 7,
         3177  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3178  +    add_srs_wkt (p, 8,
         3179  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3180  +    add_srs_wkt (p, 9,
         3181  +        "igin\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"");
         3182  +    add_srs_wkt (p, 10,
         3183  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3184  +    add_srs_wkt (p, 11,
         3185  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3186  +    add_srs_wkt (p, 12,
         3187  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3188  +    add_srs_wkt (p, 13,
         3189  +        "AUTHORITY[\"EPSG\",\"2506\"]]");
  3190   3190       p = add_epsg_def_ex (filter, first, last, 2507, "epsg", 2507,
  3191   3191           "Pulkovo 1942 / Gauss-Kruger CM 99E", 0, 1,
  3192   3192           "Krassowsky 1940", "Greenwich",
  3193   3193           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3194   3194           "X", "North", "Y", "East");
  3195   3195       add_proj4text (p, 0,
  3196   3196           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
  3197   3197       add_proj4text (p, 1,
  3198         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3198  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3199   3199       add_proj4text (p, 2,
  3200         -        "12 +units=m +no_defs");
         3200  +        ".12 +units=m +no_defs");
  3201   3201       add_srs_wkt (p, 0,
  3202   3202           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 99E\",GEOGCS[\"P");
  3203   3203       add_srs_wkt (p, 1,
  3204   3204           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  3205   3205       add_srs_wkt (p, 2,
  3206   3206           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3207   3207       add_srs_wkt (p, 3,
  3208         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  3209         -    add_srs_wkt (p, 4,
  3210         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3211         -    add_srs_wkt (p, 5,
  3212         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3213         -    add_srs_wkt (p, 6,
  3214         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3215         -    add_srs_wkt (p, 7,
  3216         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  3217         -    add_srs_wkt (p, 8,
  3218         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3219         -    add_srs_wkt (p, 9,
  3220         -        "in\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"s");
  3221         -    add_srs_wkt (p, 10,
  3222         -        "cale_factor\",1],PARAMETER[\"false_easting\",500000],PAR");
  3223         -    add_srs_wkt (p, 11,
  3224         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3225         -    add_srs_wkt (p, 12,
  3226         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3227         -    add_srs_wkt (p, 13,
  3228         -        "UTHORITY[\"EPSG\",\"2507\"]]");
  3229         -    p = add_epsg_def_ex (filter, first, last, 2508, "epsg", 2508,
  3230         -        "Pulkovo 1942 / Gauss-Kruger CM 105E", 0, 1,
  3231         -        "Krassowsky 1940", "Greenwich",
  3232         -        "Pulkovo_1942", "Transverse_Mercator", "metre",
  3233         -        "X", "North", "Y", "East");
  3234         -    add_proj4text (p, 0,
  3235         -        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
  3236         -    add_proj4text (p, 1,
  3237         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
  3238         -    add_proj4text (p, 2,
  3239         -        ".12 +units=m +no_defs");
  3240         -    add_srs_wkt (p, 0,
  3241         -        "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 105E\",GEOGCS[\"");
  3242         -    add_srs_wkt (p, 1,
  3243         -        "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3244         -    add_srs_wkt (p, 2,
  3245         -        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3246         -    add_srs_wkt (p, 3,
  3247         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3208  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
  3248   3209       add_srs_wkt (p, 4,
  3249   3210           "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3250   3211       add_srs_wkt (p, 5,
  3251   3212           "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3252   3213       add_srs_wkt (p, 6,
  3253   3214           "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3254   3215       add_srs_wkt (p, 7,
  3255   3216           "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3256   3217       add_srs_wkt (p, 8,
  3257   3218           "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3258   3219       add_srs_wkt (p, 9,
  3259         -        "igin\",0],PARAMETER[\"central_meridian\",105],PARAMETER[");
  3260         -    add_srs_wkt (p, 10,
  3261         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3262         -    add_srs_wkt (p, 11,
  3263         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3264         -    add_srs_wkt (p, 12,
  3265         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3266         -    add_srs_wkt (p, 13,
  3267         -        "],AUTHORITY[\"EPSG\",\"2508\"]]");
         3220  +        "igin\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"");
         3221  +    add_srs_wkt (p, 10,
         3222  +        "scale_factor\",1],PARAMETER[\"false_easting\",500000],PA");
         3223  +    add_srs_wkt (p, 11,
         3224  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3225  +    add_srs_wkt (p, 12,
         3226  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3227  +    add_srs_wkt (p, 13,
         3228  +        "AUTHORITY[\"EPSG\",\"2507\"]]");
         3229  +    p = add_epsg_def_ex (filter, first, last, 2508, "epsg", 2508,
         3230  +        "Pulkovo 1942 / Gauss-Kruger CM 105E", 0, 1,
         3231  +        "Krassowsky 1940", "Greenwich",
         3232  +        "Pulkovo_1942", "Transverse_Mercator", "metre",
         3233  +        "X", "North", "Y", "East");
         3234  +    add_proj4text (p, 0,
         3235  +        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
         3236  +    add_proj4text (p, 1,
         3237  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
         3238  +    add_proj4text (p, 2,
         3239  +        "0.12 +units=m +no_defs");
         3240  +    add_srs_wkt (p, 0,
         3241  +        "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 105E\",GEOGCS[\"");
         3242  +    add_srs_wkt (p, 1,
         3243  +        "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
         3244  +    add_srs_wkt (p, 2,
         3245  +        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
         3246  +    add_srs_wkt (p, 3,
         3247  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3248  +    add_srs_wkt (p, 4,
         3249  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3250  +    add_srs_wkt (p, 5,
         3251  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3252  +    add_srs_wkt (p, 6,
         3253  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3254  +    add_srs_wkt (p, 7,
         3255  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3256  +    add_srs_wkt (p, 8,
         3257  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3258  +    add_srs_wkt (p, 9,
         3259  +        "rigin\",0],PARAMETER[\"central_meridian\",105],PARAMETER");
         3260  +    add_srs_wkt (p, 10,
         3261  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3262  +    add_srs_wkt (p, 11,
         3263  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3264  +    add_srs_wkt (p, 12,
         3265  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3266  +    add_srs_wkt (p, 13,
         3267  +        "T],AUTHORITY[\"EPSG\",\"2508\"]]");
  3268   3268       p = add_epsg_def_ex (filter, first, last, 2509, "epsg", 2509,
  3269   3269           "Pulkovo 1942 / Gauss-Kruger CM 111E", 0, 1,
  3270   3270           "Krassowsky 1940", "Greenwich",
  3271   3271           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3272   3272           "X", "North", "Y", "East");
  3273   3273       add_proj4text (p, 0,
  3274   3274           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
  3275   3275       add_proj4text (p, 1,
  3276         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3276  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3277   3277       add_proj4text (p, 2,
  3278         -        ".12 +units=m +no_defs");
         3278  +        "0.12 +units=m +no_defs");
  3279   3279       add_srs_wkt (p, 0,
  3280   3280           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 111E\",GEOGCS[\"");
  3281   3281       add_srs_wkt (p, 1,
  3282   3282           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3283   3283       add_srs_wkt (p, 2,
  3284   3284           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3285   3285       add_srs_wkt (p, 3,
  3286         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3287         -    add_srs_wkt (p, 4,
  3288         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3289         -    add_srs_wkt (p, 5,
  3290         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3291         -    add_srs_wkt (p, 6,
  3292         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3293         -    add_srs_wkt (p, 7,
  3294         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3295         -    add_srs_wkt (p, 8,
  3296         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3297         -    add_srs_wkt (p, 9,
  3298         -        "igin\",0],PARAMETER[\"central_meridian\",111],PARAMETER[");
  3299         -    add_srs_wkt (p, 10,
  3300         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3301         -    add_srs_wkt (p, 11,
  3302         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3303         -    add_srs_wkt (p, 12,
  3304         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3305         -    add_srs_wkt (p, 13,
  3306         -        "],AUTHORITY[\"EPSG\",\"2509\"]]");
         3286  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3287  +    add_srs_wkt (p, 4,
         3288  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3289  +    add_srs_wkt (p, 5,
         3290  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3291  +    add_srs_wkt (p, 6,
         3292  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3293  +    add_srs_wkt (p, 7,
         3294  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3295  +    add_srs_wkt (p, 8,
         3296  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3297  +    add_srs_wkt (p, 9,
         3298  +        "rigin\",0],PARAMETER[\"central_meridian\",111],PARAMETER");
         3299  +    add_srs_wkt (p, 10,
         3300  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3301  +    add_srs_wkt (p, 11,
         3302  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3303  +    add_srs_wkt (p, 12,
         3304  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3305  +    add_srs_wkt (p, 13,
         3306  +        "T],AUTHORITY[\"EPSG\",\"2509\"]]");
  3307   3307       p = add_epsg_def_ex (filter, first, last, 2510, "epsg", 2510,
  3308   3308           "Pulkovo 1942 / Gauss-Kruger CM 117E", 0, 1,
  3309   3309           "Krassowsky 1940", "Greenwich",
  3310   3310           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3311   3311           "X", "North", "Y", "East");
  3312   3312       add_proj4text (p, 0,
  3313   3313           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
  3314   3314       add_proj4text (p, 1,
  3315         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3315  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3316   3316       add_proj4text (p, 2,
  3317         -        ".12 +units=m +no_defs");
         3317  +        "0.12 +units=m +no_defs");
  3318   3318       add_srs_wkt (p, 0,
  3319   3319           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 117E\",GEOGCS[\"");
  3320   3320       add_srs_wkt (p, 1,
  3321   3321           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3322   3322       add_srs_wkt (p, 2,
  3323   3323           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3324   3324       add_srs_wkt (p, 3,
  3325         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3326         -    add_srs_wkt (p, 4,
  3327         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3328         -    add_srs_wkt (p, 5,
  3329         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3330         -    add_srs_wkt (p, 6,
  3331         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3332         -    add_srs_wkt (p, 7,
  3333         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3334         -    add_srs_wkt (p, 8,
  3335         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3336         -    add_srs_wkt (p, 9,
  3337         -        "igin\",0],PARAMETER[\"central_meridian\",117],PARAMETER[");
  3338         -    add_srs_wkt (p, 10,
  3339         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3340         -    add_srs_wkt (p, 11,
  3341         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3342         -    add_srs_wkt (p, 12,
  3343         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3344         -    add_srs_wkt (p, 13,
  3345         -        "],AUTHORITY[\"EPSG\",\"2510\"]]");
         3325  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3326  +    add_srs_wkt (p, 4,
         3327  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3328  +    add_srs_wkt (p, 5,
         3329  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3330  +    add_srs_wkt (p, 6,
         3331  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3332  +    add_srs_wkt (p, 7,
         3333  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3334  +    add_srs_wkt (p, 8,
         3335  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3336  +    add_srs_wkt (p, 9,
         3337  +        "rigin\",0],PARAMETER[\"central_meridian\",117],PARAMETER");
         3338  +    add_srs_wkt (p, 10,
         3339  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3340  +    add_srs_wkt (p, 11,
         3341  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3342  +    add_srs_wkt (p, 12,
         3343  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3344  +    add_srs_wkt (p, 13,
         3345  +        "T],AUTHORITY[\"EPSG\",\"2510\"]]");
  3346   3346       p = add_epsg_def_ex (filter, first, last, 2511, "epsg", 2511,
  3347   3347           "Pulkovo 1942 / Gauss-Kruger CM 123E", 0, 1,
  3348   3348           "Krassowsky 1940", "Greenwich",
  3349   3349           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3350   3350           "X", "North", "Y", "East");
  3351   3351       add_proj4text (p, 0,
  3352   3352           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
  3353   3353       add_proj4text (p, 1,
  3354         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3354  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3355   3355       add_proj4text (p, 2,
  3356         -        ".12 +units=m +no_defs");
         3356  +        "0.12 +units=m +no_defs");
  3357   3357       add_srs_wkt (p, 0,
  3358   3358           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 123E\",GEOGCS[\"");
  3359   3359       add_srs_wkt (p, 1,
  3360   3360           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3361   3361       add_srs_wkt (p, 2,
  3362   3362           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3363   3363       add_srs_wkt (p, 3,
  3364         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3365         -    add_srs_wkt (p, 4,
  3366         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3367         -    add_srs_wkt (p, 5,
  3368         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3369         -    add_srs_wkt (p, 6,
  3370         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3371         -    add_srs_wkt (p, 7,
  3372         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3373         -    add_srs_wkt (p, 8,
  3374         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3375         -    add_srs_wkt (p, 9,
  3376         -        "igin\",0],PARAMETER[\"central_meridian\",123],PARAMETER[");
  3377         -    add_srs_wkt (p, 10,
  3378         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3379         -    add_srs_wkt (p, 11,
  3380         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3381         -    add_srs_wkt (p, 12,
  3382         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3383         -    add_srs_wkt (p, 13,
  3384         -        "],AUTHORITY[\"EPSG\",\"2511\"]]");
         3364  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3365  +    add_srs_wkt (p, 4,
         3366  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3367  +    add_srs_wkt (p, 5,
         3368  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3369  +    add_srs_wkt (p, 6,
         3370  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3371  +    add_srs_wkt (p, 7,
         3372  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3373  +    add_srs_wkt (p, 8,
         3374  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3375  +    add_srs_wkt (p, 9,
         3376  +        "rigin\",0],PARAMETER[\"central_meridian\",123],PARAMETER");
         3377  +    add_srs_wkt (p, 10,
         3378  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3379  +    add_srs_wkt (p, 11,
         3380  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3381  +    add_srs_wkt (p, 12,
         3382  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3383  +    add_srs_wkt (p, 13,
         3384  +        "T],AUTHORITY[\"EPSG\",\"2511\"]]");
  3385   3385       p = add_epsg_def_ex (filter, first, last, 2512, "epsg", 2512,
  3386   3386           "Pulkovo 1942 / Gauss-Kruger CM 129E", 0, 1,
  3387   3387           "Krassowsky 1940", "Greenwich",
  3388   3388           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3389   3389           "X", "North", "Y", "East");
  3390   3390       add_proj4text (p, 0,
  3391   3391           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
  3392   3392       add_proj4text (p, 1,
  3393         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3393  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3394   3394       add_proj4text (p, 2,
  3395         -        ".12 +units=m +no_defs");
         3395  +        "0.12 +units=m +no_defs");
  3396   3396       add_srs_wkt (p, 0,
  3397   3397           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 129E\",GEOGCS[\"");
  3398   3398       add_srs_wkt (p, 1,
  3399   3399           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3400   3400       add_srs_wkt (p, 2,
  3401   3401           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3402   3402       add_srs_wkt (p, 3,
  3403         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3404         -    add_srs_wkt (p, 4,
  3405         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3406         -    add_srs_wkt (p, 5,
  3407         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3408         -    add_srs_wkt (p, 6,
  3409         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3410         -    add_srs_wkt (p, 7,
  3411         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3412         -    add_srs_wkt (p, 8,
  3413         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3414         -    add_srs_wkt (p, 9,
  3415         -        "igin\",0],PARAMETER[\"central_meridian\",129],PARAMETER[");
  3416         -    add_srs_wkt (p, 10,
  3417         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3418         -    add_srs_wkt (p, 11,
  3419         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3420         -    add_srs_wkt (p, 12,
  3421         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3422         -    add_srs_wkt (p, 13,
  3423         -        "],AUTHORITY[\"EPSG\",\"2512\"]]");
         3403  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3404  +    add_srs_wkt (p, 4,
         3405  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3406  +    add_srs_wkt (p, 5,
         3407  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3408  +    add_srs_wkt (p, 6,
         3409  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3410  +    add_srs_wkt (p, 7,
         3411  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3412  +    add_srs_wkt (p, 8,
         3413  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3414  +    add_srs_wkt (p, 9,
         3415  +        "rigin\",0],PARAMETER[\"central_meridian\",129],PARAMETER");
         3416  +    add_srs_wkt (p, 10,
         3417  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3418  +    add_srs_wkt (p, 11,
         3419  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3420  +    add_srs_wkt (p, 12,
         3421  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3422  +    add_srs_wkt (p, 13,
         3423  +        "T],AUTHORITY[\"EPSG\",\"2512\"]]");
  3424   3424       p = add_epsg_def_ex (filter, first, last, 2513, "epsg", 2513,
  3425   3425           "Pulkovo 1942 / Gauss-Kruger CM 135E", 0, 1,
  3426   3426           "Krassowsky 1940", "Greenwich",
  3427   3427           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3428   3428           "X", "North", "Y", "East");
  3429   3429       add_proj4text (p, 0,
  3430   3430           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
  3431   3431       add_proj4text (p, 1,
  3432         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3432  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3433   3433       add_proj4text (p, 2,
  3434         -        ".12 +units=m +no_defs");
         3434  +        "0.12 +units=m +no_defs");
  3435   3435       add_srs_wkt (p, 0,
  3436   3436           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 135E\",GEOGCS[\"");
  3437   3437       add_srs_wkt (p, 1,
  3438   3438           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3439   3439       add_srs_wkt (p, 2,
  3440   3440           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3441   3441       add_srs_wkt (p, 3,
  3442         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3443         -    add_srs_wkt (p, 4,
  3444         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3445         -    add_srs_wkt (p, 5,
  3446         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3447         -    add_srs_wkt (p, 6,
  3448         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3449         -    add_srs_wkt (p, 7,
  3450         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3451         -    add_srs_wkt (p, 8,
  3452         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3453         -    add_srs_wkt (p, 9,
  3454         -        "igin\",0],PARAMETER[\"central_meridian\",135],PARAMETER[");
  3455         -    add_srs_wkt (p, 10,
  3456         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3457         -    add_srs_wkt (p, 11,
  3458         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3459         -    add_srs_wkt (p, 12,
  3460         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3461         -    add_srs_wkt (p, 13,
  3462         -        "],AUTHORITY[\"EPSG\",\"2513\"]]");
         3442  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3443  +    add_srs_wkt (p, 4,
         3444  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3445  +    add_srs_wkt (p, 5,
         3446  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3447  +    add_srs_wkt (p, 6,
         3448  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3449  +    add_srs_wkt (p, 7,
         3450  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3451  +    add_srs_wkt (p, 8,
         3452  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3453  +    add_srs_wkt (p, 9,
         3454  +        "rigin\",0],PARAMETER[\"central_meridian\",135],PARAMETER");
         3455  +    add_srs_wkt (p, 10,
         3456  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3457  +    add_srs_wkt (p, 11,
         3458  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3459  +    add_srs_wkt (p, 12,
         3460  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3461  +    add_srs_wkt (p, 13,
         3462  +        "T],AUTHORITY[\"EPSG\",\"2513\"]]");
  3463   3463       p = add_epsg_def_ex (filter, first, last, 2514, "epsg", 2514,
  3464   3464           "Pulkovo 1942 / Gauss-Kruger CM 141E", 0, 1,
  3465   3465           "Krassowsky 1940", "Greenwich",
  3466   3466           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3467   3467           "X", "North", "Y", "East");
  3468   3468       add_proj4text (p, 0,
  3469   3469           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
  3470   3470       add_proj4text (p, 1,
  3471         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3471  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3472   3472       add_proj4text (p, 2,
  3473         -        ".12 +units=m +no_defs");
         3473  +        "0.12 +units=m +no_defs");
  3474   3474       add_srs_wkt (p, 0,
  3475   3475           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 141E\",GEOGCS[\"");
  3476   3476       add_srs_wkt (p, 1,
  3477   3477           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3478   3478       add_srs_wkt (p, 2,
  3479   3479           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3480   3480       add_srs_wkt (p, 3,
  3481         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3482         -    add_srs_wkt (p, 4,
  3483         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3484         -    add_srs_wkt (p, 5,
  3485         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3486         -    add_srs_wkt (p, 6,
  3487         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3488         -    add_srs_wkt (p, 7,
  3489         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3490         -    add_srs_wkt (p, 8,
  3491         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3492         -    add_srs_wkt (p, 9,
  3493         -        "igin\",0],PARAMETER[\"central_meridian\",141],PARAMETER[");
  3494         -    add_srs_wkt (p, 10,
  3495         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
  3496         -    add_srs_wkt (p, 11,
  3497         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3498         -    add_srs_wkt (p, 12,
  3499         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3500         -    add_srs_wkt (p, 13,
  3501         -        "],AUTHORITY[\"EPSG\",\"2514\"]]");
         3481  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3482  +    add_srs_wkt (p, 4,
         3483  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3484  +    add_srs_wkt (p, 5,
         3485  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3486  +    add_srs_wkt (p, 6,
         3487  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3488  +    add_srs_wkt (p, 7,
         3489  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3490  +    add_srs_wkt (p, 8,
         3491  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3492  +    add_srs_wkt (p, 9,
         3493  +        "rigin\",0],PARAMETER[\"central_meridian\",141],PARAMETER");
         3494  +    add_srs_wkt (p, 10,
         3495  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3496  +    add_srs_wkt (p, 11,
         3497  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3498  +    add_srs_wkt (p, 12,
         3499  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3500  +    add_srs_wkt (p, 13,
         3501  +        "T],AUTHORITY[\"EPSG\",\"2514\"]]");
  3502   3502       p = add_epsg_def_ex (filter, first, last, 2515, "epsg", 2515,
  3503   3503           "Pulkovo 1942 / Gauss-Kruger CM 147E", 0, 1,
  3504   3504           "Krassowsky 1940", "Greenwich",
  3505   3505           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3506   3506           "X", "North", "Y", "East");
  3507   3507       add_proj4text (p, 0,
  3508   3508           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
  3509   3509       add_proj4text (p, 1,
  3510         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3510  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3511   3511       add_proj4text (p, 2,
  3512         -        ".12 +units=m +no_defs");
         3512  +        "0.12 +units=m +no_defs");
  3513   3513       add_srs_wkt (p, 0,
  3514   3514           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 147E\",GEOGCS[\"");
  3515   3515       add_srs_wkt (p, 1,
  3516   3516           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3517   3517       add_srs_wkt (p, 2,
  3518   3518           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3519   3519       add_srs_wkt (p, 3,
  3520         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3520  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3521   3521       add_srs_wkt (p, 4,
  3522         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3522  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3523   3523       add_srs_wkt (p, 5,
  3524         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3524  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3525   3525       add_srs_wkt (p, 6,
  3526         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3526  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3527   3527       add_srs_wkt (p, 7,
  3528         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3528  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3529   3529       add_srs_wkt (p, 8,
  3530         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3530  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3531   3531       add_srs_wkt (p, 9,
  3532         -        "igin\",0],PARAMETER[\"central_meridian\",147],PARAMETER[");
         3532  +        "rigin\",0],PARAMETER[\"central_meridian\",147],PARAMETER");
  3533   3533       add_srs_wkt (p, 10,
  3534         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3534  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3535   3535       add_srs_wkt (p, 11,
  3536         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3536  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3537   3537       add_srs_wkt (p, 12,
  3538         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3538  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3539   3539       add_srs_wkt (p, 13,
  3540         -        "],AUTHORITY[\"EPSG\",\"2515\"]]");
         3540  +        "T],AUTHORITY[\"EPSG\",\"2515\"]]");
  3541   3541       p = add_epsg_def_ex (filter, first, last, 2516, "epsg", 2516,
  3542   3542           "Pulkovo 1942 / Gauss-Kruger CM 153E", 0, 1,
  3543   3543           "Krassowsky 1940", "Greenwich",
  3544   3544           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3545   3545           "X", "North", "Y", "East");
  3546   3546       add_proj4text (p, 0,
  3547   3547           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
  3548   3548       add_proj4text (p, 1,
  3549         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3549  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3550   3550       add_proj4text (p, 2,
  3551         -        ".12 +units=m +no_defs");
         3551  +        "0.12 +units=m +no_defs");
  3552   3552       add_srs_wkt (p, 0,
  3553   3553           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 153E\",GEOGCS[\"");
  3554   3554       add_srs_wkt (p, 1,
  3555   3555           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3556   3556       add_srs_wkt (p, 2,
  3557   3557           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3558   3558       add_srs_wkt (p, 3,
  3559         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3559  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3560   3560       add_srs_wkt (p, 4,
  3561         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3561  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3562   3562       add_srs_wkt (p, 5,
  3563         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3563  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3564   3564       add_srs_wkt (p, 6,
  3565         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3565  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3566   3566       add_srs_wkt (p, 7,
  3567         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3567  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3568   3568       add_srs_wkt (p, 8,
  3569         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3569  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3570   3570       add_srs_wkt (p, 9,
  3571         -        "igin\",0],PARAMETER[\"central_meridian\",153],PARAMETER[");
         3571  +        "rigin\",0],PARAMETER[\"central_meridian\",153],PARAMETER");
  3572   3572       add_srs_wkt (p, 10,
  3573         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3573  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3574   3574       add_srs_wkt (p, 11,
  3575         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3575  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3576   3576       add_srs_wkt (p, 12,
  3577         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3577  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3578   3578       add_srs_wkt (p, 13,
  3579         -        "],AUTHORITY[\"EPSG\",\"2516\"]]");
         3579  +        "T],AUTHORITY[\"EPSG\",\"2516\"]]");
  3580   3580       p = add_epsg_def_ex (filter, first, last, 2517, "epsg", 2517,
  3581   3581           "Pulkovo 1942 / Gauss-Kruger CM 159E", 0, 1,
  3582   3582           "Krassowsky 1940", "Greenwich",
  3583   3583           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3584   3584           "X", "North", "Y", "East");
  3585   3585       add_proj4text (p, 0,
  3586   3586           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
  3587   3587       add_proj4text (p, 1,
  3588         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3588  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3589   3589       add_proj4text (p, 2,
  3590         -        ".12 +units=m +no_defs");
         3590  +        "0.12 +units=m +no_defs");
  3591   3591       add_srs_wkt (p, 0,
  3592   3592           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 159E\",GEOGCS[\"");
  3593   3593       add_srs_wkt (p, 1,
  3594   3594           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3595   3595       add_srs_wkt (p, 2,
  3596   3596           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3597   3597       add_srs_wkt (p, 3,
  3598         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3598  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3599   3599       add_srs_wkt (p, 4,
  3600         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3600  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3601   3601       add_srs_wkt (p, 5,
  3602         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3602  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3603   3603       add_srs_wkt (p, 6,
  3604         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3604  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3605   3605       add_srs_wkt (p, 7,
  3606         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3606  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3607   3607       add_srs_wkt (p, 8,
  3608         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3608  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3609   3609       add_srs_wkt (p, 9,
  3610         -        "igin\",0],PARAMETER[\"central_meridian\",159],PARAMETER[");
         3610  +        "rigin\",0],PARAMETER[\"central_meridian\",159],PARAMETER");
  3611   3611       add_srs_wkt (p, 10,
  3612         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3612  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3613   3613       add_srs_wkt (p, 11,
  3614         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3614  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3615   3615       add_srs_wkt (p, 12,
  3616         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3616  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3617   3617       add_srs_wkt (p, 13,
  3618         -        "],AUTHORITY[\"EPSG\",\"2517\"]]");
         3618  +        "T],AUTHORITY[\"EPSG\",\"2517\"]]");
  3619   3619       p = add_epsg_def_ex (filter, first, last, 2518, "epsg", 2518,
  3620   3620           "Pulkovo 1942 / Gauss-Kruger CM 165E", 0, 1,
  3621   3621           "Krassowsky 1940", "Greenwich",
  3622   3622           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3623   3623           "X", "North", "Y", "East");
  3624   3624       add_proj4text (p, 0,
  3625   3625           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
  3626   3626       add_proj4text (p, 1,
  3627         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3627  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3628   3628       add_proj4text (p, 2,
  3629         -        ".12 +units=m +no_defs");
         3629  +        "0.12 +units=m +no_defs");
  3630   3630       add_srs_wkt (p, 0,
  3631   3631           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 165E\",GEOGCS[\"");
  3632   3632       add_srs_wkt (p, 1,
  3633   3633           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3634   3634       add_srs_wkt (p, 2,
  3635   3635           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3636   3636       add_srs_wkt (p, 3,
  3637         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3637  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3638   3638       add_srs_wkt (p, 4,
  3639         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3639  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3640   3640       add_srs_wkt (p, 5,
  3641         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3641  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3642   3642       add_srs_wkt (p, 6,
  3643         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3643  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3644   3644       add_srs_wkt (p, 7,
  3645         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3645  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3646   3646       add_srs_wkt (p, 8,
  3647         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3647  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3648   3648       add_srs_wkt (p, 9,
  3649         -        "igin\",0],PARAMETER[\"central_meridian\",165],PARAMETER[");
         3649  +        "rigin\",0],PARAMETER[\"central_meridian\",165],PARAMETER");
  3650   3650       add_srs_wkt (p, 10,
  3651         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3651  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3652   3652       add_srs_wkt (p, 11,
  3653         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3653  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3654   3654       add_srs_wkt (p, 12,
  3655         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3655  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3656   3656       add_srs_wkt (p, 13,
  3657         -        "],AUTHORITY[\"EPSG\",\"2518\"]]");
         3657  +        "T],AUTHORITY[\"EPSG\",\"2518\"]]");
  3658   3658       p = add_epsg_def_ex (filter, first, last, 2519, "epsg", 2519,
  3659   3659           "Pulkovo 1942 / Gauss-Kruger CM 171E", 0, 1,
  3660   3660           "Krassowsky 1940", "Greenwich",
  3661   3661           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3662   3662           "X", "North", "Y", "East");
  3663   3663       add_proj4text (p, 0,
  3664   3664           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
  3665   3665       add_proj4text (p, 1,
  3666         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3666  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3667   3667       add_proj4text (p, 2,
  3668         -        ".12 +units=m +no_defs");
         3668  +        "0.12 +units=m +no_defs");
  3669   3669       add_srs_wkt (p, 0,
  3670   3670           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 171E\",GEOGCS[\"");
  3671   3671       add_srs_wkt (p, 1,
  3672   3672           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3673   3673       add_srs_wkt (p, 2,
  3674   3674           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3675   3675       add_srs_wkt (p, 3,
  3676         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3676  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3677   3677       add_srs_wkt (p, 4,
  3678         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3678  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3679   3679       add_srs_wkt (p, 5,
  3680         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3680  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3681   3681       add_srs_wkt (p, 6,
  3682         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3682  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3683   3683       add_srs_wkt (p, 7,
  3684         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3684  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3685   3685       add_srs_wkt (p, 8,
  3686         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3686  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3687   3687       add_srs_wkt (p, 9,
  3688         -        "igin\",0],PARAMETER[\"central_meridian\",171],PARAMETER[");
         3688  +        "rigin\",0],PARAMETER[\"central_meridian\",171],PARAMETER");
  3689   3689       add_srs_wkt (p, 10,
  3690         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3690  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3691   3691       add_srs_wkt (p, 11,
  3692         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3692  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3693   3693       add_srs_wkt (p, 12,
  3694         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3694  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3695   3695       add_srs_wkt (p, 13,
  3696         -        "],AUTHORITY[\"EPSG\",\"2519\"]]");
         3696  +        "T],AUTHORITY[\"EPSG\",\"2519\"]]");
  3697   3697       p = add_epsg_def_ex (filter, first, last, 2520, "epsg", 2520,
  3698   3698           "Pulkovo 1942 / Gauss-Kruger CM 177E", 0, 1,
  3699   3699           "Krassowsky 1940", "Greenwich",
  3700   3700           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3701   3701           "X", "North", "Y", "East");
  3702   3702       add_proj4text (p, 0,
  3703   3703           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
  3704   3704       add_proj4text (p, 1,
  3705         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3705  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3706   3706       add_proj4text (p, 2,
  3707         -        ".12 +units=m +no_defs");
         3707  +        "0.12 +units=m +no_defs");
  3708   3708       add_srs_wkt (p, 0,
  3709   3709           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 177E\",GEOGCS[\"");
  3710   3710       add_srs_wkt (p, 1,
  3711   3711           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3712   3712       add_srs_wkt (p, 2,
  3713   3713           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3714   3714       add_srs_wkt (p, 3,
  3715         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3715  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3716   3716       add_srs_wkt (p, 4,
  3717         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3717  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3718   3718       add_srs_wkt (p, 5,
  3719         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3719  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3720   3720       add_srs_wkt (p, 6,
  3721         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3721  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3722   3722       add_srs_wkt (p, 7,
  3723         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3723  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3724   3724       add_srs_wkt (p, 8,
  3725         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3725  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3726   3726       add_srs_wkt (p, 9,
  3727         -        "igin\",0],PARAMETER[\"central_meridian\",177],PARAMETER[");
         3727  +        "rigin\",0],PARAMETER[\"central_meridian\",177],PARAMETER");
  3728   3728       add_srs_wkt (p, 10,
  3729         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",500000],");
         3729  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
  3730   3730       add_srs_wkt (p, 11,
  3731         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3731  +        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
  3732   3732       add_srs_wkt (p, 12,
  3733         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3733  +        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
  3734   3734       add_srs_wkt (p, 13,
  3735         -        "],AUTHORITY[\"EPSG\",\"2520\"]]");
         3735  +        "T],AUTHORITY[\"EPSG\",\"2520\"]]");
  3736   3736       p = add_epsg_def_ex (filter, first, last, 2521, "epsg", 2521,
  3737   3737           "Pulkovo 1942 / Gauss-Kruger CM 177W", 0, 1,
  3738   3738           "Krassowsky 1940", "Greenwich",
  3739   3739           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3740   3740           "X", "North", "Y", "East");
  3741   3741       add_proj4text (p, 0,
  3742   3742           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
  3743   3743       add_proj4text (p, 1,
  3744         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         3744  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  3745   3745       add_proj4text (p, 2,
  3746         -        "0.12 +units=m +no_defs");
         3746  +        "-0.12 +units=m +no_defs");
  3747   3747       add_srs_wkt (p, 0,
  3748   3748           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 177W\",GEOGCS[\"");
  3749   3749       add_srs_wkt (p, 1,
  3750   3750           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3751   3751       add_srs_wkt (p, 2,
  3752   3752           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3753   3753       add_srs_wkt (p, 3,
  3754         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3754  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3755   3755       add_srs_wkt (p, 4,
  3756         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3756  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3757   3757       add_srs_wkt (p, 5,
  3758         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3758  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3759   3759       add_srs_wkt (p, 6,
  3760         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3760  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3761   3761       add_srs_wkt (p, 7,
  3762         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3762  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3763   3763       add_srs_wkt (p, 8,
  3764         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3764  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3765   3765       add_srs_wkt (p, 9,
  3766         -        "igin\",0],PARAMETER[\"central_meridian\",-177],PARAMETER");
         3766  +        "rigin\",0],PARAMETER[\"central_meridian\",-177],PARAMETE");
  3767   3767       add_srs_wkt (p, 10,
  3768         -        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3768  +        "R[\"scale_factor\",1],PARAMETER[\"false_easting\",500000");
  3769   3769       add_srs_wkt (p, 11,
  3770         -        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3770  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3771   3771       add_srs_wkt (p, 12,
  3772         -        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3772  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3773   3773       add_srs_wkt (p, 13,
  3774         -        "T],AUTHORITY[\"EPSG\",\"2521\"]]");
         3774  +        "ST],AUTHORITY[\"EPSG\",\"2521\"]]");
  3775   3775       p = add_epsg_def_ex (filter, first, last, 2522, "epsg", 2522,
  3776   3776           "Pulkovo 1942 / Gauss-Kruger CM 171W", 0, 1,
  3777   3777           "Krassowsky 1940", "Greenwich",
  3778   3778           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3779   3779           "X", "North", "Y", "East");
  3780   3780       add_proj4text (p, 0,
  3781   3781           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
  3782   3782       add_proj4text (p, 1,
  3783         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         3783  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  3784   3784       add_proj4text (p, 2,
  3785         -        "0.12 +units=m +no_defs");
         3785  +        "-0.12 +units=m +no_defs");
  3786   3786       add_srs_wkt (p, 0,
  3787   3787           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger CM 171W\",GEOGCS[\"");
  3788   3788       add_srs_wkt (p, 1,
  3789   3789           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3790   3790       add_srs_wkt (p, 2,
  3791   3791           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3792   3792       add_srs_wkt (p, 3,
  3793         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         3793  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  3794   3794       add_srs_wkt (p, 4,
  3795         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3795  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  3796   3796       add_srs_wkt (p, 5,
  3797         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3797  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  3798   3798       add_srs_wkt (p, 6,
  3799         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3799  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  3800   3800       add_srs_wkt (p, 7,
  3801         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         3801  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  3802   3802       add_srs_wkt (p, 8,
  3803         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3803  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
  3804   3804       add_srs_wkt (p, 9,
  3805         -        "igin\",0],PARAMETER[\"central_meridian\",-171],PARAMETER");
         3805  +        "rigin\",0],PARAMETER[\"central_meridian\",-171],PARAMETE");
  3806   3806       add_srs_wkt (p, 10,
  3807         -        "[\"scale_factor\",1],PARAMETER[\"false_easting\",500000]");
         3807  +        "R[\"scale_factor\",1],PARAMETER[\"false_easting\",500000");
  3808   3808       add_srs_wkt (p, 11,
  3809         -        ",PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHOR");
         3809  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3810   3810       add_srs_wkt (p, 12,
  3811         -        "ITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAS");
         3811  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3812   3812       add_srs_wkt (p, 13,
  3813         -        "T],AUTHORITY[\"EPSG\",\"2522\"]]");
         3813  +        "ST],AUTHORITY[\"EPSG\",\"2522\"]]");
  3814   3814       p = add_epsg_def_ex (filter, first, last, 2523, "epsg", 2523,
  3815   3815           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 7", 0, 1,
  3816   3816           "Krassowsky 1940", "Greenwich",
  3817   3817           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3818   3818           "X", "North", "Y", "East");
  3819   3819       add_proj4text (p, 0,
  3820   3820           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=7500000 +y_0=0 ");
  3821   3821       add_proj4text (p, 1,
  3822         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3822  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3823   3823       add_proj4text (p, 2,
  3824         -        ".12 +units=m +no_defs");
         3824  +        "0.12 +units=m +no_defs");
  3825   3825       add_srs_wkt (p, 0,
  3826   3826           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 7\",G");
  3827   3827       add_srs_wkt (p, 1,
  3828   3828           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3829   3829       add_srs_wkt (p, 2,
  3830   3830           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3831   3831       add_srs_wkt (p, 3,
  3832         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3832  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3833   3833       add_srs_wkt (p, 4,
  3834         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3834  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3835   3835       add_srs_wkt (p, 5,
  3836         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3836  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3837   3837       add_srs_wkt (p, 6,
  3838         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3838  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3839   3839       add_srs_wkt (p, 7,
  3840         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3840  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3841   3841       add_srs_wkt (p, 8,
  3842         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3842  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3843   3843       add_srs_wkt (p, 9,
  3844         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
         3844  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",21],PAR");
  3845   3845       add_srs_wkt (p, 10,
  3846         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",75");
         3846  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",7");
  3847   3847       add_srs_wkt (p, 11,
  3848         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3848  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  3849   3849       add_srs_wkt (p, 12,
  3850         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3850  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3851   3851       add_srs_wkt (p, 13,
  3852         -        "\",EAST],AUTHORITY[\"EPSG\",\"2523\"]]");
         3852  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2523\"]]");
  3853   3853       p = add_epsg_def_ex (filter, first, last, 2524, "epsg", 2524,
  3854   3854           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 8", 0, 1,
  3855   3855           "Krassowsky 1940", "Greenwich",
  3856   3856           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3857   3857           "X", "North", "Y", "East");
  3858   3858       add_proj4text (p, 0,
  3859   3859           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=8500000 +y_0=0 ");
  3860   3860       add_proj4text (p, 1,
  3861         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3861  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3862   3862       add_proj4text (p, 2,
  3863         -        ".12 +units=m +no_defs");
         3863  +        "0.12 +units=m +no_defs");
  3864   3864       add_srs_wkt (p, 0,
  3865   3865           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 8\",G");
  3866   3866       add_srs_wkt (p, 1,
  3867   3867           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3868   3868       add_srs_wkt (p, 2,
  3869   3869           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3870   3870       add_srs_wkt (p, 3,
  3871         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3871  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3872   3872       add_srs_wkt (p, 4,
  3873         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3873  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3874   3874       add_srs_wkt (p, 5,
  3875         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3875  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3876   3876       add_srs_wkt (p, 6,
  3877         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3877  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3878   3878       add_srs_wkt (p, 7,
  3879         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3879  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3880   3880       add_srs_wkt (p, 8,
  3881         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3881  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3882   3882       add_srs_wkt (p, 9,
  3883         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",24],PARA");
         3883  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",24],PAR");
  3884   3884       add_srs_wkt (p, 10,
  3885         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",85");
         3885  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",8");
  3886   3886       add_srs_wkt (p, 11,
  3887         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3887  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  3888   3888       add_srs_wkt (p, 12,
  3889         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3889  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3890   3890       add_srs_wkt (p, 13,
  3891         -        "\",EAST],AUTHORITY[\"EPSG\",\"2524\"]]");
         3891  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2524\"]]");
  3892   3892       p = add_epsg_def_ex (filter, first, last, 2525, "epsg", 2525,
  3893   3893           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 9", 0, 1,
  3894   3894           "Krassowsky 1940", "Greenwich",
  3895   3895           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3896   3896           "X", "North", "Y", "East");
  3897   3897       add_proj4text (p, 0,
  3898   3898           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=9500000 +y_0=0 ");
  3899   3899       add_proj4text (p, 1,
  3900         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3900  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3901   3901       add_proj4text (p, 2,
  3902         -        ".12 +units=m +no_defs");
         3902  +        "0.12 +units=m +no_defs");
  3903   3903       add_srs_wkt (p, 0,
  3904   3904           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 9\",G");
  3905   3905       add_srs_wkt (p, 1,
  3906   3906           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3907   3907       add_srs_wkt (p, 2,
  3908   3908           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3909   3909       add_srs_wkt (p, 3,
  3910         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3910  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3911   3911       add_srs_wkt (p, 4,
  3912         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3912  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3913   3913       add_srs_wkt (p, 5,
  3914         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3914  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3915   3915       add_srs_wkt (p, 6,
  3916         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3916  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3917   3917       add_srs_wkt (p, 7,
  3918         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3918  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3919   3919       add_srs_wkt (p, 8,
  3920         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3920  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3921   3921       add_srs_wkt (p, 9,
  3922         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
         3922  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",27],PAR");
  3923   3923       add_srs_wkt (p, 10,
  3924         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",95");
         3924  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",9");
  3925   3925       add_srs_wkt (p, 11,
  3926         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3926  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  3927   3927       add_srs_wkt (p, 12,
  3928         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3928  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3929   3929       add_srs_wkt (p, 13,
  3930         -        "\",EAST],AUTHORITY[\"EPSG\",\"2525\"]]");
         3930  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2525\"]]");
  3931   3931       p = add_epsg_def_ex (filter, first, last, 2526, "epsg", 2526,
  3932   3932           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 10", 0, 1,
  3933   3933           "Krassowsky 1940", "Greenwich",
  3934   3934           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3935   3935           "X", "North", "Y", "East");
  3936   3936       add_proj4text (p, 0,
  3937   3937           "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=10500000 +y_0=0");
  3938   3938       add_proj4text (p, 1,
  3939         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         3939  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  3940   3940       add_proj4text (p, 2,
  3941         -        "0.12 +units=m +no_defs");
         3941  +        "-0.12 +units=m +no_defs");
  3942   3942       add_srs_wkt (p, 0,
  3943   3943           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 10\",");
  3944   3944       add_srs_wkt (p, 1,
  3945   3945           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3946   3946       add_srs_wkt (p, 2,
  3947   3947           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3948   3948       add_srs_wkt (p, 3,
  3949         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3949  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3950   3950       add_srs_wkt (p, 4,
  3951         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3951  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3952   3952       add_srs_wkt (p, 5,
  3953         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3953  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3954   3954       add_srs_wkt (p, 6,
  3955         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3955  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3956   3956       add_srs_wkt (p, 7,
  3957         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3957  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3958   3958       add_srs_wkt (p, 8,
  3959   3959           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3960   3960       add_srs_wkt (p, 9,
  3961   3961           "ude_of_origin\",0],PARAMETER[\"central_meridian\",30],PA");
  3962   3962       add_srs_wkt (p, 10,
  3963   3963           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  3964   3964       add_srs_wkt (p, 11,

Changes to src/srsinit/epsg_inlined_05.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 11", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Pulkovo_1942", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=11500000 +y_0=0");
    64     64       add_proj4text (p, 1,
    65         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
           65  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
    66     66       add_proj4text (p, 2,
    67         -        "0.12 +units=m +no_defs");
           67  +        "-0.12 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 11\",");
    70     70       add_srs_wkt (p, 1,
    71     71           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
    72     72       add_srs_wkt (p, 2,
    73     73           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
    74     74       add_srs_wkt (p, 3,
    75         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
           75  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
    76     76       add_srs_wkt (p, 4,
    77         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
           77  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
    78     78       add_srs_wkt (p, 5,
    79         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
           79  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
    80     80       add_srs_wkt (p, 6,
    81         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
           81  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
    82     82       add_srs_wkt (p, 7,
    83         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
           83  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
    84     84       add_srs_wkt (p, 8,
    85     85           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
    86     86       add_srs_wkt (p, 9,
    87     87           "ude_of_origin\",0],PARAMETER[\"central_meridian\",33],PA");
    88     88       add_srs_wkt (p, 10,
    89     89           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
    90     90       add_srs_wkt (p, 11,
................................................................................
    97     97           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 12", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Pulkovo_1942", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=12500000 +y_0=0");
   103    103       add_proj4text (p, 1,
   104         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          104  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   105    105       add_proj4text (p, 2,
   106         -        "0.12 +units=m +no_defs");
          106  +        "-0.12 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 12\",");
   109    109       add_srs_wkt (p, 1,
   110    110           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   111    111       add_srs_wkt (p, 2,
   112    112           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   113    113       add_srs_wkt (p, 3,
   114         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          114  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   115    115       add_srs_wkt (p, 4,
   116         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          116  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   117    117       add_srs_wkt (p, 5,
   118         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          118  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   119    119       add_srs_wkt (p, 6,
   120         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          120  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   121    121       add_srs_wkt (p, 7,
   122         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          122  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   123    123       add_srs_wkt (p, 8,
   124    124           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   125    125       add_srs_wkt (p, 9,
   126    126           "ude_of_origin\",0],PARAMETER[\"central_meridian\",36],PA");
   127    127       add_srs_wkt (p, 10,
   128    128           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   129    129       add_srs_wkt (p, 11,
................................................................................
   136    136           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 13", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Pulkovo_1942", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=13500000 +y_0=0");
   142    142       add_proj4text (p, 1,
   143         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          143  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   144    144       add_proj4text (p, 2,
   145         -        "0.12 +units=m +no_defs");
          145  +        "-0.12 +units=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 13\",");
   148    148       add_srs_wkt (p, 1,
   149    149           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   150    150       add_srs_wkt (p, 2,
   151    151           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   152    152       add_srs_wkt (p, 3,
   153         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          153  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   154    154       add_srs_wkt (p, 4,
   155         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          155  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   156    156       add_srs_wkt (p, 5,
   157         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          157  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   158    158       add_srs_wkt (p, 6,
   159         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          159  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   160    160       add_srs_wkt (p, 7,
   161         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          161  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   162    162       add_srs_wkt (p, 8,
   163    163           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   164    164       add_srs_wkt (p, 9,
   165    165           "ude_of_origin\",0],PARAMETER[\"central_meridian\",39],PA");
   166    166       add_srs_wkt (p, 10,
   167    167           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   168    168       add_srs_wkt (p, 11,
................................................................................
   175    175           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 14", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Pulkovo_1942", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=14500000 +y_0=0");
   181    181       add_proj4text (p, 1,
   182         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          182  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   183    183       add_proj4text (p, 2,
   184         -        "0.12 +units=m +no_defs");
          184  +        "-0.12 +units=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 14\",");
   187    187       add_srs_wkt (p, 1,
   188    188           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   189    189       add_srs_wkt (p, 2,
   190    190           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   191    191       add_srs_wkt (p, 3,
   192         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          192  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   193    193       add_srs_wkt (p, 4,
   194         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          194  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   195    195       add_srs_wkt (p, 5,
   196         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          196  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   197    197       add_srs_wkt (p, 6,
   198         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          198  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   199    199       add_srs_wkt (p, 7,
   200         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          200  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   201    201       add_srs_wkt (p, 8,
   202    202           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   203    203       add_srs_wkt (p, 9,
   204    204           "ude_of_origin\",0],PARAMETER[\"central_meridian\",42],PA");
   205    205       add_srs_wkt (p, 10,
   206    206           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   207    207       add_srs_wkt (p, 11,
................................................................................
   214    214           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 15", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Pulkovo_1942", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=15500000 +y_0=0");
   220    220       add_proj4text (p, 1,
   221         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          221  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   222    222       add_proj4text (p, 2,
   223         -        "0.12 +units=m +no_defs");
          223  +        "-0.12 +units=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 15\",");
   226    226       add_srs_wkt (p, 1,
   227    227           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   228    228       add_srs_wkt (p, 2,
   229    229           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   230    230       add_srs_wkt (p, 3,
   231         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          231  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   232    232       add_srs_wkt (p, 4,
   233         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          233  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   234    234       add_srs_wkt (p, 5,
   235         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          235  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   236    236       add_srs_wkt (p, 6,
   237         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          237  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   238    238       add_srs_wkt (p, 7,
   239         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          239  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   240    240       add_srs_wkt (p, 8,
   241    241           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   242    242       add_srs_wkt (p, 9,
   243    243           "ude_of_origin\",0],PARAMETER[\"central_meridian\",45],PA");
   244    244       add_srs_wkt (p, 10,
   245    245           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   246    246       add_srs_wkt (p, 11,
................................................................................
   253    253           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 16", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Pulkovo_1942", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=16500000 +y_0=0");
   259    259       add_proj4text (p, 1,
   260         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          260  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   261    261       add_proj4text (p, 2,
   262         -        "0.12 +units=m +no_defs");
          262  +        "-0.12 +units=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 16\",");
   265    265       add_srs_wkt (p, 1,
   266    266           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   267    267       add_srs_wkt (p, 2,
   268    268           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   269    269       add_srs_wkt (p, 3,
   270         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          270  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   271    271       add_srs_wkt (p, 4,
   272         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          272  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   273    273       add_srs_wkt (p, 5,
   274         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          274  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   275    275       add_srs_wkt (p, 6,
   276         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          276  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   277    277       add_srs_wkt (p, 7,
   278         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          278  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   279    279       add_srs_wkt (p, 8,
   280    280           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   281    281       add_srs_wkt (p, 9,
   282    282           "ude_of_origin\",0],PARAMETER[\"central_meridian\",48],PA");
   283    283       add_srs_wkt (p, 10,
   284    284           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   285    285       add_srs_wkt (p, 11,
................................................................................
   292    292           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 17", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Pulkovo_1942", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=17500000 +y_0=0");
   298    298       add_proj4text (p, 1,
   299         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          299  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   300    300       add_proj4text (p, 2,
   301         -        "0.12 +units=m +no_defs");
          301  +        "-0.12 +units=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 17\",");
   304    304       add_srs_wkt (p, 1,
   305    305           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   306    306       add_srs_wkt (p, 2,
   307    307           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   308    308       add_srs_wkt (p, 3,
   309         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          309  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   310    310       add_srs_wkt (p, 4,
   311         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          311  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   312    312       add_srs_wkt (p, 5,
   313         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          313  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   314    314       add_srs_wkt (p, 6,
   315         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          315  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   316    316       add_srs_wkt (p, 7,
   317         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          317  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   318    318       add_srs_wkt (p, 8,
   319    319           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   320    320       add_srs_wkt (p, 9,
   321    321           "ude_of_origin\",0],PARAMETER[\"central_meridian\",51],PA");
   322    322       add_srs_wkt (p, 10,
   323    323           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   324    324       add_srs_wkt (p, 11,
................................................................................
   331    331           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 18", 0, 1,
   332    332           "Krassowsky 1940", "Greenwich",
   333    333           "Pulkovo_1942", "Transverse_Mercator", "metre",
   334    334           "X", "North", "Y", "East");
   335    335       add_proj4text (p, 0,
   336    336           "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=18500000 +y_0=0");
   337    337       add_proj4text (p, 1,
   338         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          338  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   339    339       add_proj4text (p, 2,
   340         -        "0.12 +units=m +no_defs");
          340  +        "-0.12 +units=m +no_defs");
   341    341       add_srs_wkt (p, 0,
   342    342           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 18\",");
   343    343       add_srs_wkt (p, 1,
   344    344           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   345    345       add_srs_wkt (p, 2,
   346    346           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   347    347       add_srs_wkt (p, 3,
   348         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          348  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   349    349       add_srs_wkt (p, 4,
   350         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          350  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   351    351       add_srs_wkt (p, 5,
   352         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          352  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   353    353       add_srs_wkt (p, 6,
   354         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          354  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   355    355       add_srs_wkt (p, 7,
   356         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          356  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   357    357       add_srs_wkt (p, 8,
   358    358           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   359    359       add_srs_wkt (p, 9,
   360    360           "ude_of_origin\",0],PARAMETER[\"central_meridian\",54],PA");
   361    361       add_srs_wkt (p, 10,
   362    362           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   363    363       add_srs_wkt (p, 11,
................................................................................
   370    370           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 19", 0, 1,
   371    371           "Krassowsky 1940", "Greenwich",
   372    372           "Pulkovo_1942", "Transverse_Mercator", "metre",
   373    373           "X", "North", "Y", "East");
   374    374       add_proj4text (p, 0,
   375    375           "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=19500000 +y_0=0");
   376    376       add_proj4text (p, 1,
   377         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          377  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   378    378       add_proj4text (p, 2,
   379         -        "0.12 +units=m +no_defs");
          379  +        "-0.12 +units=m +no_defs");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 19\",");
   382    382       add_srs_wkt (p, 1,
   383    383           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   384    384       add_srs_wkt (p, 2,
   385    385           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   386    386       add_srs_wkt (p, 3,
   387         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          387  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   388    388       add_srs_wkt (p, 4,
   389         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          389  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   390    390       add_srs_wkt (p, 5,
   391         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          391  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   392    392       add_srs_wkt (p, 6,
   393         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          393  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   394    394       add_srs_wkt (p, 7,
   395         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          395  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   396    396       add_srs_wkt (p, 8,
   397    397           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   398    398       add_srs_wkt (p, 9,
   399    399           "ude_of_origin\",0],PARAMETER[\"central_meridian\",57],PA");
   400    400       add_srs_wkt (p, 10,
   401    401           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   402    402       add_srs_wkt (p, 11,
................................................................................
   409    409           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 20", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Pulkovo_1942", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=20500000 +y_0=0");
   415    415       add_proj4text (p, 1,
   416         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          416  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   417    417       add_proj4text (p, 2,
   418         -        "0.12 +units=m +no_defs");
          418  +        "-0.12 +units=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 20\",");
   421    421       add_srs_wkt (p, 1,
   422    422           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   423    423       add_srs_wkt (p, 2,
   424    424           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   425    425       add_srs_wkt (p, 3,
   426         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          426  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   427    427       add_srs_wkt (p, 4,
   428         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          428  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   429    429       add_srs_wkt (p, 5,
   430         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          430  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   431    431       add_srs_wkt (p, 6,
   432         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          432  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   433    433       add_srs_wkt (p, 7,
   434         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          434  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   435    435       add_srs_wkt (p, 8,
   436    436           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   437    437       add_srs_wkt (p, 9,
   438    438           "ude_of_origin\",0],PARAMETER[\"central_meridian\",60],PA");
   439    439       add_srs_wkt (p, 10,
   440    440           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   441    441       add_srs_wkt (p, 11,
................................................................................
   448    448           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 21", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Pulkovo_1942", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=21500000 +y_0=0");
   454    454       add_proj4text (p, 1,
   455         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          455  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   456    456       add_proj4text (p, 2,
   457         -        "0.12 +units=m +no_defs");
          457  +        "-0.12 +units=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 21\",");
   460    460       add_srs_wkt (p, 1,
   461    461           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   462    462       add_srs_wkt (p, 2,
   463    463           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   464    464       add_srs_wkt (p, 3,
   465         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          465  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   466    466       add_srs_wkt (p, 4,
   467         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          467  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   468    468       add_srs_wkt (p, 5,
   469         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          469  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   470    470       add_srs_wkt (p, 6,
   471         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          471  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   472    472       add_srs_wkt (p, 7,
   473         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          473  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   474    474       add_srs_wkt (p, 8,
   475    475           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   476    476       add_srs_wkt (p, 9,
   477    477           "ude_of_origin\",0],PARAMETER[\"central_meridian\",63],PA");
   478    478       add_srs_wkt (p, 10,
   479    479           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   480    480       add_srs_wkt (p, 11,
................................................................................
   487    487           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 22", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Pulkovo_1942", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=22500000 +y_0=0");
   493    493       add_proj4text (p, 1,
   494         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          494  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   495    495       add_proj4text (p, 2,
   496         -        "0.12 +units=m +no_defs");
          496  +        "-0.12 +units=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 22\",");
   499    499       add_srs_wkt (p, 1,
   500    500           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   501    501       add_srs_wkt (p, 2,
   502    502           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   503    503       add_srs_wkt (p, 3,
   504         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          504  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   505    505       add_srs_wkt (p, 4,
   506         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          506  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   507    507       add_srs_wkt (p, 5,
   508         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          508  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   509    509       add_srs_wkt (p, 6,
   510         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          510  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   511    511       add_srs_wkt (p, 7,
   512         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          512  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   513    513       add_srs_wkt (p, 8,
   514    514           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   515    515       add_srs_wkt (p, 9,
   516    516           "ude_of_origin\",0],PARAMETER[\"central_meridian\",66],PA");
   517    517       add_srs_wkt (p, 10,
   518    518           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   519    519       add_srs_wkt (p, 11,
................................................................................
   526    526           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 23", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Pulkovo_1942", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=23500000 +y_0=0");
   532    532       add_proj4text (p, 1,
   533         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          533  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   534    534       add_proj4text (p, 2,
   535         -        "0.12 +units=m +no_defs");
          535  +        "-0.12 +units=m +no_defs");
   536    536       add_srs_wkt (p, 0,
   537    537           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 23\",");
   538    538       add_srs_wkt (p, 1,
   539    539           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   540    540       add_srs_wkt (p, 2,
   541    541           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   542    542       add_srs_wkt (p, 3,
   543         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          543  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   544    544       add_srs_wkt (p, 4,
   545         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          545  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   546    546       add_srs_wkt (p, 5,
   547         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          547  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   548    548       add_srs_wkt (p, 6,
   549         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          549  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   550    550       add_srs_wkt (p, 7,
   551         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          551  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   552    552       add_srs_wkt (p, 8,
   553    553           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   554    554       add_srs_wkt (p, 9,
   555    555           "ude_of_origin\",0],PARAMETER[\"central_meridian\",69],PA");
   556    556       add_srs_wkt (p, 10,
   557    557           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   558    558       add_srs_wkt (p, 11,
................................................................................
   565    565           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 24", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Pulkovo_1942", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=24500000 +y_0=0");
   571    571       add_proj4text (p, 1,
   572         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          572  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   573    573       add_proj4text (p, 2,
   574         -        "0.12 +units=m +no_defs");
          574  +        "-0.12 +units=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 24\",");
   577    577       add_srs_wkt (p, 1,
   578    578           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   579    579       add_srs_wkt (p, 2,
   580    580           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   581    581       add_srs_wkt (p, 3,
   582         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          582  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   583    583       add_srs_wkt (p, 4,
   584         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          584  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   585    585       add_srs_wkt (p, 5,
   586         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          586  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   587    587       add_srs_wkt (p, 6,
   588         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          588  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   589    589       add_srs_wkt (p, 7,
   590         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          590  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   591    591       add_srs_wkt (p, 8,
   592    592           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   593    593       add_srs_wkt (p, 9,
   594    594           "ude_of_origin\",0],PARAMETER[\"central_meridian\",72],PA");
   595    595       add_srs_wkt (p, 10,
   596    596           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   597    597       add_srs_wkt (p, 11,
................................................................................
   604    604           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 25", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Pulkovo_1942", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=25500000 +y_0=0");
   610    610       add_proj4text (p, 1,
   611         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          611  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   612    612       add_proj4text (p, 2,
   613         -        "0.12 +units=m +no_defs");
          613  +        "-0.12 +units=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 25\",");
   616    616       add_srs_wkt (p, 1,
   617    617           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   618    618       add_srs_wkt (p, 2,
   619    619           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   620    620       add_srs_wkt (p, 3,
   621         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          621  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   622    622       add_srs_wkt (p, 4,
   623         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          623  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   624    624       add_srs_wkt (p, 5,
   625         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          625  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   626    626       add_srs_wkt (p, 6,
   627         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          627  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   628    628       add_srs_wkt (p, 7,
   629         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          629  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   630    630       add_srs_wkt (p, 8,
   631    631           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   632    632       add_srs_wkt (p, 9,
   633    633           "ude_of_origin\",0],PARAMETER[\"central_meridian\",75],PA");
   634    634       add_srs_wkt (p, 10,
   635    635           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   636    636       add_srs_wkt (p, 11,
................................................................................
   643    643           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 26", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Pulkovo_1942", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=26500000 +y_0=0");
   649    649       add_proj4text (p, 1,
   650         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          650  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   651    651       add_proj4text (p, 2,
   652         -        "0.12 +units=m +no_defs");
          652  +        "-0.12 +units=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 26\",");
   655    655       add_srs_wkt (p, 1,
   656    656           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   657    657       add_srs_wkt (p, 2,
   658    658           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   659    659       add_srs_wkt (p, 3,
   660         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          660  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   661    661       add_srs_wkt (p, 4,
   662         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          662  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   663    663       add_srs_wkt (p, 5,
   664         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          664  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   665    665       add_srs_wkt (p, 6,
   666         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          666  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   667    667       add_srs_wkt (p, 7,
   668         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          668  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   669    669       add_srs_wkt (p, 8,
   670    670           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   671    671       add_srs_wkt (p, 9,
   672    672           "ude_of_origin\",0],PARAMETER[\"central_meridian\",78],PA");
   673    673       add_srs_wkt (p, 10,
   674    674           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   675    675       add_srs_wkt (p, 11,
................................................................................
   682    682           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 27", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Pulkovo_1942", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=27500000 +y_0=0");
   688    688       add_proj4text (p, 1,
   689         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          689  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   690    690       add_proj4text (p, 2,
   691         -        "0.12 +units=m +no_defs");
          691  +        "-0.12 +units=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 27\",");
   694    694       add_srs_wkt (p, 1,
   695    695           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   696    696       add_srs_wkt (p, 2,
   697    697           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   698    698       add_srs_wkt (p, 3,
   699         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          699  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   700    700       add_srs_wkt (p, 4,
   701         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          701  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   702    702       add_srs_wkt (p, 5,
   703         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          703  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   704    704       add_srs_wkt (p, 6,
   705         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          705  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   706    706       add_srs_wkt (p, 7,
   707         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          707  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   708    708       add_srs_wkt (p, 8,
   709    709           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   710    710       add_srs_wkt (p, 9,
   711    711           "ude_of_origin\",0],PARAMETER[\"central_meridian\",81],PA");
   712    712       add_srs_wkt (p, 10,
   713    713           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   714    714       add_srs_wkt (p, 11,
................................................................................
   721    721           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 28", 0, 1,
   722    722           "Krassowsky 1940", "Greenwich",
   723    723           "Pulkovo_1942", "Transverse_Mercator", "metre",
   724    724           "X", "North", "Y", "East");
   725    725       add_proj4text (p, 0,
   726    726           "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=28500000 +y_0=0");
   727    727       add_proj4text (p, 1,
   728         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          728  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   729    729       add_proj4text (p, 2,
   730         -        "0.12 +units=m +no_defs");
          730  +        "-0.12 +units=m +no_defs");
   731    731       add_srs_wkt (p, 0,
   732    732           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 28\",");
   733    733       add_srs_wkt (p, 1,
   734    734           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   735    735       add_srs_wkt (p, 2,
   736    736           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   737    737       add_srs_wkt (p, 3,
   738         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          738  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   739    739       add_srs_wkt (p, 4,
   740         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          740  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   741    741       add_srs_wkt (p, 5,
   742         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          742  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   743    743       add_srs_wkt (p, 6,
   744         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          744  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   745    745       add_srs_wkt (p, 7,
   746         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          746  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   747    747       add_srs_wkt (p, 8,
   748    748           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   749    749       add_srs_wkt (p, 9,
   750    750           "ude_of_origin\",0],PARAMETER[\"central_meridian\",84],PA");
   751    751       add_srs_wkt (p, 10,
   752    752           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   753    753       add_srs_wkt (p, 11,
................................................................................
   760    760           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 29", 0, 1,
   761    761           "Krassowsky 1940", "Greenwich",
   762    762           "Pulkovo_1942", "Transverse_Mercator", "metre",
   763    763           "X", "North", "Y", "East");
   764    764       add_proj4text (p, 0,
   765    765           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=29500000 +y_0=0");
   766    766       add_proj4text (p, 1,
   767         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          767  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   768    768       add_proj4text (p, 2,
   769         -        "0.12 +units=m +no_defs");
          769  +        "-0.12 +units=m +no_defs");
   770    770       add_srs_wkt (p, 0,
   771    771           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 29\",");
   772    772       add_srs_wkt (p, 1,
   773    773           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   774    774       add_srs_wkt (p, 2,
   775    775           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   776    776       add_srs_wkt (p, 3,
   777         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          777  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   778    778       add_srs_wkt (p, 4,
   779         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          779  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   780    780       add_srs_wkt (p, 5,
   781         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          781  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   782    782       add_srs_wkt (p, 6,
   783         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          783  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   784    784       add_srs_wkt (p, 7,
   785         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          785  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   786    786       add_srs_wkt (p, 8,
   787    787           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   788    788       add_srs_wkt (p, 9,
   789    789           "ude_of_origin\",0],PARAMETER[\"central_meridian\",87],PA");
   790    790       add_srs_wkt (p, 10,
   791    791           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   792    792       add_srs_wkt (p, 11,
................................................................................
   799    799           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 30", 0, 1,
   800    800           "Krassowsky 1940", "Greenwich",
   801    801           "Pulkovo_1942", "Transverse_Mercator", "metre",
   802    802           "X", "North", "Y", "East");
   803    803       add_proj4text (p, 0,
   804    804           "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=30500000 +y_0=0");
   805    805       add_proj4text (p, 1,
   806         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          806  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   807    807       add_proj4text (p, 2,
   808         -        "0.12 +units=m +no_defs");
          808  +        "-0.12 +units=m +no_defs");
   809    809       add_srs_wkt (p, 0,
   810    810           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 30\",");
   811    811       add_srs_wkt (p, 1,
   812    812           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   813    813       add_srs_wkt (p, 2,
   814    814           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   815    815       add_srs_wkt (p, 3,
   816         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          816  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   817    817       add_srs_wkt (p, 4,
   818         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          818  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   819    819       add_srs_wkt (p, 5,
   820         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          820  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   821    821       add_srs_wkt (p, 6,
   822         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          822  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   823    823       add_srs_wkt (p, 7,
   824         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          824  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   825    825       add_srs_wkt (p, 8,
   826    826           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   827    827       add_srs_wkt (p, 9,
   828    828           "ude_of_origin\",0],PARAMETER[\"central_meridian\",90],PA");
   829    829       add_srs_wkt (p, 10,
   830    830           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   831    831       add_srs_wkt (p, 11,
................................................................................
   838    838           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 31", 0, 1,
   839    839           "Krassowsky 1940", "Greenwich",
   840    840           "Pulkovo_1942", "Transverse_Mercator", "metre",
   841    841           "X", "North", "Y", "East");
   842    842       add_proj4text (p, 0,
   843    843           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=31500000 +y_0=0");
   844    844       add_proj4text (p, 1,
   845         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          845  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   846    846       add_proj4text (p, 2,
   847         -        "0.12 +units=m +no_defs");
          847  +        "-0.12 +units=m +no_defs");
   848    848       add_srs_wkt (p, 0,
   849    849           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 31\",");
   850    850       add_srs_wkt (p, 1,
   851    851           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   852    852       add_srs_wkt (p, 2,
   853    853           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   854    854       add_srs_wkt (p, 3,
   855         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          855  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   856    856       add_srs_wkt (p, 4,
   857         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          857  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   858    858       add_srs_wkt (p, 5,
   859         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          859  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   860    860       add_srs_wkt (p, 6,
   861         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          861  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   862    862       add_srs_wkt (p, 7,
   863         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          863  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   864    864       add_srs_wkt (p, 8,
   865    865           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   866    866       add_srs_wkt (p, 9,
   867    867           "ude_of_origin\",0],PARAMETER[\"central_meridian\",93],PA");
   868    868       add_srs_wkt (p, 10,
   869    869           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   870    870       add_srs_wkt (p, 11,
................................................................................
   877    877           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 32", 0, 1,
   878    878           "Krassowsky 1940", "Greenwich",
   879    879           "Pulkovo_1942", "Transverse_Mercator", "metre",
   880    880           "X", "North", "Y", "East");
   881    881       add_proj4text (p, 0,
   882    882           "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=32500000 +y_0=0");
   883    883       add_proj4text (p, 1,
   884         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          884  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   885    885       add_proj4text (p, 2,
   886         -        "0.12 +units=m +no_defs");
          886  +        "-0.12 +units=m +no_defs");
   887    887       add_srs_wkt (p, 0,
   888    888           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 32\",");
   889    889       add_srs_wkt (p, 1,
   890    890           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   891    891       add_srs_wkt (p, 2,
   892    892           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   893    893       add_srs_wkt (p, 3,
   894         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          894  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   895    895       add_srs_wkt (p, 4,
   896         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          896  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   897    897       add_srs_wkt (p, 5,
   898         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          898  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   899    899       add_srs_wkt (p, 6,
   900         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          900  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   901    901       add_srs_wkt (p, 7,
   902         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          902  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   903    903       add_srs_wkt (p, 8,
   904    904           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   905    905       add_srs_wkt (p, 9,
   906    906           "ude_of_origin\",0],PARAMETER[\"central_meridian\",96],PA");
   907    907       add_srs_wkt (p, 10,
   908    908           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   909    909       add_srs_wkt (p, 11,
................................................................................
   916    916           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 33", 0, 1,
   917    917           "Krassowsky 1940", "Greenwich",
   918    918           "Pulkovo_1942", "Transverse_Mercator", "metre",
   919    919           "X", "North", "Y", "East");
   920    920       add_proj4text (p, 0,
   921    921           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=33500000 +y_0=0");
   922    922       add_proj4text (p, 1,
   923         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          923  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   924    924       add_proj4text (p, 2,
   925         -        "0.12 +units=m +no_defs");
          925  +        "-0.12 +units=m +no_defs");
   926    926       add_srs_wkt (p, 0,
   927    927           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 33\",");
   928    928       add_srs_wkt (p, 1,
   929    929           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   930    930       add_srs_wkt (p, 2,
   931    931           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   932    932       add_srs_wkt (p, 3,
   933         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          933  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   934    934       add_srs_wkt (p, 4,
   935         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          935  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   936    936       add_srs_wkt (p, 5,
   937         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          937  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   938    938       add_srs_wkt (p, 6,
   939         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          939  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   940    940       add_srs_wkt (p, 7,
   941         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          941  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   942    942       add_srs_wkt (p, 8,
   943    943           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   944    944       add_srs_wkt (p, 9,
   945    945           "ude_of_origin\",0],PARAMETER[\"central_meridian\",99],PA");
   946    946       add_srs_wkt (p, 10,
   947    947           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   948    948       add_srs_wkt (p, 11,
................................................................................
   992    992           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 34", 0, 1,
   993    993           "Krassowsky 1940", "Greenwich",
   994    994           "Pulkovo_1942", "Transverse_Mercator", "metre",
   995    995           "X", "North", "Y", "East");
   996    996       add_proj4text (p, 0,
   997    997           "+proj=tmerc +lat_0=0 +lon_0=102 +k=1 +x_0=34500000 +y_0=");
   998    998       add_proj4text (p, 1,
   999         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
          999  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1000   1000       add_proj4text (p, 2,
  1001         -        "-0.12 +units=m +no_defs");
         1001  +        ",-0.12 +units=m +no_defs");
  1002   1002       add_srs_wkt (p, 0,
  1003   1003           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 34\",");
  1004   1004       add_srs_wkt (p, 1,
  1005   1005           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1006   1006       add_srs_wkt (p, 2,
  1007   1007           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1008   1008       add_srs_wkt (p, 3,
  1009         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1009  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1010   1010       add_srs_wkt (p, 4,
  1011         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1011  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1012   1012       add_srs_wkt (p, 5,
  1013         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1013  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1014   1014       add_srs_wkt (p, 6,
  1015         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1015  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1016   1016       add_srs_wkt (p, 7,
  1017         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1017  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1018   1018       add_srs_wkt (p, 8,
  1019   1019           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1020   1020       add_srs_wkt (p, 9,
  1021   1021           "ude_of_origin\",0],PARAMETER[\"central_meridian\",102],P");
  1022   1022       add_srs_wkt (p, 10,
  1023   1023           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1024   1024       add_srs_wkt (p, 11,
................................................................................
  1031   1031           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 35", 0, 1,
  1032   1032           "Krassowsky 1940", "Greenwich",
  1033   1033           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1034   1034           "X", "North", "Y", "East");
  1035   1035       add_proj4text (p, 0,
  1036   1036           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=35500000 +y_0=");
  1037   1037       add_proj4text (p, 1,
  1038         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1038  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1039   1039       add_proj4text (p, 2,
  1040         -        "-0.12 +units=m +no_defs");
         1040  +        ",-0.12 +units=m +no_defs");
  1041   1041       add_srs_wkt (p, 0,
  1042   1042           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 35\",");
  1043   1043       add_srs_wkt (p, 1,
  1044   1044           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1045   1045       add_srs_wkt (p, 2,
  1046   1046           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1047   1047       add_srs_wkt (p, 3,
  1048         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1048  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1049   1049       add_srs_wkt (p, 4,
  1050         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1050  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1051   1051       add_srs_wkt (p, 5,
  1052         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1052  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1053   1053       add_srs_wkt (p, 6,
  1054         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1054  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1055   1055       add_srs_wkt (p, 7,
  1056         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1056  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1057   1057       add_srs_wkt (p, 8,
  1058   1058           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1059   1059       add_srs_wkt (p, 9,
  1060   1060           "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
  1061   1061       add_srs_wkt (p, 10,
  1062   1062           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1063   1063       add_srs_wkt (p, 11,
................................................................................
  1070   1070           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 36", 0, 1,
  1071   1071           "Krassowsky 1940", "Greenwich",
  1072   1072           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1073   1073           "X", "North", "Y", "East");
  1074   1074       add_proj4text (p, 0,
  1075   1075           "+proj=tmerc +lat_0=0 +lon_0=108 +k=1 +x_0=36500000 +y_0=");
  1076   1076       add_proj4text (p, 1,
  1077         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1077  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1078   1078       add_proj4text (p, 2,
  1079         -        "-0.12 +units=m +no_defs");
         1079  +        ",-0.12 +units=m +no_defs");
  1080   1080       add_srs_wkt (p, 0,
  1081   1081           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 36\",");
  1082   1082       add_srs_wkt (p, 1,
  1083   1083           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1084   1084       add_srs_wkt (p, 2,
  1085   1085           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1086   1086       add_srs_wkt (p, 3,
  1087         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1087  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1088   1088       add_srs_wkt (p, 4,
  1089         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1089  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1090   1090       add_srs_wkt (p, 5,
  1091         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1091  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1092   1092       add_srs_wkt (p, 6,
  1093         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1093  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1094   1094       add_srs_wkt (p, 7,
  1095         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1095  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1096   1096       add_srs_wkt (p, 8,
  1097   1097           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1098   1098       add_srs_wkt (p, 9,
  1099   1099           "ude_of_origin\",0],PARAMETER[\"central_meridian\",108],P");
  1100   1100       add_srs_wkt (p, 10,
  1101   1101           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1102   1102       add_srs_wkt (p, 11,
................................................................................
  1109   1109           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 37", 0, 1,
  1110   1110           "Krassowsky 1940", "Greenwich",
  1111   1111           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1112   1112           "X", "North", "Y", "East");
  1113   1113       add_proj4text (p, 0,
  1114   1114           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=37500000 +y_0=");
  1115   1115       add_proj4text (p, 1,
  1116         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1116  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1117   1117       add_proj4text (p, 2,
  1118         -        "-0.12 +units=m +no_defs");
         1118  +        ",-0.12 +units=m +no_defs");
  1119   1119       add_srs_wkt (p, 0,
  1120   1120           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 37\",");
  1121   1121       add_srs_wkt (p, 1,
  1122   1122           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1123   1123       add_srs_wkt (p, 2,
  1124   1124           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1125   1125       add_srs_wkt (p, 3,
  1126         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1126  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1127   1127       add_srs_wkt (p, 4,
  1128         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1128  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1129   1129       add_srs_wkt (p, 5,
  1130         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1130  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1131   1131       add_srs_wkt (p, 6,
  1132         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1132  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1133   1133       add_srs_wkt (p, 7,
  1134         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1134  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1135   1135       add_srs_wkt (p, 8,
  1136   1136           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1137   1137       add_srs_wkt (p, 9,
  1138   1138           "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
  1139   1139       add_srs_wkt (p, 10,
  1140   1140           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1141   1141       add_srs_wkt (p, 11,
................................................................................
  1148   1148           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 38", 0, 1,
  1149   1149           "Krassowsky 1940", "Greenwich",
  1150   1150           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1151   1151           "X", "North", "Y", "East");
  1152   1152       add_proj4text (p, 0,
  1153   1153           "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=38500000 +y_0=");
  1154   1154       add_proj4text (p, 1,
  1155         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1155  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1156   1156       add_proj4text (p, 2,
  1157         -        "-0.12 +units=m +no_defs");
         1157  +        ",-0.12 +units=m +no_defs");
  1158   1158       add_srs_wkt (p, 0,
  1159   1159           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 38\",");
  1160   1160       add_srs_wkt (p, 1,
  1161   1161           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1162   1162       add_srs_wkt (p, 2,
  1163   1163           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1164   1164       add_srs_wkt (p, 3,
  1165         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1165  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1166   1166       add_srs_wkt (p, 4,
  1167         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1167  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1168   1168       add_srs_wkt (p, 5,
  1169         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1169  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1170   1170       add_srs_wkt (p, 6,
  1171         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1171  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1172   1172       add_srs_wkt (p, 7,
  1173         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1173  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1174   1174       add_srs_wkt (p, 8,
  1175   1175           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1176   1176       add_srs_wkt (p, 9,
  1177   1177           "ude_of_origin\",0],PARAMETER[\"central_meridian\",114],P");
  1178   1178       add_srs_wkt (p, 10,
  1179   1179           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1180   1180       add_srs_wkt (p, 11,
................................................................................
  1187   1187           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 39", 0, 1,
  1188   1188           "Krassowsky 1940", "Greenwich",
  1189   1189           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1190   1190           "X", "North", "Y", "East");
  1191   1191       add_proj4text (p, 0,
  1192   1192           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=39500000 +y_0=");
  1193   1193       add_proj4text (p, 1,
  1194         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1194  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1195   1195       add_proj4text (p, 2,
  1196         -        "-0.12 +units=m +no_defs");
         1196  +        ",-0.12 +units=m +no_defs");
  1197   1197       add_srs_wkt (p, 0,
  1198   1198           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 39\",");
  1199   1199       add_srs_wkt (p, 1,
  1200   1200           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1201   1201       add_srs_wkt (p, 2,
  1202   1202           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1203   1203       add_srs_wkt (p, 3,
  1204         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1204  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1205   1205       add_srs_wkt (p, 4,
  1206         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1206  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1207   1207       add_srs_wkt (p, 5,
  1208         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1208  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1209   1209       add_srs_wkt (p, 6,
  1210         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1210  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1211   1211       add_srs_wkt (p, 7,
  1212         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1212  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1213   1213       add_srs_wkt (p, 8,
  1214   1214           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1215   1215       add_srs_wkt (p, 9,
  1216   1216           "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
  1217   1217       add_srs_wkt (p, 10,
  1218   1218           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1219   1219       add_srs_wkt (p, 11,
................................................................................
  1226   1226           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 40", 0, 1,
  1227   1227           "Krassowsky 1940", "Greenwich",
  1228   1228           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1229   1229           "X", "North", "Y", "East");
  1230   1230       add_proj4text (p, 0,
  1231   1231           "+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=40500000 +y_0=");
  1232   1232       add_proj4text (p, 1,
  1233         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1233  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1234   1234       add_proj4text (p, 2,
  1235         -        "-0.12 +units=m +no_defs");
         1235  +        ",-0.12 +units=m +no_defs");
  1236   1236       add_srs_wkt (p, 0,
  1237   1237           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 40\",");
  1238   1238       add_srs_wkt (p, 1,
  1239   1239           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1240   1240       add_srs_wkt (p, 2,
  1241   1241           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1242   1242       add_srs_wkt (p, 3,
  1243         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1243  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1244   1244       add_srs_wkt (p, 4,
  1245         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1245  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1246   1246       add_srs_wkt (p, 5,
  1247         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1247  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1248   1248       add_srs_wkt (p, 6,
  1249         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1249  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1250   1250       add_srs_wkt (p, 7,
  1251         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1251  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1252   1252       add_srs_wkt (p, 8,
  1253   1253           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1254   1254       add_srs_wkt (p, 9,
  1255   1255           "ude_of_origin\",0],PARAMETER[\"central_meridian\",120],P");
  1256   1256       add_srs_wkt (p, 10,
  1257   1257           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1258   1258       add_srs_wkt (p, 11,
................................................................................
  1265   1265           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 41", 0, 1,
  1266   1266           "Krassowsky 1940", "Greenwich",
  1267   1267           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1268   1268           "X", "North", "Y", "East");
  1269   1269       add_proj4text (p, 0,
  1270   1270           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=41500000 +y_0=");
  1271   1271       add_proj4text (p, 1,
  1272         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1272  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1273   1273       add_proj4text (p, 2,
  1274         -        "-0.12 +units=m +no_defs");
         1274  +        ",-0.12 +units=m +no_defs");
  1275   1275       add_srs_wkt (p, 0,
  1276   1276           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 41\",");
  1277   1277       add_srs_wkt (p, 1,
  1278   1278           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1279   1279       add_srs_wkt (p, 2,
  1280   1280           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1281   1281       add_srs_wkt (p, 3,
  1282         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1282  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1283   1283       add_srs_wkt (p, 4,
  1284         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1284  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1285   1285       add_srs_wkt (p, 5,
  1286         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1286  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1287   1287       add_srs_wkt (p, 6,
  1288         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1288  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1289   1289       add_srs_wkt (p, 7,
  1290         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1290  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1291   1291       add_srs_wkt (p, 8,
  1292   1292           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1293   1293       add_srs_wkt (p, 9,
  1294   1294           "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
  1295   1295       add_srs_wkt (p, 10,
  1296   1296           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1297   1297       add_srs_wkt (p, 11,
................................................................................
  1304   1304           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 42", 0, 1,
  1305   1305           "Krassowsky 1940", "Greenwich",
  1306   1306           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1307   1307           "X", "North", "Y", "East");
  1308   1308       add_proj4text (p, 0,
  1309   1309           "+proj=tmerc +lat_0=0 +lon_0=126 +k=1 +x_0=42500000 +y_0=");
  1310   1310       add_proj4text (p, 1,
  1311         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1311  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1312   1312       add_proj4text (p, 2,
  1313         -        "-0.12 +units=m +no_defs");
         1313  +        ",-0.12 +units=m +no_defs");
  1314   1314       add_srs_wkt (p, 0,
  1315   1315           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 42\",");
  1316   1316       add_srs_wkt (p, 1,
  1317   1317           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1318   1318       add_srs_wkt (p, 2,
  1319   1319           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1320   1320       add_srs_wkt (p, 3,
  1321         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1321  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1322   1322       add_srs_wkt (p, 4,
  1323         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1323  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1324   1324       add_srs_wkt (p, 5,
  1325         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1325  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1326   1326       add_srs_wkt (p, 6,
  1327         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1327  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1328   1328       add_srs_wkt (p, 7,
  1329         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1329  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1330   1330       add_srs_wkt (p, 8,
  1331   1331           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1332   1332       add_srs_wkt (p, 9,
  1333   1333           "ude_of_origin\",0],PARAMETER[\"central_meridian\",126],P");
  1334   1334       add_srs_wkt (p, 10,
  1335   1335           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1336   1336       add_srs_wkt (p, 11,
................................................................................
  1343   1343           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 43", 0, 1,
  1344   1344           "Krassowsky 1940", "Greenwich",
  1345   1345           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1346   1346           "X", "North", "Y", "East");
  1347   1347       add_proj4text (p, 0,
  1348   1348           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=43500000 +y_0=");
  1349   1349       add_proj4text (p, 1,
  1350         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1350  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1351   1351       add_proj4text (p, 2,
  1352         -        "-0.12 +units=m +no_defs");
         1352  +        ",-0.12 +units=m +no_defs");
  1353   1353       add_srs_wkt (p, 0,
  1354   1354           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 43\",");
  1355   1355       add_srs_wkt (p, 1,
  1356   1356           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1357   1357       add_srs_wkt (p, 2,
  1358   1358           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1359   1359       add_srs_wkt (p, 3,
  1360         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1360  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1361   1361       add_srs_wkt (p, 4,
  1362         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1362  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1363   1363       add_srs_wkt (p, 5,
  1364         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1364  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1365   1365       add_srs_wkt (p, 6,
  1366         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1366  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1367   1367       add_srs_wkt (p, 7,
  1368         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1368  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1369   1369       add_srs_wkt (p, 8,
  1370   1370           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1371   1371       add_srs_wkt (p, 9,
  1372   1372           "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
  1373   1373       add_srs_wkt (p, 10,
  1374   1374           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1375   1375       add_srs_wkt (p, 11,
................................................................................
  1382   1382           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 44", 0, 1,
  1383   1383           "Krassowsky 1940", "Greenwich",
  1384   1384           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1385   1385           "X", "North", "Y", "East");
  1386   1386       add_proj4text (p, 0,
  1387   1387           "+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=44500000 +y_0=");
  1388   1388       add_proj4text (p, 1,
  1389         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1389  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1390   1390       add_proj4text (p, 2,
  1391         -        "-0.12 +units=m +no_defs");
         1391  +        ",-0.12 +units=m +no_defs");
  1392   1392       add_srs_wkt (p, 0,
  1393   1393           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 44\",");
  1394   1394       add_srs_wkt (p, 1,
  1395   1395           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1396   1396       add_srs_wkt (p, 2,
  1397   1397           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1398   1398       add_srs_wkt (p, 3,
  1399         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1399  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1400   1400       add_srs_wkt (p, 4,
  1401         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1401  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1402   1402       add_srs_wkt (p, 5,
  1403         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1403  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1404   1404       add_srs_wkt (p, 6,
  1405         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1405  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1406   1406       add_srs_wkt (p, 7,
  1407         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1407  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1408   1408       add_srs_wkt (p, 8,
  1409   1409           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1410   1410       add_srs_wkt (p, 9,
  1411   1411           "ude_of_origin\",0],PARAMETER[\"central_meridian\",132],P");
  1412   1412       add_srs_wkt (p, 10,
  1413   1413           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1414   1414       add_srs_wkt (p, 11,
................................................................................
  1421   1421           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 45", 0, 1,
  1422   1422           "Krassowsky 1940", "Greenwich",
  1423   1423           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1424   1424           "X", "North", "Y", "East");
  1425   1425       add_proj4text (p, 0,
  1426   1426           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=45500000 +y_0=");
  1427   1427       add_proj4text (p, 1,
  1428         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1428  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1429   1429       add_proj4text (p, 2,
  1430         -        "-0.12 +units=m +no_defs");
         1430  +        ",-0.12 +units=m +no_defs");
  1431   1431       add_srs_wkt (p, 0,
  1432   1432           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 45\",");
  1433   1433       add_srs_wkt (p, 1,
  1434   1434           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1435   1435       add_srs_wkt (p, 2,
  1436   1436           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1437   1437       add_srs_wkt (p, 3,
  1438         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1438  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1439   1439       add_srs_wkt (p, 4,
  1440         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1440  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1441   1441       add_srs_wkt (p, 5,
  1442         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1442  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1443   1443       add_srs_wkt (p, 6,
  1444         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1444  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1445   1445       add_srs_wkt (p, 7,
  1446         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1446  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1447   1447       add_srs_wkt (p, 8,
  1448   1448           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1449   1449       add_srs_wkt (p, 9,
  1450   1450           "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
  1451   1451       add_srs_wkt (p, 10,
  1452   1452           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1453   1453       add_srs_wkt (p, 11,
................................................................................
  1460   1460           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 46", 0, 1,
  1461   1461           "Krassowsky 1940", "Greenwich",
  1462   1462           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1463   1463           "X", "North", "Y", "East");
  1464   1464       add_proj4text (p, 0,
  1465   1465           "+proj=tmerc +lat_0=0 +lon_0=138 +k=1 +x_0=46500000 +y_0=");
  1466   1466       add_proj4text (p, 1,
  1467         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1467  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1468   1468       add_proj4text (p, 2,
  1469         -        "-0.12 +units=m +no_defs");
         1469  +        ",-0.12 +units=m +no_defs");
  1470   1470       add_srs_wkt (p, 0,
  1471   1471           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 46\",");
  1472   1472       add_srs_wkt (p, 1,
  1473   1473           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1474   1474       add_srs_wkt (p, 2,
  1475   1475           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1476   1476       add_srs_wkt (p, 3,
  1477         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1477  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1478   1478       add_srs_wkt (p, 4,
  1479         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1479  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1480   1480       add_srs_wkt (p, 5,
  1481         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1481  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1482   1482       add_srs_wkt (p, 6,
  1483         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1483  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1484   1484       add_srs_wkt (p, 7,
  1485         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1485  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1486   1486       add_srs_wkt (p, 8,
  1487   1487           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1488   1488       add_srs_wkt (p, 9,
  1489   1489           "ude_of_origin\",0],PARAMETER[\"central_meridian\",138],P");
  1490   1490       add_srs_wkt (p, 10,
  1491   1491           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1492   1492       add_srs_wkt (p, 11,
................................................................................
  1499   1499           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 47", 0, 1,
  1500   1500           "Krassowsky 1940", "Greenwich",
  1501   1501           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1502   1502           "X", "North", "Y", "East");
  1503   1503       add_proj4text (p, 0,
  1504   1504           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=47500000 +y_0=");
  1505   1505       add_proj4text (p, 1,
  1506         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1506  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1507   1507       add_proj4text (p, 2,
  1508         -        "-0.12 +units=m +no_defs");
         1508  +        ",-0.12 +units=m +no_defs");
  1509   1509       add_srs_wkt (p, 0,
  1510   1510           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 47\",");
  1511   1511       add_srs_wkt (p, 1,
  1512   1512           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1513   1513       add_srs_wkt (p, 2,
  1514   1514           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1515   1515       add_srs_wkt (p, 3,
  1516         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1516  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1517   1517       add_srs_wkt (p, 4,
  1518         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1518  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1519   1519       add_srs_wkt (p, 5,
  1520         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1520  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1521   1521       add_srs_wkt (p, 6,
  1522         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1522  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1523   1523       add_srs_wkt (p, 7,
  1524         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1524  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1525   1525       add_srs_wkt (p, 8,
  1526   1526           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1527   1527       add_srs_wkt (p, 9,
  1528   1528           "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
  1529   1529       add_srs_wkt (p, 10,
  1530   1530           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1531   1531       add_srs_wkt (p, 11,
................................................................................
  1538   1538           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 48", 0, 1,
  1539   1539           "Krassowsky 1940", "Greenwich",
  1540   1540           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1541   1541           "X", "North", "Y", "East");
  1542   1542       add_proj4text (p, 0,
  1543   1543           "+proj=tmerc +lat_0=0 +lon_0=144 +k=1 +x_0=48500000 +y_0=");
  1544   1544       add_proj4text (p, 1,
  1545         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1545  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1546   1546       add_proj4text (p, 2,
  1547         -        "-0.12 +units=m +no_defs");
         1547  +        ",-0.12 +units=m +no_defs");
  1548   1548       add_srs_wkt (p, 0,
  1549   1549           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 48\",");
  1550   1550       add_srs_wkt (p, 1,
  1551   1551           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1552   1552       add_srs_wkt (p, 2,
  1553   1553           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1554   1554       add_srs_wkt (p, 3,
  1555         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1555  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1556   1556       add_srs_wkt (p, 4,
  1557         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1557  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1558   1558       add_srs_wkt (p, 5,
  1559         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1559  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1560   1560       add_srs_wkt (p, 6,
  1561         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1561  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1562   1562       add_srs_wkt (p, 7,
  1563         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1563  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1564   1564       add_srs_wkt (p, 8,
  1565   1565           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1566   1566       add_srs_wkt (p, 9,
  1567   1567           "ude_of_origin\",0],PARAMETER[\"central_meridian\",144],P");
  1568   1568       add_srs_wkt (p, 10,
  1569   1569           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1570   1570       add_srs_wkt (p, 11,
................................................................................
  1577   1577           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 49", 0, 1,
  1578   1578           "Krassowsky 1940", "Greenwich",
  1579   1579           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1580   1580           "X", "North", "Y", "East");
  1581   1581       add_proj4text (p, 0,
  1582   1582           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=49500000 +y_0=");
  1583   1583       add_proj4text (p, 1,
  1584         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1584  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1585   1585       add_proj4text (p, 2,
  1586         -        "-0.12 +units=m +no_defs");
         1586  +        ",-0.12 +units=m +no_defs");
  1587   1587       add_srs_wkt (p, 0,
  1588   1588           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 49\",");
  1589   1589       add_srs_wkt (p, 1,
  1590   1590           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1591   1591       add_srs_wkt (p, 2,
  1592   1592           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1593   1593       add_srs_wkt (p, 3,
  1594         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1594  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1595   1595       add_srs_wkt (p, 4,
  1596         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1596  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1597   1597       add_srs_wkt (p, 5,
  1598         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1598  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1599   1599       add_srs_wkt (p, 6,
  1600         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1600  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1601   1601       add_srs_wkt (p, 7,
  1602         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1602  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1603   1603       add_srs_wkt (p, 8,
  1604   1604           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1605   1605       add_srs_wkt (p, 9,
  1606   1606           "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
  1607   1607       add_srs_wkt (p, 10,
  1608   1608           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1609   1609       add_srs_wkt (p, 11,
................................................................................
  1616   1616           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 50", 0, 1,
  1617   1617           "Krassowsky 1940", "Greenwich",
  1618   1618           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1619   1619           "X", "North", "Y", "East");
  1620   1620       add_proj4text (p, 0,
  1621   1621           "+proj=tmerc +lat_0=0 +lon_0=150 +k=1 +x_0=50500000 +y_0=");
  1622   1622       add_proj4text (p, 1,
  1623         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1623  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1624   1624       add_proj4text (p, 2,
  1625         -        "-0.12 +units=m +no_defs");
         1625  +        ",-0.12 +units=m +no_defs");
  1626   1626       add_srs_wkt (p, 0,
  1627   1627           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 50\",");
  1628   1628       add_srs_wkt (p, 1,
  1629   1629           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1630   1630       add_srs_wkt (p, 2,
  1631   1631           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1632   1632       add_srs_wkt (p, 3,
  1633         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1633  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1634   1634       add_srs_wkt (p, 4,
  1635         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1635  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1636   1636       add_srs_wkt (p, 5,
  1637         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1637  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1638   1638       add_srs_wkt (p, 6,
  1639         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1639  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1640   1640       add_srs_wkt (p, 7,
  1641         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1641  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1642   1642       add_srs_wkt (p, 8,
  1643   1643           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1644   1644       add_srs_wkt (p, 9,
  1645   1645           "ude_of_origin\",0],PARAMETER[\"central_meridian\",150],P");
  1646   1646       add_srs_wkt (p, 10,
  1647   1647           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1648   1648       add_srs_wkt (p, 11,
................................................................................
  1655   1655           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 51", 0, 1,
  1656   1656           "Krassowsky 1940", "Greenwich",
  1657   1657           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1658   1658           "X", "North", "Y", "East");
  1659   1659       add_proj4text (p, 0,
  1660   1660           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=51500000 +y_0=");
  1661   1661       add_proj4text (p, 1,
  1662         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1662  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1663   1663       add_proj4text (p, 2,
  1664         -        "-0.12 +units=m +no_defs");
         1664  +        ",-0.12 +units=m +no_defs");
  1665   1665       add_srs_wkt (p, 0,
  1666   1666           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 51\",");
  1667   1667       add_srs_wkt (p, 1,
  1668   1668           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1669   1669       add_srs_wkt (p, 2,
  1670   1670           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1671   1671       add_srs_wkt (p, 3,
  1672         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1672  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1673   1673       add_srs_wkt (p, 4,
  1674         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1674  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1675   1675       add_srs_wkt (p, 5,
  1676         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1676  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1677   1677       add_srs_wkt (p, 6,
  1678         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1678  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1679   1679       add_srs_wkt (p, 7,
  1680         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1680  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1681   1681       add_srs_wkt (p, 8,
  1682   1682           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1683   1683       add_srs_wkt (p, 9,
  1684   1684           "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
  1685   1685       add_srs_wkt (p, 10,
  1686   1686           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1687   1687       add_srs_wkt (p, 11,
................................................................................
  1694   1694           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 52", 0, 1,
  1695   1695           "Krassowsky 1940", "Greenwich",
  1696   1696           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1697   1697           "X", "North", "Y", "East");
  1698   1698       add_proj4text (p, 0,
  1699   1699           "+proj=tmerc +lat_0=0 +lon_0=156 +k=1 +x_0=52500000 +y_0=");
  1700   1700       add_proj4text (p, 1,
  1701         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1701  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1702   1702       add_proj4text (p, 2,
  1703         -        "-0.12 +units=m +no_defs");
         1703  +        ",-0.12 +units=m +no_defs");
  1704   1704       add_srs_wkt (p, 0,
  1705   1705           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 52\",");
  1706   1706       add_srs_wkt (p, 1,
  1707   1707           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1708   1708       add_srs_wkt (p, 2,
  1709   1709           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1710   1710       add_srs_wkt (p, 3,
  1711         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1711  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1712   1712       add_srs_wkt (p, 4,
  1713         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1713  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1714   1714       add_srs_wkt (p, 5,
  1715         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1715  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1716   1716       add_srs_wkt (p, 6,
  1717         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1717  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1718   1718       add_srs_wkt (p, 7,
  1719         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1719  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1720   1720       add_srs_wkt (p, 8,
  1721   1721           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1722   1722       add_srs_wkt (p, 9,
  1723   1723           "ude_of_origin\",0],PARAMETER[\"central_meridian\",156],P");
  1724   1724       add_srs_wkt (p, 10,
  1725   1725           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1726   1726       add_srs_wkt (p, 11,
................................................................................
  1733   1733           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 53", 0, 1,
  1734   1734           "Krassowsky 1940", "Greenwich",
  1735   1735           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1736   1736           "X", "North", "Y", "East");
  1737   1737       add_proj4text (p, 0,
  1738   1738           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=53500000 +y_0=");
  1739   1739       add_proj4text (p, 1,
  1740         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1740  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1741   1741       add_proj4text (p, 2,
  1742         -        "-0.12 +units=m +no_defs");
         1742  +        ",-0.12 +units=m +no_defs");
  1743   1743       add_srs_wkt (p, 0,
  1744   1744           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 53\",");
  1745   1745       add_srs_wkt (p, 1,
  1746   1746           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1747   1747       add_srs_wkt (p, 2,
  1748   1748           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1749   1749       add_srs_wkt (p, 3,
  1750         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1750  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1751   1751       add_srs_wkt (p, 4,
  1752         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1752  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1753   1753       add_srs_wkt (p, 5,
  1754         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1754  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1755   1755       add_srs_wkt (p, 6,
  1756         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1756  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1757   1757       add_srs_wkt (p, 7,
  1758         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1758  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1759   1759       add_srs_wkt (p, 8,
  1760   1760           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1761   1761       add_srs_wkt (p, 9,
  1762   1762           "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
  1763   1763       add_srs_wkt (p, 10,
  1764   1764           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1765   1765       add_srs_wkt (p, 11,
................................................................................
  1772   1772           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 54", 0, 1,
  1773   1773           "Krassowsky 1940", "Greenwich",
  1774   1774           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1775   1775           "X", "North", "Y", "East");
  1776   1776       add_proj4text (p, 0,
  1777   1777           "+proj=tmerc +lat_0=0 +lon_0=162 +k=1 +x_0=54500000 +y_0=");
  1778   1778       add_proj4text (p, 1,
  1779         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1779  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1780   1780       add_proj4text (p, 2,
  1781         -        "-0.12 +units=m +no_defs");
         1781  +        ",-0.12 +units=m +no_defs");
  1782   1782       add_srs_wkt (p, 0,
  1783   1783           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 54\",");
  1784   1784       add_srs_wkt (p, 1,
  1785   1785           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1786   1786       add_srs_wkt (p, 2,
  1787   1787           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1788   1788       add_srs_wkt (p, 3,
  1789         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1789  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1790   1790       add_srs_wkt (p, 4,
  1791         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1791  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1792   1792       add_srs_wkt (p, 5,
  1793         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1793  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1794   1794       add_srs_wkt (p, 6,
  1795         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1795  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1796   1796       add_srs_wkt (p, 7,
  1797         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1797  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1798   1798       add_srs_wkt (p, 8,
  1799   1799           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1800   1800       add_srs_wkt (p, 9,
  1801   1801           "ude_of_origin\",0],PARAMETER[\"central_meridian\",162],P");
  1802   1802       add_srs_wkt (p, 10,
  1803   1803           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1804   1804       add_srs_wkt (p, 11,
................................................................................
  1811   1811           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 55", 0, 1,
  1812   1812           "Krassowsky 1940", "Greenwich",
  1813   1813           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1814   1814           "X", "North", "Y", "East");
  1815   1815       add_proj4text (p, 0,
  1816   1816           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=55500000 +y_0=");
  1817   1817       add_proj4text (p, 1,
  1818         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1818  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1819   1819       add_proj4text (p, 2,
  1820         -        "-0.12 +units=m +no_defs");
         1820  +        ",-0.12 +units=m +no_defs");
  1821   1821       add_srs_wkt (p, 0,
  1822   1822           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 55\",");
  1823   1823       add_srs_wkt (p, 1,
  1824   1824           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1825   1825       add_srs_wkt (p, 2,
  1826   1826           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1827   1827       add_srs_wkt (p, 3,
  1828         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1828  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1829   1829       add_srs_wkt (p, 4,
  1830         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1830  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1831   1831       add_srs_wkt (p, 5,
  1832         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1832  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1833   1833       add_srs_wkt (p, 6,
  1834         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1834  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1835   1835       add_srs_wkt (p, 7,
  1836         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1836  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1837   1837       add_srs_wkt (p, 8,
  1838   1838           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1839   1839       add_srs_wkt (p, 9,
  1840   1840           "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
  1841   1841       add_srs_wkt (p, 10,
  1842   1842           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1843   1843       add_srs_wkt (p, 11,
................................................................................
  1850   1850           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 56", 0, 1,
  1851   1851           "Krassowsky 1940", "Greenwich",
  1852   1852           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1853   1853           "X", "North", "Y", "East");
  1854   1854       add_proj4text (p, 0,
  1855   1855           "+proj=tmerc +lat_0=0 +lon_0=168 +k=1 +x_0=56500000 +y_0=");
  1856   1856       add_proj4text (p, 1,
  1857         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1857  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1858   1858       add_proj4text (p, 2,
  1859         -        "-0.12 +units=m +no_defs");
         1859  +        ",-0.12 +units=m +no_defs");
  1860   1860       add_srs_wkt (p, 0,
  1861   1861           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 56\",");
  1862   1862       add_srs_wkt (p, 1,
  1863   1863           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1864   1864       add_srs_wkt (p, 2,
  1865   1865           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1866   1866       add_srs_wkt (p, 3,
  1867         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1867  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1868   1868       add_srs_wkt (p, 4,
  1869         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1869  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1870   1870       add_srs_wkt (p, 5,
  1871         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1871  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1872   1872       add_srs_wkt (p, 6,
  1873         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1873  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1874   1874       add_srs_wkt (p, 7,
  1875         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1875  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1876   1876       add_srs_wkt (p, 8,
  1877   1877           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1878   1878       add_srs_wkt (p, 9,
  1879   1879           "ude_of_origin\",0],PARAMETER[\"central_meridian\",168],P");
  1880   1880       add_srs_wkt (p, 10,
  1881   1881           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1882   1882       add_srs_wkt (p, 11,
................................................................................
  1889   1889           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 57", 0, 1,
  1890   1890           "Krassowsky 1940", "Greenwich",
  1891   1891           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1892   1892           "X", "North", "Y", "East");
  1893   1893       add_proj4text (p, 0,
  1894   1894           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=57500000 +y_0=");
  1895   1895       add_proj4text (p, 1,
  1896         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1896  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1897   1897       add_proj4text (p, 2,
  1898         -        "-0.12 +units=m +no_defs");
         1898  +        ",-0.12 +units=m +no_defs");
  1899   1899       add_srs_wkt (p, 0,
  1900   1900           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 57\",");
  1901   1901       add_srs_wkt (p, 1,
  1902   1902           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1903   1903       add_srs_wkt (p, 2,
  1904   1904           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1905   1905       add_srs_wkt (p, 3,
  1906         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1906  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1907   1907       add_srs_wkt (p, 4,
  1908         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1908  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1909   1909       add_srs_wkt (p, 5,
  1910         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1910  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1911   1911       add_srs_wkt (p, 6,
  1912         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1912  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1913   1913       add_srs_wkt (p, 7,
  1914         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1914  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1915   1915       add_srs_wkt (p, 8,
  1916   1916           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1917   1917       add_srs_wkt (p, 9,
  1918   1918           "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
  1919   1919       add_srs_wkt (p, 10,
  1920   1920           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1921   1921       add_srs_wkt (p, 11,
................................................................................
  1928   1928           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 58", 0, 1,
  1929   1929           "Krassowsky 1940", "Greenwich",
  1930   1930           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1931   1931           "X", "North", "Y", "East");
  1932   1932       add_proj4text (p, 0,
  1933   1933           "+proj=tmerc +lat_0=0 +lon_0=174 +k=1 +x_0=58500000 +y_0=");
  1934   1934       add_proj4text (p, 1,
  1935         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1935  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1936   1936       add_proj4text (p, 2,
  1937         -        "-0.12 +units=m +no_defs");
         1937  +        ",-0.12 +units=m +no_defs");
  1938   1938       add_srs_wkt (p, 0,
  1939   1939           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 58\",");
  1940   1940       add_srs_wkt (p, 1,
  1941   1941           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1942   1942       add_srs_wkt (p, 2,
  1943   1943           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1944   1944       add_srs_wkt (p, 3,
  1945         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1945  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1946   1946       add_srs_wkt (p, 4,
  1947         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1947  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1948   1948       add_srs_wkt (p, 5,
  1949         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1949  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1950   1950       add_srs_wkt (p, 6,
  1951         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1951  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1952   1952       add_srs_wkt (p, 7,
  1953         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1953  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1954   1954       add_srs_wkt (p, 8,
  1955   1955           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1956   1956       add_srs_wkt (p, 9,
  1957   1957           "ude_of_origin\",0],PARAMETER[\"central_meridian\",174],P");
  1958   1958       add_srs_wkt (p, 10,
  1959   1959           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1960   1960       add_srs_wkt (p, 11,
................................................................................
  1967   1967           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 59", 0, 1,
  1968   1968           "Krassowsky 1940", "Greenwich",
  1969   1969           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1970   1970           "X", "North", "Y", "East");
  1971   1971       add_proj4text (p, 0,
  1972   1972           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=59500000 +y_0=");
  1973   1973       add_proj4text (p, 1,
  1974         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1974  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1975   1975       add_proj4text (p, 2,
  1976         -        "-0.12 +units=m +no_defs");
         1976  +        ",-0.12 +units=m +no_defs");
  1977   1977       add_srs_wkt (p, 0,
  1978   1978           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 59\",");
  1979   1979       add_srs_wkt (p, 1,
  1980   1980           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1981   1981       add_srs_wkt (p, 2,
  1982   1982           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1983   1983       add_srs_wkt (p, 3,
  1984         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1984  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1985   1985       add_srs_wkt (p, 4,
  1986         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1986  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1987   1987       add_srs_wkt (p, 5,
  1988         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1988  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1989   1989       add_srs_wkt (p, 6,
  1990         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1990  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1991   1991       add_srs_wkt (p, 7,
  1992         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1992  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1993   1993       add_srs_wkt (p, 8,
  1994   1994           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1995   1995       add_srs_wkt (p, 9,
  1996   1996           "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
  1997   1997       add_srs_wkt (p, 10,
  1998   1998           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1999   1999       add_srs_wkt (p, 11,
................................................................................
  2006   2006           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 60 (deprecated)", 0, 1,
  2007   2007           "Krassowsky 1940", "Greenwich",
  2008   2008           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2009   2009           "X", "North", "Y", "East");
  2010   2010       add_proj4text (p, 0,
  2011   2011           "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=60000000 +y_0=");
  2012   2012       add_proj4text (p, 1,
  2013         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         2013  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  2014   2014       add_proj4text (p, 2,
  2015         -        "-0.12 +units=m +no_defs");
         2015  +        ",-0.12 +units=m +no_defs");
  2016   2016       add_srs_wkt (p, 0,
  2017   2017           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 60 (d");
  2018   2018       add_srs_wkt (p, 1,
  2019   2019           "eprecated)\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_194");
  2020   2020       add_srs_wkt (p, 2,
  2021   2021           "2\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY");
  2022   2022       add_srs_wkt (p, 3,
  2023         -        "[\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,");
  2024         -    add_srs_wkt (p, 4,
  2025         -        "0.82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Green");
  2026         -    add_srs_wkt (p, 5,
  2027         -        "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  2028         -    add_srs_wkt (p, 6,
  2029         -        ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
  2030         -    add_srs_wkt (p, 7,
  2031         -        "atitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EP");
  2032         -    add_srs_wkt (p, 8,
  2033         -        "SG\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PARA");
  2034         -    add_srs_wkt (p, 9,
  2035         -        "METER[\"latitude_of_origin\",0],PARAMETER[\"central_meri");
  2036         -    add_srs_wkt (p, 10,
  2037         -        "dian\",180],PARAMETER[\"scale_factor\",1],PARAMETER[\"fa");
  2038         -    add_srs_wkt (p, 11,
  2039         -        "lse_easting\",60000000],PARAMETER[\"false_northing\",0],");
  2040         -    add_srs_wkt (p, 12,
  2041         -        "UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\"");
  2042         -    add_srs_wkt (p, 13,
  2043         -        ",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"2577\"]]");
         2023  +        "[\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35");
         2024  +    add_srs_wkt (p, 4,
         2025  +        ",0.82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Gree");
         2026  +    add_srs_wkt (p, 5,
         2027  +        "nwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",");
         2028  +    add_srs_wkt (p, 6,
         2029  +        "0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
         2030  +    add_srs_wkt (p, 7,
         2031  +        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
         2032  +    add_srs_wkt (p, 8,
         2033  +        "PSG\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PAR");
         2034  +    add_srs_wkt (p, 9,
         2035  +        "AMETER[\"latitude_of_origin\",0],PARAMETER[\"central_mer");
         2036  +    add_srs_wkt (p, 10,
         2037  +        "idian\",180],PARAMETER[\"scale_factor\",1],PARAMETER[\"f");
         2038  +    add_srs_wkt (p, 11,
         2039  +        "alse_easting\",60000000],PARAMETER[\"false_northing\",0]");
         2040  +    add_srs_wkt (p, 12,
         2041  +        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X");
         2042  +    add_srs_wkt (p, 13,
         2043  +        "\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"2577\"]]");
  2044   2044       p = add_epsg_def_ex (filter, first, last, 2578, "epsg", 2578,
  2045   2045           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 61", 0, 1,
  2046   2046           "Krassowsky 1940", "Greenwich",
  2047   2047           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2048   2048           "X", "North", "Y", "East");
  2049   2049       add_proj4text (p, 0,
  2050   2050           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=61500000 +y_0");
  2051   2051       add_proj4text (p, 1,
  2052         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         2052  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  2053   2053       add_proj4text (p, 2,
  2054         -        ",-0.12 +units=m +no_defs");
         2054  +        "2,-0.12 +units=m +no_defs");
  2055   2055       add_srs_wkt (p, 0,
  2056   2056           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 61\",");
  2057   2057       add_srs_wkt (p, 1,
  2058   2058           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  2059   2059       add_srs_wkt (p, 2,
  2060   2060           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2061   2061       add_srs_wkt (p, 3,
  2062         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         2062  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  2063   2063       add_srs_wkt (p, 4,
  2064         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2064  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  2065   2065       add_srs_wkt (p, 5,
  2066         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2066  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  2067   2067       add_srs_wkt (p, 6,
  2068         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2068  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  2069   2069       add_srs_wkt (p, 7,
  2070         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         2070  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  2071   2071       add_srs_wkt (p, 8,
  2072   2072           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2073   2073       add_srs_wkt (p, 9,
  2074   2074           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
  2075   2075       add_srs_wkt (p, 10,
  2076   2076           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  2077   2077       add_srs_wkt (p, 11,
................................................................................
  2084   2084           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 62", 0, 1,
  2085   2085           "Krassowsky 1940", "Greenwich",
  2086   2086           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2087   2087           "X", "North", "Y", "East");
  2088   2088       add_proj4text (p, 0,
  2089   2089           "+proj=tmerc +lat_0=0 +lon_0=-174 +k=1 +x_0=62500000 +y_0");
  2090   2090       add_proj4text (p, 1,
  2091         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         2091  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  2092   2092       add_proj4text (p, 2,
  2093         -        ",-0.12 +units=m +no_defs");
         2093  +        "2,-0.12 +units=m +no_defs");
  2094   2094       add_srs_wkt (p, 0,
  2095   2095           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 62\",");
  2096   2096       add_srs_wkt (p, 1,
  2097   2097           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  2098   2098       add_srs_wkt (p, 2,
  2099   2099           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2100   2100       add_srs_wkt (p, 3,
  2101         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         2101  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  2102   2102       add_srs_wkt (p, 4,
  2103         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2103  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  2104   2104       add_srs_wkt (p, 5,
  2105         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2105  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  2106   2106       add_srs_wkt (p, 6,
  2107         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2107  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  2108   2108       add_srs_wkt (p, 7,
  2109         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         2109  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  2110   2110       add_srs_wkt (p, 8,
  2111   2111           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2112   2112       add_srs_wkt (p, 9,
  2113   2113           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-174],");
  2114   2114       add_srs_wkt (p, 10,
  2115   2115           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  2116   2116       add_srs_wkt (p, 11,
................................................................................
  2123   2123           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 63", 0, 1,
  2124   2124           "Krassowsky 1940", "Greenwich",
  2125   2125           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2126   2126           "X", "North", "Y", "East");
  2127   2127       add_proj4text (p, 0,
  2128   2128           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=63500000 +y_0");
  2129   2129       add_proj4text (p, 1,
  2130         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         2130  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  2131   2131       add_proj4text (p, 2,
  2132         -        ",-0.12 +units=m +no_defs");
         2132  +        "2,-0.12 +units=m +no_defs");
  2133   2133       add_srs_wkt (p, 0,
  2134   2134           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 63\",");
  2135   2135       add_srs_wkt (p, 1,
  2136   2136           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  2137   2137       add_srs_wkt (p, 2,
  2138   2138           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2139   2139       add_srs_wkt (p, 3,
  2140         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         2140  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  2141   2141       add_srs_wkt (p, 4,
  2142         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2142  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  2143   2143       add_srs_wkt (p, 5,
  2144         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2144  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  2145   2145       add_srs_wkt (p, 6,
  2146         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2146  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  2147   2147       add_srs_wkt (p, 7,
  2148         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         2148  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  2149   2149       add_srs_wkt (p, 8,
  2150   2150           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2151   2151       add_srs_wkt (p, 9,
  2152   2152           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
  2153   2153       add_srs_wkt (p, 10,
  2154   2154           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  2155   2155       add_srs_wkt (p, 11,
................................................................................
  2162   2162           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 64", 0, 1,
  2163   2163           "Krassowsky 1940", "Greenwich",
  2164   2164           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2165   2165           "X", "North", "Y", "East");
  2166   2166       add_proj4text (p, 0,
  2167   2167           "+proj=tmerc +lat_0=0 +lon_0=-168 +k=1 +x_0=64500000 +y_0");
  2168   2168       add_proj4text (p, 1,
  2169         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         2169  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  2170   2170       add_proj4text (p, 2,
  2171         -        ",-0.12 +units=m +no_defs");
         2171  +        "2,-0.12 +units=m +no_defs");
  2172   2172       add_srs_wkt (p, 0,
  2173   2173           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 64\",");
  2174   2174       add_srs_wkt (p, 1,
  2175   2175           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  2176   2176       add_srs_wkt (p, 2,
  2177   2177           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2178   2178       add_srs_wkt (p, 3,
  2179         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         2179  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  2180   2180       add_srs_wkt (p, 4,
  2181         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2181  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  2182   2182       add_srs_wkt (p, 5,
  2183         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2183  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  2184   2184       add_srs_wkt (p, 6,
  2185         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2185  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  2186   2186       add_srs_wkt (p, 7,
  2187         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         2187  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  2188   2188       add_srs_wkt (p, 8,
  2189   2189           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2190   2190       add_srs_wkt (p, 9,
  2191   2191           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-168],");
  2192   2192       add_srs_wkt (p, 10,
  2193   2193           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  2194   2194       add_srs_wkt (p, 11,
................................................................................
  2201   2201           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 21E", 0, 1,
  2202   2202           "Krassowsky 1940", "Greenwich",
  2203   2203           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2204   2204           "X", "North", "Y", "East");
  2205   2205       add_proj4text (p, 0,
  2206   2206           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
  2207   2207       add_proj4text (p, 1,
  2208         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2208  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2209   2209       add_proj4text (p, 2,
  2210         -        "12 +units=m +no_defs");
         2210  +        ".12 +units=m +no_defs");
  2211   2211       add_srs_wkt (p, 0,
  2212   2212           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 21E\",G");
  2213   2213       add_srs_wkt (p, 1,
  2214   2214           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2215   2215       add_srs_wkt (p, 2,
  2216   2216           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2217   2217       add_srs_wkt (p, 3,
  2218         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2219         -    add_srs_wkt (p, 4,
  2220         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2221         -    add_srs_wkt (p, 5,
  2222         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2223         -    add_srs_wkt (p, 6,
  2224         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2225         -    add_srs_wkt (p, 7,
  2226         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2227         -    add_srs_wkt (p, 8,
  2228         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2229         -    add_srs_wkt (p, 9,
  2230         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
  2231         -    add_srs_wkt (p, 10,
  2232         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2233         -    add_srs_wkt (p, 11,
  2234         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2235         -    add_srs_wkt (p, 12,
  2236         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2237         -    add_srs_wkt (p, 13,
  2238         -        ",EAST],AUTHORITY[\"EPSG\",\"2582\"]]");
         2218  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2219  +    add_srs_wkt (p, 4,
         2220  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2221  +    add_srs_wkt (p, 5,
         2222  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2223  +    add_srs_wkt (p, 6,
         2224  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2225  +    add_srs_wkt (p, 7,
         2226  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2227  +    add_srs_wkt (p, 8,
         2228  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2229  +    add_srs_wkt (p, 9,
         2230  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",21],PAR");
         2231  +    add_srs_wkt (p, 10,
         2232  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2233  +    add_srs_wkt (p, 11,
         2234  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2235  +    add_srs_wkt (p, 12,
         2236  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2237  +    add_srs_wkt (p, 13,
         2238  +        "\",EAST],AUTHORITY[\"EPSG\",\"2582\"]]");
  2239   2239       p = add_epsg_def_ex (filter, first, last, 2583, "epsg", 2583,
  2240   2240           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 24E", 0, 1,
  2241   2241           "Krassowsky 1940", "Greenwich",
  2242   2242           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2243   2243           "X", "North", "Y", "East");
  2244   2244       add_proj4text (p, 0,
  2245   2245           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=500000 +y_0=0 +");
  2246   2246       add_proj4text (p, 1,
  2247         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2247  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2248   2248       add_proj4text (p, 2,
  2249         -        "12 +units=m +no_defs");
         2249  +        ".12 +units=m +no_defs");
  2250   2250       add_srs_wkt (p, 0,
  2251   2251           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 24E\",G");
  2252   2252       add_srs_wkt (p, 1,
  2253   2253           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2254   2254       add_srs_wkt (p, 2,
  2255   2255           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2256   2256       add_srs_wkt (p, 3,
  2257         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2258         -    add_srs_wkt (p, 4,
  2259         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2260         -    add_srs_wkt (p, 5,
  2261         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2262         -    add_srs_wkt (p, 6,
  2263         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2264         -    add_srs_wkt (p, 7,
  2265         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2266         -    add_srs_wkt (p, 8,
  2267         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2268         -    add_srs_wkt (p, 9,
  2269         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",24],PARA");
  2270         -    add_srs_wkt (p, 10,
  2271         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2272         -    add_srs_wkt (p, 11,
  2273         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2274         -    add_srs_wkt (p, 12,
  2275         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2276         -    add_srs_wkt (p, 13,
  2277         -        ",EAST],AUTHORITY[\"EPSG\",\"2583\"]]");
         2257  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2258  +    add_srs_wkt (p, 4,
         2259  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2260  +    add_srs_wkt (p, 5,
         2261  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2262  +    add_srs_wkt (p, 6,
         2263  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2264  +    add_srs_wkt (p, 7,
         2265  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2266  +    add_srs_wkt (p, 8,
         2267  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2268  +    add_srs_wkt (p, 9,
         2269  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",24],PAR");
         2270  +    add_srs_wkt (p, 10,
         2271  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2272  +    add_srs_wkt (p, 11,
         2273  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2274  +    add_srs_wkt (p, 12,
         2275  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2276  +    add_srs_wkt (p, 13,
         2277  +        "\",EAST],AUTHORITY[\"EPSG\",\"2583\"]]");
  2278   2278       p = add_epsg_def_ex (filter, first, last, 2584, "epsg", 2584,
  2279   2279           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 27E", 0, 1,
  2280   2280           "Krassowsky 1940", "Greenwich",
  2281   2281           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2282   2282           "X", "North", "Y", "East");
  2283   2283       add_proj4text (p, 0,
  2284   2284           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
  2285   2285       add_proj4text (p, 1,
  2286         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2286  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2287   2287       add_proj4text (p, 2,
  2288         -        "12 +units=m +no_defs");
         2288  +        ".12 +units=m +no_defs");
  2289   2289       add_srs_wkt (p, 0,
  2290   2290           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 27E\",G");
  2291   2291       add_srs_wkt (p, 1,
  2292   2292           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2293   2293       add_srs_wkt (p, 2,
  2294   2294           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2295   2295       add_srs_wkt (p, 3,
  2296         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2297         -    add_srs_wkt (p, 4,
  2298         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2299         -    add_srs_wkt (p, 5,
  2300         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2301         -    add_srs_wkt (p, 6,
  2302         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2303         -    add_srs_wkt (p, 7,
  2304         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2305         -    add_srs_wkt (p, 8,
  2306         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2307         -    add_srs_wkt (p, 9,
  2308         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
  2309         -    add_srs_wkt (p, 10,
  2310         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2311         -    add_srs_wkt (p, 11,
  2312         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2313         -    add_srs_wkt (p, 12,
  2314         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2315         -    add_srs_wkt (p, 13,
  2316         -        ",EAST],AUTHORITY[\"EPSG\",\"2584\"]]");
         2296  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2297  +    add_srs_wkt (p, 4,
         2298  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2299  +    add_srs_wkt (p, 5,
         2300  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2301  +    add_srs_wkt (p, 6,
         2302  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2303  +    add_srs_wkt (p, 7,
         2304  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2305  +    add_srs_wkt (p, 8,
         2306  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2307  +    add_srs_wkt (p, 9,
         2308  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",27],PAR");
         2309  +    add_srs_wkt (p, 10,
         2310  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2311  +    add_srs_wkt (p, 11,
         2312  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2313  +    add_srs_wkt (p, 12,
         2314  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2315  +    add_srs_wkt (p, 13,
         2316  +        "\",EAST],AUTHORITY[\"EPSG\",\"2584\"]]");
  2317   2317       p = add_epsg_def_ex (filter, first, last, 2585, "epsg", 2585,
  2318   2318           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 30E", 0, 1,
  2319   2319           "Krassowsky 1940", "Greenwich",
  2320   2320           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2321   2321           "X", "North", "Y", "East");
  2322   2322       add_proj4text (p, 0,
  2323   2323           "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=500000 +y_0=0 +");
  2324   2324       add_proj4text (p, 1,
  2325         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2325  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2326   2326       add_proj4text (p, 2,
  2327         -        "12 +units=m +no_defs");
         2327  +        ".12 +units=m +no_defs");
  2328   2328       add_srs_wkt (p, 0,
  2329   2329           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 30E\",G");
  2330   2330       add_srs_wkt (p, 1,
  2331   2331           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2332   2332       add_srs_wkt (p, 2,
  2333   2333           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2334   2334       add_srs_wkt (p, 3,
  2335         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2336         -    add_srs_wkt (p, 4,
  2337         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2338         -    add_srs_wkt (p, 5,
  2339         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2340         -    add_srs_wkt (p, 6,
  2341         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2342         -    add_srs_wkt (p, 7,
  2343         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2344         -    add_srs_wkt (p, 8,
  2345         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2346         -    add_srs_wkt (p, 9,
  2347         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",30],PARA");
  2348         -    add_srs_wkt (p, 10,
  2349         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2350         -    add_srs_wkt (p, 11,
  2351         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2352         -    add_srs_wkt (p, 12,
  2353         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2354         -    add_srs_wkt (p, 13,
  2355         -        ",EAST],AUTHORITY[\"EPSG\",\"2585\"]]");
         2335  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2336  +    add_srs_wkt (p, 4,
         2337  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2338  +    add_srs_wkt (p, 5,
         2339  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2340  +    add_srs_wkt (p, 6,
         2341  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2342  +    add_srs_wkt (p, 7,
         2343  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2344  +    add_srs_wkt (p, 8,
         2345  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2346  +    add_srs_wkt (p, 9,
         2347  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",30],PAR");
         2348  +    add_srs_wkt (p, 10,
         2349  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2350  +    add_srs_wkt (p, 11,
         2351  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2352  +    add_srs_wkt (p, 12,
         2353  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2354  +    add_srs_wkt (p, 13,
         2355  +        "\",EAST],AUTHORITY[\"EPSG\",\"2585\"]]");
  2356   2356       p = add_epsg_def_ex (filter, first, last, 2586, "epsg", 2586,
  2357   2357           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 33E", 0, 1,
  2358   2358           "Krassowsky 1940", "Greenwich",
  2359   2359           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2360   2360           "X", "North", "Y", "East");
  2361   2361       add_proj4text (p, 0,
  2362   2362           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
  2363   2363       add_proj4text (p, 1,
  2364         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2364  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2365   2365       add_proj4text (p, 2,
  2366         -        "12 +units=m +no_defs");
         2366  +        ".12 +units=m +no_defs");
  2367   2367       add_srs_wkt (p, 0,
  2368   2368           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 33E\",G");
  2369   2369       add_srs_wkt (p, 1,
  2370   2370           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2371   2371       add_srs_wkt (p, 2,
  2372   2372           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2373   2373       add_srs_wkt (p, 3,
  2374         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2375         -    add_srs_wkt (p, 4,
  2376         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2377         -    add_srs_wkt (p, 5,
  2378         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2379         -    add_srs_wkt (p, 6,
  2380         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2381         -    add_srs_wkt (p, 7,
  2382         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2383         -    add_srs_wkt (p, 8,
  2384         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2385         -    add_srs_wkt (p, 9,
  2386         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",33],PARA");
  2387         -    add_srs_wkt (p, 10,
  2388         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2389         -    add_srs_wkt (p, 11,
  2390         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2391         -    add_srs_wkt (p, 12,
  2392         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2393         -    add_srs_wkt (p, 13,
  2394         -        ",EAST],AUTHORITY[\"EPSG\",\"2586\"]]");
         2374  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2375  +    add_srs_wkt (p, 4,
         2376  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2377  +    add_srs_wkt (p, 5,
         2378  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2379  +    add_srs_wkt (p, 6,
         2380  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2381  +    add_srs_wkt (p, 7,
         2382  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2383  +    add_srs_wkt (p, 8,
         2384  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2385  +    add_srs_wkt (p, 9,
         2386  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",33],PAR");
         2387  +    add_srs_wkt (p, 10,
         2388  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2389  +    add_srs_wkt (p, 11,
         2390  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2391  +    add_srs_wkt (p, 12,
         2392  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2393  +    add_srs_wkt (p, 13,
         2394  +        "\",EAST],AUTHORITY[\"EPSG\",\"2586\"]]");
  2395   2395       p = add_epsg_def_ex (filter, first, last, 2587, "epsg", 2587,
  2396   2396           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 36E", 0, 1,
  2397   2397           "Krassowsky 1940", "Greenwich",
  2398   2398           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2399   2399           "X", "North", "Y", "East");
  2400   2400       add_proj4text (p, 0,
  2401   2401           "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=500000 +y_0=0 +");
  2402   2402       add_proj4text (p, 1,
  2403         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2403  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2404   2404       add_proj4text (p, 2,
  2405         -        "12 +units=m +no_defs");
         2405  +        ".12 +units=m +no_defs");
  2406   2406       add_srs_wkt (p, 0,
  2407   2407           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 36E\",G");
  2408   2408       add_srs_wkt (p, 1,
  2409   2409           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2410   2410       add_srs_wkt (p, 2,
  2411   2411           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2412   2412       add_srs_wkt (p, 3,
  2413         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2414         -    add_srs_wkt (p, 4,
  2415         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2416         -    add_srs_wkt (p, 5,
  2417         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2418         -    add_srs_wkt (p, 6,
  2419         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2420         -    add_srs_wkt (p, 7,
  2421         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2422         -    add_srs_wkt (p, 8,
  2423         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2424         -    add_srs_wkt (p, 9,
  2425         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",36],PARA");
  2426         -    add_srs_wkt (p, 10,
  2427         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2428         -    add_srs_wkt (p, 11,
  2429         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2430         -    add_srs_wkt (p, 12,
  2431         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2432         -    add_srs_wkt (p, 13,
  2433         -        ",EAST],AUTHORITY[\"EPSG\",\"2587\"]]");
         2413  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2414  +    add_srs_wkt (p, 4,
         2415  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2416  +    add_srs_wkt (p, 5,
         2417  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2418  +    add_srs_wkt (p, 6,
         2419  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2420  +    add_srs_wkt (p, 7,
         2421  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2422  +    add_srs_wkt (p, 8,
         2423  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2424  +    add_srs_wkt (p, 9,
         2425  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",36],PAR");
         2426  +    add_srs_wkt (p, 10,
         2427  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2428  +    add_srs_wkt (p, 11,
         2429  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2430  +    add_srs_wkt (p, 12,
         2431  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2432  +    add_srs_wkt (p, 13,
         2433  +        "\",EAST],AUTHORITY[\"EPSG\",\"2587\"]]");
  2434   2434       p = add_epsg_def_ex (filter, first, last, 2588, "epsg", 2588,
  2435   2435           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 39E", 0, 1,
  2436   2436           "Krassowsky 1940", "Greenwich",
  2437   2437           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2438   2438           "X", "North", "Y", "East");
  2439   2439       add_proj4text (p, 0,
  2440   2440           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
  2441   2441       add_proj4text (p, 1,
  2442         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2442  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2443   2443       add_proj4text (p, 2,
  2444         -        "12 +units=m +no_defs");
         2444  +        ".12 +units=m +no_defs");
  2445   2445       add_srs_wkt (p, 0,
  2446   2446           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 39E\",G");
  2447   2447       add_srs_wkt (p, 1,
  2448   2448           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2449   2449       add_srs_wkt (p, 2,
  2450   2450           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2451   2451       add_srs_wkt (p, 3,
  2452         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2453         -    add_srs_wkt (p, 4,
  2454         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2455         -    add_srs_wkt (p, 5,
  2456         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2457         -    add_srs_wkt (p, 6,
  2458         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2459         -    add_srs_wkt (p, 7,
  2460         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2461         -    add_srs_wkt (p, 8,
  2462         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2463         -    add_srs_wkt (p, 9,
  2464         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",39],PARA");
  2465         -    add_srs_wkt (p, 10,
  2466         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2467         -    add_srs_wkt (p, 11,
  2468         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2469         -    add_srs_wkt (p, 12,
  2470         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2471         -    add_srs_wkt (p, 13,
  2472         -        ",EAST],AUTHORITY[\"EPSG\",\"2588\"]]");
         2452  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2453  +    add_srs_wkt (p, 4,
         2454  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2455  +    add_srs_wkt (p, 5,
         2456  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2457  +    add_srs_wkt (p, 6,
         2458  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2459  +    add_srs_wkt (p, 7,
         2460  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2461  +    add_srs_wkt (p, 8,
         2462  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2463  +    add_srs_wkt (p, 9,
         2464  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",39],PAR");
         2465  +    add_srs_wkt (p, 10,
         2466  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2467  +    add_srs_wkt (p, 11,
         2468  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2469  +    add_srs_wkt (p, 12,
         2470  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2471  +    add_srs_wkt (p, 13,
         2472  +        "\",EAST],AUTHORITY[\"EPSG\",\"2588\"]]");
  2473   2473       p = add_epsg_def_ex (filter, first, last, 2589, "epsg", 2589,
  2474   2474           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 42E", 0, 1,
  2475   2475           "Krassowsky 1940", "Greenwich",
  2476   2476           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2477   2477           "X", "North", "Y", "East");
  2478   2478       add_proj4text (p, 0,
  2479   2479           "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=500000 +y_0=0 +");
  2480   2480       add_proj4text (p, 1,
  2481         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2481  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2482   2482       add_proj4text (p, 2,
  2483         -        "12 +units=m +no_defs");
         2483  +        ".12 +units=m +no_defs");
  2484   2484       add_srs_wkt (p, 0,
  2485   2485           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 42E\",G");
  2486   2486       add_srs_wkt (p, 1,
  2487   2487           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2488   2488       add_srs_wkt (p, 2,
  2489   2489           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2490   2490       add_srs_wkt (p, 3,
  2491         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2492         -    add_srs_wkt (p, 4,
  2493         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2494         -    add_srs_wkt (p, 5,
  2495         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2496         -    add_srs_wkt (p, 6,
  2497         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2498         -    add_srs_wkt (p, 7,
  2499         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2500         -    add_srs_wkt (p, 8,
  2501         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2502         -    add_srs_wkt (p, 9,
  2503         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",42],PARA");
  2504         -    add_srs_wkt (p, 10,
  2505         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2506         -    add_srs_wkt (p, 11,
  2507         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2508         -    add_srs_wkt (p, 12,
  2509         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2510         -    add_srs_wkt (p, 13,
  2511         -        ",EAST],AUTHORITY[\"EPSG\",\"2589\"]]");
         2491  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2492  +    add_srs_wkt (p, 4,
         2493  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2494  +    add_srs_wkt (p, 5,
         2495  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2496  +    add_srs_wkt (p, 6,
         2497  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2498  +    add_srs_wkt (p, 7,
         2499  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2500  +    add_srs_wkt (p, 8,
         2501  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2502  +    add_srs_wkt (p, 9,
         2503  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",42],PAR");
         2504  +    add_srs_wkt (p, 10,
         2505  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2506  +    add_srs_wkt (p, 11,
         2507  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2508  +    add_srs_wkt (p, 12,
         2509  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2510  +    add_srs_wkt (p, 13,
         2511  +        "\",EAST],AUTHORITY[\"EPSG\",\"2589\"]]");
  2512   2512       p = add_epsg_def_ex (filter, first, last, 2590, "epsg", 2590,
  2513   2513           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 45E", 0, 1,
  2514   2514           "Krassowsky 1940", "Greenwich",
  2515   2515           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2516   2516           "X", "North", "Y", "East");
  2517   2517       add_proj4text (p, 0,
  2518   2518           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
  2519   2519       add_proj4text (p, 1,
  2520         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2520  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2521   2521       add_proj4text (p, 2,
  2522         -        "12 +units=m +no_defs");
         2522  +        ".12 +units=m +no_defs");
  2523   2523       add_srs_wkt (p, 0,
  2524   2524           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 45E\",G");
  2525   2525       add_srs_wkt (p, 1,
  2526   2526           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2527   2527       add_srs_wkt (p, 2,
  2528   2528           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2529   2529       add_srs_wkt (p, 3,
  2530         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2531         -    add_srs_wkt (p, 4,
  2532         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2533         -    add_srs_wkt (p, 5,
  2534         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2535         -    add_srs_wkt (p, 6,
  2536         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2537         -    add_srs_wkt (p, 7,
  2538         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2539         -    add_srs_wkt (p, 8,
  2540         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2541         -    add_srs_wkt (p, 9,
  2542         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",45],PARA");
  2543         -    add_srs_wkt (p, 10,
  2544         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2545         -    add_srs_wkt (p, 11,
  2546         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2547         -    add_srs_wkt (p, 12,
  2548         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2549         -    add_srs_wkt (p, 13,
  2550         -        ",EAST],AUTHORITY[\"EPSG\",\"2590\"]]");
         2530  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2531  +    add_srs_wkt (p, 4,
         2532  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2533  +    add_srs_wkt (p, 5,
         2534  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2535  +    add_srs_wkt (p, 6,
         2536  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2537  +    add_srs_wkt (p, 7,
         2538  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2539  +    add_srs_wkt (p, 8,
         2540  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2541  +    add_srs_wkt (p, 9,
         2542  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",45],PAR");
         2543  +    add_srs_wkt (p, 10,
         2544  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2545  +    add_srs_wkt (p, 11,
         2546  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2547  +    add_srs_wkt (p, 12,
         2548  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2549  +    add_srs_wkt (p, 13,
         2550  +        "\",EAST],AUTHORITY[\"EPSG\",\"2590\"]]");
  2551   2551       p = add_epsg_def_ex (filter, first, last, 2591, "epsg", 2591,
  2552   2552           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 48E", 0, 1,
  2553   2553           "Krassowsky 1940", "Greenwich",
  2554   2554           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2555   2555           "X", "North", "Y", "East");
  2556   2556       add_proj4text (p, 0,
  2557   2557           "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=500000 +y_0=0 +");
  2558   2558       add_proj4text (p, 1,
  2559         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2559  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2560   2560       add_proj4text (p, 2,
  2561         -        "12 +units=m +no_defs");
         2561  +        ".12 +units=m +no_defs");
  2562   2562       add_srs_wkt (p, 0,
  2563   2563           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 48E\",G");
  2564   2564       add_srs_wkt (p, 1,
  2565   2565           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2566   2566       add_srs_wkt (p, 2,
  2567   2567           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2568   2568       add_srs_wkt (p, 3,
  2569         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2570         -    add_srs_wkt (p, 4,
  2571         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2572         -    add_srs_wkt (p, 5,
  2573         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2574         -    add_srs_wkt (p, 6,
  2575         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2576         -    add_srs_wkt (p, 7,
  2577         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2578         -    add_srs_wkt (p, 8,
  2579         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2580         -    add_srs_wkt (p, 9,
  2581         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",48],PARA");
  2582         -    add_srs_wkt (p, 10,
  2583         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2584         -    add_srs_wkt (p, 11,
  2585         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2586         -    add_srs_wkt (p, 12,
  2587         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2588         -    add_srs_wkt (p, 13,
  2589         -        ",EAST],AUTHORITY[\"EPSG\",\"2591\"]]");
         2569  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2570  +    add_srs_wkt (p, 4,
         2571  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2572  +    add_srs_wkt (p, 5,
         2573  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2574  +    add_srs_wkt (p, 6,
         2575  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2576  +    add_srs_wkt (p, 7,
         2577  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2578  +    add_srs_wkt (p, 8,
         2579  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2580  +    add_srs_wkt (p, 9,
         2581  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",48],PAR");
         2582  +    add_srs_wkt (p, 10,
         2583  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2584  +    add_srs_wkt (p, 11,
         2585  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2586  +    add_srs_wkt (p, 12,
         2587  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2588  +    add_srs_wkt (p, 13,
         2589  +        "\",EAST],AUTHORITY[\"EPSG\",\"2591\"]]");
  2590   2590       p = add_epsg_def_ex (filter, first, last, 2592, "epsg", 2592,
  2591   2591           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 51E", 0, 1,
  2592   2592           "Krassowsky 1940", "Greenwich",
  2593   2593           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2594   2594           "X", "North", "Y", "East");
  2595   2595       add_proj4text (p, 0,
  2596   2596           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
  2597   2597       add_proj4text (p, 1,
  2598         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2598  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2599   2599       add_proj4text (p, 2,
  2600         -        "12 +units=m +no_defs");
         2600  +        ".12 +units=m +no_defs");
  2601   2601       add_srs_wkt (p, 0,
  2602   2602           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 51E\",G");
  2603   2603       add_srs_wkt (p, 1,
  2604   2604           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2605   2605       add_srs_wkt (p, 2,
  2606   2606           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2607   2607       add_srs_wkt (p, 3,
  2608         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2609         -    add_srs_wkt (p, 4,
  2610         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2611         -    add_srs_wkt (p, 5,
  2612         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2613         -    add_srs_wkt (p, 6,
  2614         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2615         -    add_srs_wkt (p, 7,
  2616         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2617         -    add_srs_wkt (p, 8,
  2618         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2619         -    add_srs_wkt (p, 9,
  2620         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",51],PARA");
  2621         -    add_srs_wkt (p, 10,
  2622         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2623         -    add_srs_wkt (p, 11,
  2624         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2625         -    add_srs_wkt (p, 12,
  2626         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2627         -    add_srs_wkt (p, 13,
  2628         -        ",EAST],AUTHORITY[\"EPSG\",\"2592\"]]");
         2608  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2609  +    add_srs_wkt (p, 4,
         2610  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2611  +    add_srs_wkt (p, 5,
         2612  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2613  +    add_srs_wkt (p, 6,
         2614  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2615  +    add_srs_wkt (p, 7,
         2616  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2617  +    add_srs_wkt (p, 8,
         2618  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2619  +    add_srs_wkt (p, 9,
         2620  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",51],PAR");
         2621  +    add_srs_wkt (p, 10,
         2622  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2623  +    add_srs_wkt (p, 11,
         2624  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2625  +    add_srs_wkt (p, 12,
         2626  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2627  +    add_srs_wkt (p, 13,
         2628  +        "\",EAST],AUTHORITY[\"EPSG\",\"2592\"]]");
  2629   2629       p = add_epsg_def_ex (filter, first, last, 2593, "epsg", 2593,
  2630   2630           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 54E", 0, 1,
  2631   2631           "Krassowsky 1940", "Greenwich",
  2632   2632           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2633   2633           "X", "North", "Y", "East");
  2634   2634       add_proj4text (p, 0,
  2635   2635           "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=500000 +y_0=0 +");
  2636   2636       add_proj4text (p, 1,
  2637         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2637  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2638   2638       add_proj4text (p, 2,
  2639         -        "12 +units=m +no_defs");
         2639  +        ".12 +units=m +no_defs");
  2640   2640       add_srs_wkt (p, 0,
  2641   2641           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 54E\",G");
  2642   2642       add_srs_wkt (p, 1,
  2643   2643           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2644   2644       add_srs_wkt (p, 2,
  2645   2645           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2646   2646       add_srs_wkt (p, 3,
  2647         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2648         -    add_srs_wkt (p, 4,
  2649         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2650         -    add_srs_wkt (p, 5,
  2651         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2652         -    add_srs_wkt (p, 6,
  2653         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2654         -    add_srs_wkt (p, 7,
  2655         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2656         -    add_srs_wkt (p, 8,
  2657         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2658         -    add_srs_wkt (p, 9,
  2659         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",54],PARA");
  2660         -    add_srs_wkt (p, 10,
  2661         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2662         -    add_srs_wkt (p, 11,
  2663         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2664         -    add_srs_wkt (p, 12,
  2665         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2666         -    add_srs_wkt (p, 13,
  2667         -        ",EAST],AUTHORITY[\"EPSG\",\"2593\"]]");
         2647  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2648  +    add_srs_wkt (p, 4,
         2649  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2650  +    add_srs_wkt (p, 5,
         2651  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2652  +    add_srs_wkt (p, 6,
         2653  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2654  +    add_srs_wkt (p, 7,
         2655  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2656  +    add_srs_wkt (p, 8,
         2657  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2658  +    add_srs_wkt (p, 9,
         2659  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",54],PAR");
         2660  +    add_srs_wkt (p, 10,
         2661  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2662  +    add_srs_wkt (p, 11,
         2663  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2664  +    add_srs_wkt (p, 12,
         2665  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2666  +    add_srs_wkt (p, 13,
         2667  +        "\",EAST],AUTHORITY[\"EPSG\",\"2593\"]]");
  2668   2668       p = add_epsg_def_ex (filter, first, last, 2594, "epsg", 2594,
  2669   2669           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 57E", 0, 1,
  2670   2670           "Krassowsky 1940", "Greenwich",
  2671   2671           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2672   2672           "X", "North", "Y", "East");
  2673   2673       add_proj4text (p, 0,
  2674   2674           "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
  2675   2675       add_proj4text (p, 1,
  2676         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2676  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2677   2677       add_proj4text (p, 2,
  2678         -        "12 +units=m +no_defs");
         2678  +        ".12 +units=m +no_defs");
  2679   2679       add_srs_wkt (p, 0,
  2680   2680           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 57E\",G");
  2681   2681       add_srs_wkt (p, 1,
  2682   2682           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2683   2683       add_srs_wkt (p, 2,
  2684   2684           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2685   2685       add_srs_wkt (p, 3,
  2686         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2687         -    add_srs_wkt (p, 4,
  2688         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2689         -    add_srs_wkt (p, 5,
  2690         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2691         -    add_srs_wkt (p, 6,
  2692         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2693         -    add_srs_wkt (p, 7,
  2694         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2695         -    add_srs_wkt (p, 8,
  2696         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2697         -    add_srs_wkt (p, 9,
  2698         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",57],PARA");
  2699         -    add_srs_wkt (p, 10,
  2700         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2701         -    add_srs_wkt (p, 11,
  2702         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2703         -    add_srs_wkt (p, 12,
  2704         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2705         -    add_srs_wkt (p, 13,
  2706         -        ",EAST],AUTHORITY[\"EPSG\",\"2594\"]]");
         2686  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2687  +    add_srs_wkt (p, 4,
         2688  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2689  +    add_srs_wkt (p, 5,
         2690  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2691  +    add_srs_wkt (p, 6,
         2692  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2693  +    add_srs_wkt (p, 7,
         2694  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2695  +    add_srs_wkt (p, 8,
         2696  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2697  +    add_srs_wkt (p, 9,
         2698  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",57],PAR");
         2699  +    add_srs_wkt (p, 10,
         2700  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2701  +    add_srs_wkt (p, 11,
         2702  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2703  +    add_srs_wkt (p, 12,
         2704  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2705  +    add_srs_wkt (p, 13,
         2706  +        "\",EAST],AUTHORITY[\"EPSG\",\"2594\"]]");
  2707   2707       p = add_epsg_def_ex (filter, first, last, 2595, "epsg", 2595,
  2708   2708           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 60E", 0, 1,
  2709   2709           "Krassowsky 1940", "Greenwich",
  2710   2710           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2711   2711           "X", "North", "Y", "East");
  2712   2712       add_proj4text (p, 0,
  2713   2713           "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=500000 +y_0=0 +");
  2714   2714       add_proj4text (p, 1,
  2715         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2715  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2716   2716       add_proj4text (p, 2,
  2717         -        "12 +units=m +no_defs");
         2717  +        ".12 +units=m +no_defs");
  2718   2718       add_srs_wkt (p, 0,
  2719   2719           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 60E\",G");
  2720   2720       add_srs_wkt (p, 1,
  2721   2721           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2722   2722       add_srs_wkt (p, 2,
  2723   2723           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2724   2724       add_srs_wkt (p, 3,
  2725         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2726         -    add_srs_wkt (p, 4,
  2727         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2728         -    add_srs_wkt (p, 5,
  2729         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2730         -    add_srs_wkt (p, 6,
  2731         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2732         -    add_srs_wkt (p, 7,
  2733         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2734         -    add_srs_wkt (p, 8,
  2735         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2736         -    add_srs_wkt (p, 9,
  2737         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",60],PARA");
  2738         -    add_srs_wkt (p, 10,
  2739         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2740         -    add_srs_wkt (p, 11,
  2741         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2742         -    add_srs_wkt (p, 12,
  2743         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2744         -    add_srs_wkt (p, 13,
  2745         -        ",EAST],AUTHORITY[\"EPSG\",\"2595\"]]");
         2725  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2726  +    add_srs_wkt (p, 4,
         2727  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2728  +    add_srs_wkt (p, 5,
         2729  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2730  +    add_srs_wkt (p, 6,
         2731  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2732  +    add_srs_wkt (p, 7,
         2733  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2734  +    add_srs_wkt (p, 8,
         2735  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2736  +    add_srs_wkt (p, 9,
         2737  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",60],PAR");
         2738  +    add_srs_wkt (p, 10,
         2739  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2740  +    add_srs_wkt (p, 11,
         2741  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2742  +    add_srs_wkt (p, 12,
         2743  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2744  +    add_srs_wkt (p, 13,
         2745  +        "\",EAST],AUTHORITY[\"EPSG\",\"2595\"]]");
  2746   2746       p = add_epsg_def_ex (filter, first, last, 2596, "epsg", 2596,
  2747   2747           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 63E", 0, 1,
  2748   2748           "Krassowsky 1940", "Greenwich",
  2749   2749           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2750   2750           "X", "North", "Y", "East");
  2751   2751       add_proj4text (p, 0,
  2752   2752           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
  2753   2753       add_proj4text (p, 1,
  2754         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2754  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2755   2755       add_proj4text (p, 2,
  2756         -        "12 +units=m +no_defs");
         2756  +        ".12 +units=m +no_defs");
  2757   2757       add_srs_wkt (p, 0,
  2758   2758           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 63E\",G");
  2759   2759       add_srs_wkt (p, 1,
  2760   2760           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2761   2761       add_srs_wkt (p, 2,
  2762   2762           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2763   2763       add_srs_wkt (p, 3,
  2764         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2765         -    add_srs_wkt (p, 4,
  2766         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2767         -    add_srs_wkt (p, 5,
  2768         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2769         -    add_srs_wkt (p, 6,
  2770         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2771         -    add_srs_wkt (p, 7,
  2772         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2773         -    add_srs_wkt (p, 8,
  2774         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2775         -    add_srs_wkt (p, 9,
  2776         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",63],PARA");
  2777         -    add_srs_wkt (p, 10,
  2778         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2779         -    add_srs_wkt (p, 11,
  2780         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2781         -    add_srs_wkt (p, 12,
  2782         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2783         -    add_srs_wkt (p, 13,
  2784         -        ",EAST],AUTHORITY[\"EPSG\",\"2596\"]]");
         2764  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2765  +    add_srs_wkt (p, 4,
         2766  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2767  +    add_srs_wkt (p, 5,
         2768  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2769  +    add_srs_wkt (p, 6,
         2770  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2771  +    add_srs_wkt (p, 7,
         2772  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2773  +    add_srs_wkt (p, 8,
         2774  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2775  +    add_srs_wkt (p, 9,
         2776  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",63],PAR");
         2777  +    add_srs_wkt (p, 10,
         2778  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2779  +    add_srs_wkt (p, 11,
         2780  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2781  +    add_srs_wkt (p, 12,
         2782  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2783  +    add_srs_wkt (p, 13,
         2784  +        "\",EAST],AUTHORITY[\"EPSG\",\"2596\"]]");
  2785   2785       p = add_epsg_def_ex (filter, first, last, 2597, "epsg", 2597,
  2786   2786           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 66E", 0, 1,
  2787   2787           "Krassowsky 1940", "Greenwich",
  2788   2788           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2789   2789           "X", "North", "Y", "East");
  2790   2790       add_proj4text (p, 0,
  2791   2791           "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=500000 +y_0=0 +");
  2792   2792       add_proj4text (p, 1,
  2793         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2793  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2794   2794       add_proj4text (p, 2,
  2795         -        "12 +units=m +no_defs");
         2795  +        ".12 +units=m +no_defs");
  2796   2796       add_srs_wkt (p, 0,
  2797   2797           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 66E\",G");
  2798   2798       add_srs_wkt (p, 1,
  2799   2799           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2800   2800       add_srs_wkt (p, 2,
  2801   2801           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2802   2802       add_srs_wkt (p, 3,
  2803         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2804         -    add_srs_wkt (p, 4,
  2805         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2806         -    add_srs_wkt (p, 5,
  2807         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2808         -    add_srs_wkt (p, 6,
  2809         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2810         -    add_srs_wkt (p, 7,
  2811         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2812         -    add_srs_wkt (p, 8,
  2813         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2814         -    add_srs_wkt (p, 9,
  2815         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",66],PARA");
  2816         -    add_srs_wkt (p, 10,
  2817         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2818         -    add_srs_wkt (p, 11,
  2819         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2820         -    add_srs_wkt (p, 12,
  2821         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2822         -    add_srs_wkt (p, 13,
  2823         -        ",EAST],AUTHORITY[\"EPSG\",\"2597\"]]");
         2803  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2804  +    add_srs_wkt (p, 4,
         2805  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2806  +    add_srs_wkt (p, 5,
         2807  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2808  +    add_srs_wkt (p, 6,
         2809  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2810  +    add_srs_wkt (p, 7,
         2811  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2812  +    add_srs_wkt (p, 8,
         2813  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2814  +    add_srs_wkt (p, 9,
         2815  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",66],PAR");
         2816  +    add_srs_wkt (p, 10,
         2817  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2818  +    add_srs_wkt (p, 11,
         2819  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2820  +    add_srs_wkt (p, 12,
         2821  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2822  +    add_srs_wkt (p, 13,
         2823  +        "\",EAST],AUTHORITY[\"EPSG\",\"2597\"]]");
  2824   2824       p = add_epsg_def_ex (filter, first, last, 2598, "epsg", 2598,
  2825   2825           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 69E", 0, 1,
  2826   2826           "Krassowsky 1940", "Greenwich",
  2827   2827           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2828   2828           "X", "North", "Y", "East");
  2829   2829       add_proj4text (p, 0,
  2830   2830           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  2831   2831       add_proj4text (p, 1,
  2832         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2832  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2833   2833       add_proj4text (p, 2,
  2834         -        "12 +units=m +no_defs");
         2834  +        ".12 +units=m +no_defs");
  2835   2835       add_srs_wkt (p, 0,
  2836   2836           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 69E\",G");
  2837   2837       add_srs_wkt (p, 1,
  2838   2838           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2839   2839       add_srs_wkt (p, 2,
  2840   2840           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2841   2841       add_srs_wkt (p, 3,
  2842         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2843         -    add_srs_wkt (p, 4,
  2844         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2845         -    add_srs_wkt (p, 5,
  2846         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2847         -    add_srs_wkt (p, 6,
  2848         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2849         -    add_srs_wkt (p, 7,
  2850         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2851         -    add_srs_wkt (p, 8,
  2852         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2853         -    add_srs_wkt (p, 9,
  2854         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",69],PARA");
  2855         -    add_srs_wkt (p, 10,
  2856         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2857         -    add_srs_wkt (p, 11,
  2858         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2859         -    add_srs_wkt (p, 12,
  2860         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2861         -    add_srs_wkt (p, 13,
  2862         -        ",EAST],AUTHORITY[\"EPSG\",\"2598\"]]");
         2842  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2843  +    add_srs_wkt (p, 4,
         2844  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2845  +    add_srs_wkt (p, 5,
         2846  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2847  +    add_srs_wkt (p, 6,
         2848  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2849  +    add_srs_wkt (p, 7,
         2850  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2851  +    add_srs_wkt (p, 8,
         2852  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2853  +    add_srs_wkt (p, 9,
         2854  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",69],PAR");
         2855  +    add_srs_wkt (p, 10,
         2856  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2857  +    add_srs_wkt (p, 11,
         2858  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2859  +    add_srs_wkt (p, 12,
         2860  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2861  +    add_srs_wkt (p, 13,
         2862  +        "\",EAST],AUTHORITY[\"EPSG\",\"2598\"]]");
  2863   2863       p = add_epsg_def_ex (filter, first, last, 2599, "epsg", 2599,
  2864   2864           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 72E", 0, 1,
  2865   2865           "Krassowsky 1940", "Greenwich",
  2866   2866           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2867   2867           "X", "North", "Y", "East");
  2868   2868       add_proj4text (p, 0,
  2869   2869           "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=500000 +y_0=0 +");
  2870   2870       add_proj4text (p, 1,
  2871         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2871  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2872   2872       add_proj4text (p, 2,
  2873         -        "12 +units=m +no_defs");
         2873  +        ".12 +units=m +no_defs");
  2874   2874       add_srs_wkt (p, 0,
  2875   2875           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 72E\",G");
  2876   2876       add_srs_wkt (p, 1,
  2877   2877           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2878   2878       add_srs_wkt (p, 2,
  2879   2879           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2880   2880       add_srs_wkt (p, 3,
  2881         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2882         -    add_srs_wkt (p, 4,
  2883         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2884         -    add_srs_wkt (p, 5,
  2885         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2886         -    add_srs_wkt (p, 6,
  2887         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2888         -    add_srs_wkt (p, 7,
  2889         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2890         -    add_srs_wkt (p, 8,
  2891         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2892         -    add_srs_wkt (p, 9,
  2893         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",72],PARA");
  2894         -    add_srs_wkt (p, 10,
  2895         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2896         -    add_srs_wkt (p, 11,
  2897         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2898         -    add_srs_wkt (p, 12,
  2899         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2900         -    add_srs_wkt (p, 13,
  2901         -        ",EAST],AUTHORITY[\"EPSG\",\"2599\"]]");
         2881  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2882  +    add_srs_wkt (p, 4,
         2883  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2884  +    add_srs_wkt (p, 5,
         2885  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2886  +    add_srs_wkt (p, 6,
         2887  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2888  +    add_srs_wkt (p, 7,
         2889  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2890  +    add_srs_wkt (p, 8,
         2891  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2892  +    add_srs_wkt (p, 9,
         2893  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",72],PAR");
         2894  +    add_srs_wkt (p, 10,
         2895  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2896  +    add_srs_wkt (p, 11,
         2897  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2898  +    add_srs_wkt (p, 12,
         2899  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2900  +    add_srs_wkt (p, 13,
         2901  +        "\",EAST],AUTHORITY[\"EPSG\",\"2599\"]]");
  2902   2902       p = add_epsg_def_ex (filter, first, last, 2600, "epsg", 2600,
  2903   2903           "Lietuvos Koordinoei Sistema 1994 (deprecated)", 0, 1,
  2904   2904           "GRS 1980", "Greenwich",
  2905   2905           "Lithuania_1994_ETRS89", "Transverse_Mercator", "metre",
  2906   2906           "X", "North", "Y", "East");
  2907   2907       add_proj4text (p, 0,
  2908   2908           "+proj=tmerc +lat_0=0 +lon_0=24 +k=0.9998 +x_0=500000 +y_");
................................................................................
  2942   2942           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 75E", 0, 1,
  2943   2943           "Krassowsky 1940", "Greenwich",
  2944   2944           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2945   2945           "X", "North", "Y", "East");
  2946   2946       add_proj4text (p, 0,
  2947   2947           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  2948   2948       add_proj4text (p, 1,
  2949         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2949  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2950   2950       add_proj4text (p, 2,
  2951         -        "12 +units=m +no_defs");
         2951  +        ".12 +units=m +no_defs");
  2952   2952       add_srs_wkt (p, 0,
  2953   2953           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 75E\",G");
  2954   2954       add_srs_wkt (p, 1,
  2955   2955           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2956   2956       add_srs_wkt (p, 2,
  2957   2957           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2958   2958       add_srs_wkt (p, 3,
  2959         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2960         -    add_srs_wkt (p, 4,
  2961         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2962         -    add_srs_wkt (p, 5,
  2963         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2964         -    add_srs_wkt (p, 6,
  2965         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2966         -    add_srs_wkt (p, 7,
  2967         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  2968         -    add_srs_wkt (p, 8,
  2969         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2970         -    add_srs_wkt (p, 9,
  2971         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",75],PARA");
  2972         -    add_srs_wkt (p, 10,
  2973         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  2974         -    add_srs_wkt (p, 11,
  2975         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  2976         -    add_srs_wkt (p, 12,
  2977         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  2978         -    add_srs_wkt (p, 13,
  2979         -        ",EAST],AUTHORITY[\"EPSG\",\"2601\"]]");
         2959  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2960  +    add_srs_wkt (p, 4,
         2961  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         2962  +    add_srs_wkt (p, 5,
         2963  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         2964  +    add_srs_wkt (p, 6,
         2965  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         2966  +    add_srs_wkt (p, 7,
         2967  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         2968  +    add_srs_wkt (p, 8,
         2969  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         2970  +    add_srs_wkt (p, 9,
         2971  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",75],PAR");
         2972  +    add_srs_wkt (p, 10,
         2973  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         2974  +    add_srs_wkt (p, 11,
         2975  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         2976  +    add_srs_wkt (p, 12,
         2977  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         2978  +    add_srs_wkt (p, 13,
         2979  +        "\",EAST],AUTHORITY[\"EPSG\",\"2601\"]]");
  2980   2980       p = add_epsg_def_ex (filter, first, last, 2602, "epsg", 2602,
  2981   2981           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 78E", 0, 1,
  2982   2982           "Krassowsky 1940", "Greenwich",
  2983   2983           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2984   2984           "X", "North", "Y", "East");
  2985   2985       add_proj4text (p, 0,
  2986   2986           "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=500000 +y_0=0 +");
  2987   2987       add_proj4text (p, 1,
  2988         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2988  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2989   2989       add_proj4text (p, 2,
  2990         -        "12 +units=m +no_defs");
         2990  +        ".12 +units=m +no_defs");
  2991   2991       add_srs_wkt (p, 0,
  2992   2992           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 78E\",G");
  2993   2993       add_srs_wkt (p, 1,
  2994   2994           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  2995   2995       add_srs_wkt (p, 2,
  2996   2996           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2997   2997       add_srs_wkt (p, 3,
  2998         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  2999         -    add_srs_wkt (p, 4,
  3000         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3001         -    add_srs_wkt (p, 5,
  3002         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3003         -    add_srs_wkt (p, 6,
  3004         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3005         -    add_srs_wkt (p, 7,
  3006         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3007         -    add_srs_wkt (p, 8,
  3008         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3009         -    add_srs_wkt (p, 9,
  3010         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",78],PARA");
  3011         -    add_srs_wkt (p, 10,
  3012         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3013         -    add_srs_wkt (p, 11,
  3014         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3015         -    add_srs_wkt (p, 12,
  3016         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3017         -    add_srs_wkt (p, 13,
  3018         -        ",EAST],AUTHORITY[\"EPSG\",\"2602\"]]");
         2998  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         2999  +    add_srs_wkt (p, 4,
         3000  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3001  +    add_srs_wkt (p, 5,
         3002  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3003  +    add_srs_wkt (p, 6,
         3004  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3005  +    add_srs_wkt (p, 7,
         3006  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3007  +    add_srs_wkt (p, 8,
         3008  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3009  +    add_srs_wkt (p, 9,
         3010  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",78],PAR");
         3011  +    add_srs_wkt (p, 10,
         3012  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3013  +    add_srs_wkt (p, 11,
         3014  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3015  +    add_srs_wkt (p, 12,
         3016  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3017  +    add_srs_wkt (p, 13,
         3018  +        "\",EAST],AUTHORITY[\"EPSG\",\"2602\"]]");
  3019   3019       p = add_epsg_def_ex (filter, first, last, 2603, "epsg", 2603,
  3020   3020           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 81E", 0, 1,
  3021   3021           "Krassowsky 1940", "Greenwich",
  3022   3022           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3023   3023           "X", "North", "Y", "East");
  3024   3024       add_proj4text (p, 0,
  3025   3025           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
  3026   3026       add_proj4text (p, 1,
  3027         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3027  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3028   3028       add_proj4text (p, 2,
  3029         -        "12 +units=m +no_defs");
         3029  +        ".12 +units=m +no_defs");
  3030   3030       add_srs_wkt (p, 0,
  3031   3031           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 81E\",G");
  3032   3032       add_srs_wkt (p, 1,
  3033   3033           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3034   3034       add_srs_wkt (p, 2,
  3035   3035           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3036   3036       add_srs_wkt (p, 3,
  3037         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3038         -    add_srs_wkt (p, 4,
  3039         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3040         -    add_srs_wkt (p, 5,
  3041         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3042         -    add_srs_wkt (p, 6,
  3043         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3044         -    add_srs_wkt (p, 7,
  3045         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3046         -    add_srs_wkt (p, 8,
  3047         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3048         -    add_srs_wkt (p, 9,
  3049         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",81],PARA");
  3050         -    add_srs_wkt (p, 10,
  3051         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3052         -    add_srs_wkt (p, 11,
  3053         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3054         -    add_srs_wkt (p, 12,
  3055         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3056         -    add_srs_wkt (p, 13,
  3057         -        ",EAST],AUTHORITY[\"EPSG\",\"2603\"]]");
         3037  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3038  +    add_srs_wkt (p, 4,
         3039  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3040  +    add_srs_wkt (p, 5,
         3041  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3042  +    add_srs_wkt (p, 6,
         3043  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3044  +    add_srs_wkt (p, 7,
         3045  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3046  +    add_srs_wkt (p, 8,
         3047  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3048  +    add_srs_wkt (p, 9,
         3049  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",81],PAR");
         3050  +    add_srs_wkt (p, 10,
         3051  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3052  +    add_srs_wkt (p, 11,
         3053  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3054  +    add_srs_wkt (p, 12,
         3055  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3056  +    add_srs_wkt (p, 13,
         3057  +        "\",EAST],AUTHORITY[\"EPSG\",\"2603\"]]");
  3058   3058       p = add_epsg_def_ex (filter, first, last, 2604, "epsg", 2604,
  3059   3059           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 84E", 0, 1,
  3060   3060           "Krassowsky 1940", "Greenwich",
  3061   3061           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3062   3062           "X", "North", "Y", "East");
  3063   3063       add_proj4text (p, 0,
  3064   3064           "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=500000 +y_0=0 +");
  3065   3065       add_proj4text (p, 1,
  3066         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3066  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3067   3067       add_proj4text (p, 2,
  3068         -        "12 +units=m +no_defs");
         3068  +        ".12 +units=m +no_defs");
  3069   3069       add_srs_wkt (p, 0,
  3070   3070           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 84E\",G");
  3071   3071       add_srs_wkt (p, 1,
  3072   3072           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3073   3073       add_srs_wkt (p, 2,
  3074   3074           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3075   3075       add_srs_wkt (p, 3,
  3076         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3077         -    add_srs_wkt (p, 4,
  3078         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3079         -    add_srs_wkt (p, 5,
  3080         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3081         -    add_srs_wkt (p, 6,
  3082         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3083         -    add_srs_wkt (p, 7,
  3084         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3085         -    add_srs_wkt (p, 8,
  3086         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3087         -    add_srs_wkt (p, 9,
  3088         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",84],PARA");
  3089         -    add_srs_wkt (p, 10,
  3090         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3091         -    add_srs_wkt (p, 11,
  3092         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3093         -    add_srs_wkt (p, 12,
  3094         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3095         -    add_srs_wkt (p, 13,
  3096         -        ",EAST],AUTHORITY[\"EPSG\",\"2604\"]]");
         3076  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3077  +    add_srs_wkt (p, 4,
         3078  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3079  +    add_srs_wkt (p, 5,
         3080  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3081  +    add_srs_wkt (p, 6,
         3082  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3083  +    add_srs_wkt (p, 7,
         3084  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3085  +    add_srs_wkt (p, 8,
         3086  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3087  +    add_srs_wkt (p, 9,
         3088  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",84],PAR");
         3089  +    add_srs_wkt (p, 10,
         3090  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3091  +    add_srs_wkt (p, 11,
         3092  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3093  +    add_srs_wkt (p, 12,
         3094  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3095  +    add_srs_wkt (p, 13,
         3096  +        "\",EAST],AUTHORITY[\"EPSG\",\"2604\"]]");
  3097   3097       p = add_epsg_def_ex (filter, first, last, 2605, "epsg", 2605,
  3098   3098           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 87E", 0, 1,
  3099   3099           "Krassowsky 1940", "Greenwich",
  3100   3100           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3101   3101           "X", "North", "Y", "East");
  3102   3102       add_proj4text (p, 0,
  3103   3103           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
  3104   3104       add_proj4text (p, 1,
  3105         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3105  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3106   3106       add_proj4text (p, 2,
  3107         -        "12 +units=m +no_defs");
         3107  +        ".12 +units=m +no_defs");
  3108   3108       add_srs_wkt (p, 0,
  3109   3109           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 87E\",G");
  3110   3110       add_srs_wkt (p, 1,
  3111   3111           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3112   3112       add_srs_wkt (p, 2,
  3113   3113           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3114   3114       add_srs_wkt (p, 3,
  3115         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3116         -    add_srs_wkt (p, 4,
  3117         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3118         -    add_srs_wkt (p, 5,
  3119         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3120         -    add_srs_wkt (p, 6,
  3121         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3122         -    add_srs_wkt (p, 7,
  3123         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3124         -    add_srs_wkt (p, 8,
  3125         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3126         -    add_srs_wkt (p, 9,
  3127         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",87],PARA");
  3128         -    add_srs_wkt (p, 10,
  3129         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3130         -    add_srs_wkt (p, 11,
  3131         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3132         -    add_srs_wkt (p, 12,
  3133         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3134         -    add_srs_wkt (p, 13,
  3135         -        ",EAST],AUTHORITY[\"EPSG\",\"2605\"]]");
         3115  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3116  +    add_srs_wkt (p, 4,
         3117  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3118  +    add_srs_wkt (p, 5,
         3119  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3120  +    add_srs_wkt (p, 6,
         3121  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3122  +    add_srs_wkt (p, 7,
         3123  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3124  +    add_srs_wkt (p, 8,
         3125  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3126  +    add_srs_wkt (p, 9,
         3127  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",87],PAR");
         3128  +    add_srs_wkt (p, 10,
         3129  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3130  +    add_srs_wkt (p, 11,
         3131  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3132  +    add_srs_wkt (p, 12,
         3133  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3134  +    add_srs_wkt (p, 13,
         3135  +        "\",EAST],AUTHORITY[\"EPSG\",\"2605\"]]");
  3136   3136       p = add_epsg_def_ex (filter, first, last, 2606, "epsg", 2606,
  3137   3137           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 90E", 0, 1,
  3138   3138           "Krassowsky 1940", "Greenwich",
  3139   3139           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3140   3140           "X", "North", "Y", "East");
  3141   3141       add_proj4text (p, 0,
  3142   3142           "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=500000 +y_0=0 +");
  3143   3143       add_proj4text (p, 1,
  3144         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3144  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3145   3145       add_proj4text (p, 2,
  3146         -        "12 +units=m +no_defs");
         3146  +        ".12 +units=m +no_defs");
  3147   3147       add_srs_wkt (p, 0,
  3148   3148           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 90E\",G");
  3149   3149       add_srs_wkt (p, 1,
  3150   3150           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3151   3151       add_srs_wkt (p, 2,
  3152   3152           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3153   3153       add_srs_wkt (p, 3,
  3154         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3155         -    add_srs_wkt (p, 4,
  3156         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3157         -    add_srs_wkt (p, 5,
  3158         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3159         -    add_srs_wkt (p, 6,
  3160         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3161         -    add_srs_wkt (p, 7,
  3162         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3163         -    add_srs_wkt (p, 8,
  3164         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3165         -    add_srs_wkt (p, 9,
  3166         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",90],PARA");
  3167         -    add_srs_wkt (p, 10,
  3168         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3169         -    add_srs_wkt (p, 11,
  3170         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3171         -    add_srs_wkt (p, 12,
  3172         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3173         -    add_srs_wkt (p, 13,
  3174         -        ",EAST],AUTHORITY[\"EPSG\",\"2606\"]]");
         3154  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3155  +    add_srs_wkt (p, 4,
         3156  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3157  +    add_srs_wkt (p, 5,
         3158  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3159  +    add_srs_wkt (p, 6,
         3160  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3161  +    add_srs_wkt (p, 7,
         3162  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3163  +    add_srs_wkt (p, 8,
         3164  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3165  +    add_srs_wkt (p, 9,
         3166  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",90],PAR");
         3167  +    add_srs_wkt (p, 10,
         3168  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3169  +    add_srs_wkt (p, 11,
         3170  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3171  +    add_srs_wkt (p, 12,
         3172  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3173  +    add_srs_wkt (p, 13,
         3174  +        "\",EAST],AUTHORITY[\"EPSG\",\"2606\"]]");
  3175   3175       p = add_epsg_def_ex (filter, first, last, 2607, "epsg", 2607,
  3176   3176           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 93E", 0, 1,
  3177   3177           "Krassowsky 1940", "Greenwich",
  3178   3178           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3179   3179           "X", "North", "Y", "East");
  3180   3180       add_proj4text (p, 0,
  3181   3181           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
  3182   3182       add_proj4text (p, 1,
  3183         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3183  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3184   3184       add_proj4text (p, 2,
  3185         -        "12 +units=m +no_defs");
         3185  +        ".12 +units=m +no_defs");
  3186   3186       add_srs_wkt (p, 0,
  3187   3187           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 93E\",G");
  3188   3188       add_srs_wkt (p, 1,
  3189   3189           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3190   3190       add_srs_wkt (p, 2,
  3191   3191           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3192   3192       add_srs_wkt (p, 3,
  3193         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3194         -    add_srs_wkt (p, 4,
  3195         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3196         -    add_srs_wkt (p, 5,
  3197         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3198         -    add_srs_wkt (p, 6,
  3199         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3200         -    add_srs_wkt (p, 7,
  3201         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3202         -    add_srs_wkt (p, 8,
  3203         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3204         -    add_srs_wkt (p, 9,
  3205         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",93],PARA");
  3206         -    add_srs_wkt (p, 10,
  3207         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3208         -    add_srs_wkt (p, 11,
  3209         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3210         -    add_srs_wkt (p, 12,
  3211         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3212         -    add_srs_wkt (p, 13,
  3213         -        ",EAST],AUTHORITY[\"EPSG\",\"2607\"]]");
         3193  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3194  +    add_srs_wkt (p, 4,
         3195  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3196  +    add_srs_wkt (p, 5,
         3197  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3198  +    add_srs_wkt (p, 6,
         3199  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3200  +    add_srs_wkt (p, 7,
         3201  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3202  +    add_srs_wkt (p, 8,
         3203  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3204  +    add_srs_wkt (p, 9,
         3205  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",93],PAR");
         3206  +    add_srs_wkt (p, 10,
         3207  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3208  +    add_srs_wkt (p, 11,
         3209  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3210  +    add_srs_wkt (p, 12,
         3211  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3212  +    add_srs_wkt (p, 13,
         3213  +        "\",EAST],AUTHORITY[\"EPSG\",\"2607\"]]");
  3214   3214       p = add_epsg_def_ex (filter, first, last, 2608, "epsg", 2608,
  3215   3215           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 96E", 0, 1,
  3216   3216           "Krassowsky 1940", "Greenwich",
  3217   3217           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3218   3218           "X", "North", "Y", "East");
  3219   3219       add_proj4text (p, 0,
  3220   3220           "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=500000 +y_0=0 +");
  3221   3221       add_proj4text (p, 1,
  3222         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3222  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3223   3223       add_proj4text (p, 2,
  3224         -        "12 +units=m +no_defs");
         3224  +        ".12 +units=m +no_defs");
  3225   3225       add_srs_wkt (p, 0,
  3226   3226           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 96E\",G");
  3227   3227       add_srs_wkt (p, 1,
  3228   3228           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3229   3229       add_srs_wkt (p, 2,
  3230   3230           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3231   3231       add_srs_wkt (p, 3,
  3232         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3233         -    add_srs_wkt (p, 4,
  3234         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3235         -    add_srs_wkt (p, 5,
  3236         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3237         -    add_srs_wkt (p, 6,
  3238         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3239         -    add_srs_wkt (p, 7,
  3240         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3241         -    add_srs_wkt (p, 8,
  3242         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3243         -    add_srs_wkt (p, 9,
  3244         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",96],PARA");
  3245         -    add_srs_wkt (p, 10,
  3246         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3247         -    add_srs_wkt (p, 11,
  3248         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3249         -    add_srs_wkt (p, 12,
  3250         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3251         -    add_srs_wkt (p, 13,
  3252         -        ",EAST],AUTHORITY[\"EPSG\",\"2608\"]]");
         3232  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3233  +    add_srs_wkt (p, 4,
         3234  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3235  +    add_srs_wkt (p, 5,
         3236  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3237  +    add_srs_wkt (p, 6,
         3238  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3239  +    add_srs_wkt (p, 7,
         3240  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3241  +    add_srs_wkt (p, 8,
         3242  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3243  +    add_srs_wkt (p, 9,
         3244  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",96],PAR");
         3245  +    add_srs_wkt (p, 10,
         3246  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3247  +    add_srs_wkt (p, 11,
         3248  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3249  +    add_srs_wkt (p, 12,
         3250  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3251  +    add_srs_wkt (p, 13,
         3252  +        "\",EAST],AUTHORITY[\"EPSG\",\"2608\"]]");
  3253   3253       p = add_epsg_def_ex (filter, first, last, 2609, "epsg", 2609,
  3254   3254           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 99E", 0, 1,
  3255   3255           "Krassowsky 1940", "Greenwich",
  3256   3256           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3257   3257           "X", "North", "Y", "East");
  3258   3258       add_proj4text (p, 0,
  3259   3259           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
  3260   3260       add_proj4text (p, 1,
  3261         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3261  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3262   3262       add_proj4text (p, 2,
  3263         -        "12 +units=m +no_defs");
         3263  +        ".12 +units=m +no_defs");
  3264   3264       add_srs_wkt (p, 0,
  3265   3265           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 99E\",G");
  3266   3266       add_srs_wkt (p, 1,
  3267   3267           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3268   3268       add_srs_wkt (p, 2,
  3269   3269           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3270   3270       add_srs_wkt (p, 3,
  3271         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
  3272         -    add_srs_wkt (p, 4,
  3273         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3274         -    add_srs_wkt (p, 5,
  3275         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3276         -    add_srs_wkt (p, 6,
  3277         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  3278         -    add_srs_wkt (p, 7,
  3279         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
  3280         -    add_srs_wkt (p, 8,
  3281         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  3282         -    add_srs_wkt (p, 9,
  3283         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",99],PARA");
  3284         -    add_srs_wkt (p, 10,
  3285         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3286         -    add_srs_wkt (p, 11,
  3287         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3288         -    add_srs_wkt (p, 12,
  3289         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3290         -    add_srs_wkt (p, 13,
  3291         -        ",EAST],AUTHORITY[\"EPSG\",\"2609\"]]");
         3271  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
         3272  +    add_srs_wkt (p, 4,
         3273  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
         3274  +    add_srs_wkt (p, 5,
         3275  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
         3276  +    add_srs_wkt (p, 6,
         3277  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
         3278  +    add_srs_wkt (p, 7,
         3279  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
         3280  +    add_srs_wkt (p, 8,
         3281  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
         3282  +    add_srs_wkt (p, 9,
         3283  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",99],PAR");
         3284  +    add_srs_wkt (p, 10,
         3285  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3286  +    add_srs_wkt (p, 11,
         3287  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3288  +    add_srs_wkt (p, 12,
         3289  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3290  +    add_srs_wkt (p, 13,
         3291  +        "\",EAST],AUTHORITY[\"EPSG\",\"2609\"]]");
  3292   3292       p = add_epsg_def_ex (filter, first, last, 2610, "epsg", 2610,
  3293   3293           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 102E", 0, 1,
  3294   3294           "Krassowsky 1940", "Greenwich",
  3295   3295           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3296   3296           "X", "North", "Y", "East");
  3297   3297       add_proj4text (p, 0,
  3298   3298           "+proj=tmerc +lat_0=0 +lon_0=102 +k=1 +x_0=500000 +y_0=0 ");
  3299   3299       add_proj4text (p, 1,
  3300         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3300  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3301   3301       add_proj4text (p, 2,
  3302         -        ".12 +units=m +no_defs");
         3302  +        "0.12 +units=m +no_defs");
  3303   3303       add_srs_wkt (p, 0,
  3304   3304           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 102E\",");
  3305   3305       add_srs_wkt (p, 1,
  3306   3306           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3307   3307       add_srs_wkt (p, 2,
  3308   3308           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3309   3309       add_srs_wkt (p, 3,
  3310         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3310  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3311   3311       add_srs_wkt (p, 4,
  3312         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3312  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3313   3313       add_srs_wkt (p, 5,
  3314         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3314  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3315   3315       add_srs_wkt (p, 6,
  3316         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3316  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3317   3317       add_srs_wkt (p, 7,
  3318         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3318  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3319   3319       add_srs_wkt (p, 8,
  3320   3320           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3321   3321       add_srs_wkt (p, 9,
  3322   3322           "ude_of_origin\",0],PARAMETER[\"central_meridian\",102],P");
  3323   3323       add_srs_wkt (p, 10,
  3324   3324           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3325   3325       add_srs_wkt (p, 11,
................................................................................
  3332   3332           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 105E", 0, 1,
  3333   3333           "Krassowsky 1940", "Greenwich",
  3334   3334           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3335   3335           "X", "North", "Y", "East");
  3336   3336       add_proj4text (p, 0,
  3337   3337           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
  3338   3338       add_proj4text (p, 1,
  3339         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3339  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3340   3340       add_proj4text (p, 2,
  3341         -        ".12 +units=m +no_defs");
         3341  +        "0.12 +units=m +no_defs");
  3342   3342       add_srs_wkt (p, 0,
  3343   3343           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 105E\",");
  3344   3344       add_srs_wkt (p, 1,
  3345   3345           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3346   3346       add_srs_wkt (p, 2,
  3347   3347           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3348   3348       add_srs_wkt (p, 3,
  3349         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3349  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3350   3350       add_srs_wkt (p, 4,
  3351         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3351  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3352   3352       add_srs_wkt (p, 5,
  3353         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3353  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3354   3354       add_srs_wkt (p, 6,
  3355         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3355  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3356   3356       add_srs_wkt (p, 7,
  3357         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3357  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3358   3358       add_srs_wkt (p, 8,
  3359   3359           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3360   3360       add_srs_wkt (p, 9,
  3361   3361           "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
  3362   3362       add_srs_wkt (p, 10,
  3363   3363           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3364   3364       add_srs_wkt (p, 11,
................................................................................
  3371   3371           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 108E", 0, 1,
  3372   3372           "Krassowsky 1940", "Greenwich",
  3373   3373           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3374   3374           "X", "North", "Y", "East");
  3375   3375       add_proj4text (p, 0,
  3376   3376           "+proj=tmerc +lat_0=0 +lon_0=108 +k=1 +x_0=500000 +y_0=0 ");
  3377   3377       add_proj4text (p, 1,
  3378         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3378  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3379   3379       add_proj4text (p, 2,
  3380         -        ".12 +units=m +no_defs");
         3380  +        "0.12 +units=m +no_defs");
  3381   3381       add_srs_wkt (p, 0,
  3382   3382           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 108E\",");
  3383   3383       add_srs_wkt (p, 1,
  3384   3384           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3385   3385       add_srs_wkt (p, 2,
  3386   3386           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3387   3387       add_srs_wkt (p, 3,
  3388         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3388  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3389   3389       add_srs_wkt (p, 4,
  3390         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3390  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3391   3391       add_srs_wkt (p, 5,
  3392         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3392  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3393   3393       add_srs_wkt (p, 6,
  3394         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3394  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3395   3395       add_srs_wkt (p, 7,
  3396         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3396  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3397   3397       add_srs_wkt (p, 8,
  3398   3398           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3399   3399       add_srs_wkt (p, 9,
  3400   3400           "ude_of_origin\",0],PARAMETER[\"central_meridian\",108],P");
  3401   3401       add_srs_wkt (p, 10,
  3402   3402           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3403   3403       add_srs_wkt (p, 11,
................................................................................
  3410   3410           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 111E", 0, 1,
  3411   3411           "Krassowsky 1940", "Greenwich",
  3412   3412           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3413   3413           "X", "North", "Y", "East");
  3414   3414       add_proj4text (p, 0,
  3415   3415           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
  3416   3416       add_proj4text (p, 1,
  3417         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3417  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3418   3418       add_proj4text (p, 2,
  3419         -        ".12 +units=m +no_defs");
         3419  +        "0.12 +units=m +no_defs");
  3420   3420       add_srs_wkt (p, 0,
  3421   3421           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 111E\",");
  3422   3422       add_srs_wkt (p, 1,
  3423   3423           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3424   3424       add_srs_wkt (p, 2,
  3425   3425           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3426   3426       add_srs_wkt (p, 3,
  3427         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3427  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3428   3428       add_srs_wkt (p, 4,
  3429         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3429  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3430   3430       add_srs_wkt (p, 5,
  3431         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3431  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3432   3432       add_srs_wkt (p, 6,
  3433         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3433  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3434   3434       add_srs_wkt (p, 7,
  3435         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3435  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3436   3436       add_srs_wkt (p, 8,
  3437   3437           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3438   3438       add_srs_wkt (p, 9,
  3439   3439           "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
  3440   3440       add_srs_wkt (p, 10,
  3441   3441           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3442   3442       add_srs_wkt (p, 11,
................................................................................
  3449   3449           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 114E", 0, 1,
  3450   3450           "Krassowsky 1940", "Greenwich",
  3451   3451           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3452   3452           "X", "North", "Y", "East");
  3453   3453       add_proj4text (p, 0,
  3454   3454           "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 ");
  3455   3455       add_proj4text (p, 1,
  3456         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3456  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3457   3457       add_proj4text (p, 2,
  3458         -        ".12 +units=m +no_defs");
         3458  +        "0.12 +units=m +no_defs");
  3459   3459       add_srs_wkt (p, 0,
  3460   3460           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 114E\",");
  3461   3461       add_srs_wkt (p, 1,
  3462   3462           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3463   3463       add_srs_wkt (p, 2,
  3464   3464           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3465   3465       add_srs_wkt (p, 3,
  3466         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3466  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3467   3467       add_srs_wkt (p, 4,
  3468         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3468  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3469   3469       add_srs_wkt (p, 5,
  3470         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3470  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3471   3471       add_srs_wkt (p, 6,
  3472         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3472  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3473   3473       add_srs_wkt (p, 7,
  3474         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3474  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3475   3475       add_srs_wkt (p, 8,
  3476   3476           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3477   3477       add_srs_wkt (p, 9,
  3478   3478           "ude_of_origin\",0],PARAMETER[\"central_meridian\",114],P");
  3479   3479       add_srs_wkt (p, 10,
  3480   3480           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3481   3481       add_srs_wkt (p, 11,
................................................................................
  3488   3488           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 117E", 0, 1,
  3489   3489           "Krassowsky 1940", "Greenwich",
  3490   3490           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3491   3491           "X", "North", "Y", "East");
  3492   3492       add_proj4text (p, 0,
  3493   3493           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
  3494   3494       add_proj4text (p, 1,
  3495         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3495  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3496   3496       add_proj4text (p, 2,
  3497         -        ".12 +units=m +no_defs");
         3497  +        "0.12 +units=m +no_defs");
  3498   3498       add_srs_wkt (p, 0,
  3499   3499           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 117E\",");
  3500   3500       add_srs_wkt (p, 1,
  3501   3501           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3502   3502       add_srs_wkt (p, 2,
  3503   3503           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3504   3504       add_srs_wkt (p, 3,
  3505         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3505  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3506   3506       add_srs_wkt (p, 4,
  3507         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3507  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3508   3508       add_srs_wkt (p, 5,
  3509         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3509  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3510   3510       add_srs_wkt (p, 6,
  3511         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3511  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3512   3512       add_srs_wkt (p, 7,
  3513         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3513  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3514   3514       add_srs_wkt (p, 8,
  3515   3515           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3516   3516       add_srs_wkt (p, 9,
  3517   3517           "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
  3518   3518       add_srs_wkt (p, 10,
  3519   3519           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3520   3520       add_srs_wkt (p, 11,
................................................................................
  3527   3527           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 120E", 0, 1,
  3528   3528           "Krassowsky 1940", "Greenwich",
  3529   3529           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3530   3530           "X", "North", "Y", "East");
  3531   3531       add_proj4text (p, 0,
  3532   3532           "+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 ");
  3533   3533       add_proj4text (p, 1,
  3534         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3534  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3535   3535       add_proj4text (p, 2,
  3536         -        ".12 +units=m +no_defs");
         3536  +        "0.12 +units=m +no_defs");
  3537   3537       add_srs_wkt (p, 0,
  3538   3538           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 120E\",");
  3539   3539       add_srs_wkt (p, 1,
  3540   3540           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3541   3541       add_srs_wkt (p, 2,
  3542   3542           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3543   3543       add_srs_wkt (p, 3,
  3544         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3544  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3545   3545       add_srs_wkt (p, 4,
  3546         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3546  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3547   3547       add_srs_wkt (p, 5,
  3548         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3548  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3549   3549       add_srs_wkt (p, 6,
  3550         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3550  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3551   3551       add_srs_wkt (p, 7,
  3552         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3552  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3553   3553       add_srs_wkt (p, 8,
  3554   3554           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3555   3555       add_srs_wkt (p, 9,
  3556   3556           "ude_of_origin\",0],PARAMETER[\"central_meridian\",120],P");
  3557   3557       add_srs_wkt (p, 10,
  3558   3558           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3559   3559       add_srs_wkt (p, 11,
................................................................................
  3566   3566           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 123E", 0, 1,
  3567   3567           "Krassowsky 1940", "Greenwich",
  3568   3568           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3569   3569           "X", "North", "Y", "East");
  3570   3570       add_proj4text (p, 0,
  3571   3571           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
  3572   3572       add_proj4text (p, 1,
  3573         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3573  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3574   3574       add_proj4text (p, 2,
  3575         -        ".12 +units=m +no_defs");
         3575  +        "0.12 +units=m +no_defs");
  3576   3576       add_srs_wkt (p, 0,
  3577   3577           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 123E\",");
  3578   3578       add_srs_wkt (p, 1,
  3579   3579           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3580   3580       add_srs_wkt (p, 2,
  3581   3581           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3582   3582       add_srs_wkt (p, 3,
  3583         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3583  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3584   3584       add_srs_wkt (p, 4,
  3585         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3585  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3586   3586       add_srs_wkt (p, 5,
  3587         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3587  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3588   3588       add_srs_wkt (p, 6,
  3589         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3589  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3590   3590       add_srs_wkt (p, 7,
  3591         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3591  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3592   3592       add_srs_wkt (p, 8,
  3593   3593           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3594   3594       add_srs_wkt (p, 9,
  3595   3595           "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
  3596   3596       add_srs_wkt (p, 10,
  3597   3597           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3598   3598       add_srs_wkt (p, 11,
................................................................................
  3605   3605           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 126E", 0, 1,
  3606   3606           "Krassowsky 1940", "Greenwich",
  3607   3607           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3608   3608           "X", "North", "Y", "East");
  3609   3609       add_proj4text (p, 0,
  3610   3610           "+proj=tmerc +lat_0=0 +lon_0=126 +k=1 +x_0=500000 +y_0=0 ");
  3611   3611       add_proj4text (p, 1,
  3612         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3612  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3613   3613       add_proj4text (p, 2,
  3614         -        ".12 +units=m +no_defs");
         3614  +        "0.12 +units=m +no_defs");
  3615   3615       add_srs_wkt (p, 0,
  3616   3616           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 126E\",");
  3617   3617       add_srs_wkt (p, 1,
  3618   3618           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3619   3619       add_srs_wkt (p, 2,
  3620   3620           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3621   3621       add_srs_wkt (p, 3,
  3622         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3622  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3623   3623       add_srs_wkt (p, 4,
  3624         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3624  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3625   3625       add_srs_wkt (p, 5,
  3626         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3626  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3627   3627       add_srs_wkt (p, 6,
  3628         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3628  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3629   3629       add_srs_wkt (p, 7,
  3630         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3630  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3631   3631       add_srs_wkt (p, 8,
  3632   3632           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3633   3633       add_srs_wkt (p, 9,
  3634   3634           "ude_of_origin\",0],PARAMETER[\"central_meridian\",126],P");
  3635   3635       add_srs_wkt (p, 10,
  3636   3636           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3637   3637       add_srs_wkt (p, 11,
................................................................................
  3644   3644           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 129E", 0, 1,
  3645   3645           "Krassowsky 1940", "Greenwich",
  3646   3646           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3647   3647           "X", "North", "Y", "East");
  3648   3648       add_proj4text (p, 0,
  3649   3649           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
  3650   3650       add_proj4text (p, 1,
  3651         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3651  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3652   3652       add_proj4text (p, 2,
  3653         -        ".12 +units=m +no_defs");
         3653  +        "0.12 +units=m +no_defs");
  3654   3654       add_srs_wkt (p, 0,
  3655   3655           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 129E\",");
  3656   3656       add_srs_wkt (p, 1,
  3657   3657           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3658   3658       add_srs_wkt (p, 2,
  3659   3659           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3660   3660       add_srs_wkt (p, 3,
  3661         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3661  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3662   3662       add_srs_wkt (p, 4,
  3663         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3663  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3664   3664       add_srs_wkt (p, 5,
  3665         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3665  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3666   3666       add_srs_wkt (p, 6,
  3667         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3667  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3668   3668       add_srs_wkt (p, 7,
  3669         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3669  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3670   3670       add_srs_wkt (p, 8,
  3671   3671           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3672   3672       add_srs_wkt (p, 9,
  3673   3673           "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
  3674   3674       add_srs_wkt (p, 10,
  3675   3675           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3676   3676       add_srs_wkt (p, 11,
................................................................................
  3683   3683           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 132E", 0, 1,
  3684   3684           "Krassowsky 1940", "Greenwich",
  3685   3685           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3686   3686           "X", "North", "Y", "East");
  3687   3687       add_proj4text (p, 0,
  3688   3688           "+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=500000 +y_0=0 ");
  3689   3689       add_proj4text (p, 1,
  3690         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3690  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3691   3691       add_proj4text (p, 2,
  3692         -        ".12 +units=m +no_defs");
         3692  +        "0.12 +units=m +no_defs");
  3693   3693       add_srs_wkt (p, 0,
  3694   3694           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 132E\",");
  3695   3695       add_srs_wkt (p, 1,
  3696   3696           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3697   3697       add_srs_wkt (p, 2,
  3698   3698           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3699   3699       add_srs_wkt (p, 3,
  3700         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3700  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3701   3701       add_srs_wkt (p, 4,
  3702         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3702  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3703   3703       add_srs_wkt (p, 5,
  3704         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3704  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3705   3705       add_srs_wkt (p, 6,
  3706         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3706  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3707   3707       add_srs_wkt (p, 7,
  3708         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3708  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3709   3709       add_srs_wkt (p, 8,
  3710   3710           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3711   3711       add_srs_wkt (p, 9,
  3712   3712           "ude_of_origin\",0],PARAMETER[\"central_meridian\",132],P");
  3713   3713       add_srs_wkt (p, 10,
  3714   3714           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3715   3715       add_srs_wkt (p, 11,
................................................................................
  3722   3722           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 135E", 0, 1,
  3723   3723           "Krassowsky 1940", "Greenwich",
  3724   3724           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3725   3725           "X", "North", "Y", "East");
  3726   3726       add_proj4text (p, 0,
  3727   3727           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
  3728   3728       add_proj4text (p, 1,
  3729         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3729  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3730   3730       add_proj4text (p, 2,
  3731         -        ".12 +units=m +no_defs");
         3731  +        "0.12 +units=m +no_defs");
  3732   3732       add_srs_wkt (p, 0,
  3733   3733           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 135E\",");
  3734   3734       add_srs_wkt (p, 1,
  3735   3735           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3736   3736       add_srs_wkt (p, 2,
  3737   3737           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3738   3738       add_srs_wkt (p, 3,
  3739         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3739  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3740   3740       add_srs_wkt (p, 4,
  3741         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3741  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3742   3742       add_srs_wkt (p, 5,
  3743         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3743  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3744   3744       add_srs_wkt (p, 6,
  3745         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3745  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3746   3746       add_srs_wkt (p, 7,
  3747         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3747  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3748   3748       add_srs_wkt (p, 8,
  3749   3749           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3750   3750       add_srs_wkt (p, 9,
  3751   3751           "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
  3752   3752       add_srs_wkt (p, 10,
  3753   3753           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3754   3754       add_srs_wkt (p, 11,
................................................................................
  3761   3761           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 138E", 0, 1,
  3762   3762           "Krassowsky 1940", "Greenwich",
  3763   3763           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3764   3764           "X", "North", "Y", "East");
  3765   3765       add_proj4text (p, 0,
  3766   3766           "+proj=tmerc +lat_0=0 +lon_0=138 +k=1 +x_0=500000 +y_0=0 ");
  3767   3767       add_proj4text (p, 1,
  3768         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3768  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3769   3769       add_proj4text (p, 2,
  3770         -        ".12 +units=m +no_defs");
         3770  +        "0.12 +units=m +no_defs");
  3771   3771       add_srs_wkt (p, 0,
  3772   3772           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 138E\",");
  3773   3773       add_srs_wkt (p, 1,
  3774   3774           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3775   3775       add_srs_wkt (p, 2,
  3776   3776           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3777   3777       add_srs_wkt (p, 3,
  3778         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3778  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3779   3779       add_srs_wkt (p, 4,
  3780         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3780  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3781   3781       add_srs_wkt (p, 5,
  3782         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3782  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3783   3783       add_srs_wkt (p, 6,
  3784         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3784  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3785   3785       add_srs_wkt (p, 7,
  3786         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3786  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3787   3787       add_srs_wkt (p, 8,
  3788   3788           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3789   3789       add_srs_wkt (p, 9,
  3790   3790           "ude_of_origin\",0],PARAMETER[\"central_meridian\",138],P");
  3791   3791       add_srs_wkt (p, 10,
  3792   3792           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3793   3793       add_srs_wkt (p, 11,
................................................................................
  3800   3800           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 141E", 0, 1,
  3801   3801           "Krassowsky 1940", "Greenwich",
  3802   3802           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3803   3803           "X", "North", "Y", "East");
  3804   3804       add_proj4text (p, 0,
  3805   3805           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
  3806   3806       add_proj4text (p, 1,
  3807         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3807  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3808   3808       add_proj4text (p, 2,
  3809         -        ".12 +units=m +no_defs");
         3809  +        "0.12 +units=m +no_defs");
  3810   3810       add_srs_wkt (p, 0,
  3811   3811           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 141E\",");
  3812   3812       add_srs_wkt (p, 1,
  3813   3813           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3814   3814       add_srs_wkt (p, 2,
  3815   3815           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3816   3816       add_srs_wkt (p, 3,
  3817         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3817  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3818   3818       add_srs_wkt (p, 4,
  3819         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3819  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3820   3820       add_srs_wkt (p, 5,
  3821         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3821  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3822   3822       add_srs_wkt (p, 6,
  3823         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3823  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3824   3824       add_srs_wkt (p, 7,
  3825         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3825  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3826   3826       add_srs_wkt (p, 8,
  3827   3827           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3828   3828       add_srs_wkt (p, 9,
  3829   3829           "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
  3830   3830       add_srs_wkt (p, 10,
  3831   3831           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3832   3832       add_srs_wkt (p, 11,
................................................................................
  3839   3839           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 144E", 0, 1,
  3840   3840           "Krassowsky 1940", "Greenwich",
  3841   3841           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3842   3842           "X", "North", "Y", "East");
  3843   3843       add_proj4text (p, 0,
  3844   3844           "+proj=tmerc +lat_0=0 +lon_0=144 +k=1 +x_0=500000 +y_0=0 ");
  3845   3845       add_proj4text (p, 1,
  3846         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3846  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3847   3847       add_proj4text (p, 2,
  3848         -        ".12 +units=m +no_defs");
         3848  +        "0.12 +units=m +no_defs");
  3849   3849       add_srs_wkt (p, 0,
  3850   3850           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 144E\",");
  3851   3851       add_srs_wkt (p, 1,
  3852   3852           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3853   3853       add_srs_wkt (p, 2,
  3854   3854           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3855   3855       add_srs_wkt (p, 3,
  3856         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3856  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3857   3857       add_srs_wkt (p, 4,
  3858         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3858  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3859   3859       add_srs_wkt (p, 5,
  3860         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3860  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3861   3861       add_srs_wkt (p, 6,
  3862         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3862  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3863   3863       add_srs_wkt (p, 7,
  3864         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3864  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3865   3865       add_srs_wkt (p, 8,
  3866   3866           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3867   3867       add_srs_wkt (p, 9,
  3868   3868           "ude_of_origin\",0],PARAMETER[\"central_meridian\",144],P");
  3869   3869       add_srs_wkt (p, 10,
  3870   3870           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3871   3871       add_srs_wkt (p, 11,
................................................................................
  3878   3878           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 147E", 0, 1,
  3879   3879           "Krassowsky 1940", "Greenwich",
  3880   3880           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3881   3881           "X", "North", "Y", "East");
  3882   3882       add_proj4text (p, 0,
  3883   3883           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
  3884   3884       add_proj4text (p, 1,
  3885         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3885  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3886   3886       add_proj4text (p, 2,
  3887         -        ".12 +units=m +no_defs");
         3887  +        "0.12 +units=m +no_defs");
  3888   3888       add_srs_wkt (p, 0,
  3889   3889           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 147E\",");
  3890   3890       add_srs_wkt (p, 1,
  3891   3891           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3892   3892       add_srs_wkt (p, 2,
  3893   3893           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3894   3894       add_srs_wkt (p, 3,
  3895         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3895  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3896   3896       add_srs_wkt (p, 4,
  3897         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3897  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3898   3898       add_srs_wkt (p, 5,
  3899         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3899  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3900   3900       add_srs_wkt (p, 6,
  3901         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3901  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3902   3902       add_srs_wkt (p, 7,
  3903         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3903  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3904   3904       add_srs_wkt (p, 8,
  3905   3905           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3906   3906       add_srs_wkt (p, 9,
  3907   3907           "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
  3908   3908       add_srs_wkt (p, 10,
  3909   3909           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3910   3910       add_srs_wkt (p, 11,
................................................................................
  3917   3917           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 150E", 0, 1,
  3918   3918           "Krassowsky 1940", "Greenwich",
  3919   3919           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3920   3920           "X", "North", "Y", "East");
  3921   3921       add_proj4text (p, 0,
  3922   3922           "+proj=tmerc +lat_0=0 +lon_0=150 +k=1 +x_0=500000 +y_0=0 ");
  3923   3923       add_proj4text (p, 1,
  3924         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3924  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3925   3925       add_proj4text (p, 2,
  3926         -        ".12 +units=m +no_defs");
         3926  +        "0.12 +units=m +no_defs");
  3927   3927       add_srs_wkt (p, 0,
  3928   3928           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 150E\",");
  3929   3929       add_srs_wkt (p, 1,
  3930   3930           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3931   3931       add_srs_wkt (p, 2,
  3932   3932           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3933   3933       add_srs_wkt (p, 3,
  3934         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3934  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3935   3935       add_srs_wkt (p, 4,
  3936         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3936  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3937   3937       add_srs_wkt (p, 5,
  3938         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3938  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3939   3939       add_srs_wkt (p, 6,
  3940         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3940  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3941   3941       add_srs_wkt (p, 7,
  3942         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3942  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3943   3943       add_srs_wkt (p, 8,
  3944   3944           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3945   3945       add_srs_wkt (p, 9,
  3946   3946           "ude_of_origin\",0],PARAMETER[\"central_meridian\",150],P");
  3947   3947       add_srs_wkt (p, 10,
  3948   3948           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3949   3949       add_srs_wkt (p, 11,
................................................................................
  3956   3956           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 153E", 0, 1,
  3957   3957           "Krassowsky 1940", "Greenwich",
  3958   3958           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3959   3959           "X", "North", "Y", "East");
  3960   3960       add_proj4text (p, 0,
  3961   3961           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
  3962   3962       add_proj4text (p, 1,
  3963         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         3963  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  3964   3964       add_proj4text (p, 2,
  3965         -        ".12 +units=m +no_defs");
         3965  +        "0.12 +units=m +no_defs");
  3966   3966       add_srs_wkt (p, 0,
  3967   3967           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 153E\",");
  3968   3968       add_srs_wkt (p, 1,
  3969   3969           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3970   3970       add_srs_wkt (p, 2,
  3971   3971           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3972   3972       add_srs_wkt (p, 3,
  3973         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3973  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3974   3974       add_srs_wkt (p, 4,
  3975         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3975  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3976   3976       add_srs_wkt (p, 5,
  3977         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3977  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3978   3978       add_srs_wkt (p, 6,
  3979         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3979  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3980   3980       add_srs_wkt (p, 7,
  3981         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3981  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3982   3982       add_srs_wkt (p, 8,
  3983   3983           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3984   3984       add_srs_wkt (p, 9,
  3985   3985           "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
  3986   3986       add_srs_wkt (p, 10,
  3987   3987           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3988   3988       add_srs_wkt (p, 11,

Changes to src/srsinit/epsg_inlined_06.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 156E", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Pulkovo_1942", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=156 +k=1 +x_0=500000 +y_0=0 ");
    64     64       add_proj4text (p, 1,
    65         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
           65  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
    66     66       add_proj4text (p, 2,
    67         -        ".12 +units=m +no_defs");
           67  +        "0.12 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 156E\",");
    70     70       add_srs_wkt (p, 1,
    71     71           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
    72     72       add_srs_wkt (p, 2,
    73     73           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
    74     74       add_srs_wkt (p, 3,
    75         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
           75  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
    76     76       add_srs_wkt (p, 4,
    77         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
           77  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
    78     78       add_srs_wkt (p, 5,
    79         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
           79  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
    80     80       add_srs_wkt (p, 6,
    81         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
           81  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
    82     82       add_srs_wkt (p, 7,
    83         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
           83  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
    84     84       add_srs_wkt (p, 8,
    85     85           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
    86     86       add_srs_wkt (p, 9,
    87     87           "ude_of_origin\",0],PARAMETER[\"central_meridian\",156],P");
    88     88       add_srs_wkt (p, 10,
    89     89           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
    90     90       add_srs_wkt (p, 11,
................................................................................
    97     97           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 159E", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Pulkovo_1942", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
   103    103       add_proj4text (p, 1,
   104         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          104  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   105    105       add_proj4text (p, 2,
   106         -        ".12 +units=m +no_defs");
          106  +        "0.12 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 159E\",");
   109    109       add_srs_wkt (p, 1,
   110    110           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   111    111       add_srs_wkt (p, 2,
   112    112           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   113    113       add_srs_wkt (p, 3,
   114         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          114  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   115    115       add_srs_wkt (p, 4,
   116         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          116  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   117    117       add_srs_wkt (p, 5,
   118         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          118  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   119    119       add_srs_wkt (p, 6,
   120         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          120  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   121    121       add_srs_wkt (p, 7,
   122         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          122  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   123    123       add_srs_wkt (p, 8,
   124    124           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   125    125       add_srs_wkt (p, 9,
   126    126           "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
   127    127       add_srs_wkt (p, 10,
   128    128           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   129    129       add_srs_wkt (p, 11,
................................................................................
   136    136           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 162E", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Pulkovo_1942", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=162 +k=1 +x_0=500000 +y_0=0 ");
   142    142       add_proj4text (p, 1,
   143         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          143  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   144    144       add_proj4text (p, 2,
   145         -        ".12 +units=m +no_defs");
          145  +        "0.12 +units=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 162E\",");
   148    148       add_srs_wkt (p, 1,
   149    149           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   150    150       add_srs_wkt (p, 2,
   151    151           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   152    152       add_srs_wkt (p, 3,
   153         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          153  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   154    154       add_srs_wkt (p, 4,
   155         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          155  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   156    156       add_srs_wkt (p, 5,
   157         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          157  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   158    158       add_srs_wkt (p, 6,
   159         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          159  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   160    160       add_srs_wkt (p, 7,
   161         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          161  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   162    162       add_srs_wkt (p, 8,
   163    163           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   164    164       add_srs_wkt (p, 9,
   165    165           "ude_of_origin\",0],PARAMETER[\"central_meridian\",162],P");
   166    166       add_srs_wkt (p, 10,
   167    167           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   168    168       add_srs_wkt (p, 11,
................................................................................
   175    175           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 165E", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Pulkovo_1942", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
   181    181       add_proj4text (p, 1,
   182         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          182  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   183    183       add_proj4text (p, 2,
   184         -        ".12 +units=m +no_defs");
          184  +        "0.12 +units=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 165E\",");
   187    187       add_srs_wkt (p, 1,
   188    188           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   189    189       add_srs_wkt (p, 2,
   190    190           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   191    191       add_srs_wkt (p, 3,
   192         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          192  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   193    193       add_srs_wkt (p, 4,
   194         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          194  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   195    195       add_srs_wkt (p, 5,
   196         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          196  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   197    197       add_srs_wkt (p, 6,
   198         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          198  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   199    199       add_srs_wkt (p, 7,
   200         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          200  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   201    201       add_srs_wkt (p, 8,
   202    202           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   203    203       add_srs_wkt (p, 9,
   204    204           "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
   205    205       add_srs_wkt (p, 10,
   206    206           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   207    207       add_srs_wkt (p, 11,
................................................................................
   214    214           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 168E", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Pulkovo_1942", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=168 +k=1 +x_0=500000 +y_0=0 ");
   220    220       add_proj4text (p, 1,
   221         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          221  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   222    222       add_proj4text (p, 2,
   223         -        ".12 +units=m +no_defs");
          223  +        "0.12 +units=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 168E\",");
   226    226       add_srs_wkt (p, 1,
   227    227           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   228    228       add_srs_wkt (p, 2,
   229    229           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   230    230       add_srs_wkt (p, 3,
   231         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          231  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   232    232       add_srs_wkt (p, 4,
   233         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          233  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   234    234       add_srs_wkt (p, 5,
   235         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          235  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   236    236       add_srs_wkt (p, 6,
   237         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          237  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   238    238       add_srs_wkt (p, 7,
   239         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          239  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   240    240       add_srs_wkt (p, 8,
   241    241           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   242    242       add_srs_wkt (p, 9,
   243    243           "ude_of_origin\",0],PARAMETER[\"central_meridian\",168],P");
   244    244       add_srs_wkt (p, 10,
   245    245           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   246    246       add_srs_wkt (p, 11,
................................................................................
   253    253           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 171E", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Pulkovo_1942", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
   259    259       add_proj4text (p, 1,
   260         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          260  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   261    261       add_proj4text (p, 2,
   262         -        ".12 +units=m +no_defs");
          262  +        "0.12 +units=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 171E\",");
   265    265       add_srs_wkt (p, 1,
   266    266           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   267    267       add_srs_wkt (p, 2,
   268    268           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   269    269       add_srs_wkt (p, 3,
   270         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          270  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   271    271       add_srs_wkt (p, 4,
   272         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          272  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   273    273       add_srs_wkt (p, 5,
   274         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          274  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   275    275       add_srs_wkt (p, 6,
   276         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          276  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   277    277       add_srs_wkt (p, 7,
   278         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          278  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   279    279       add_srs_wkt (p, 8,
   280    280           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   281    281       add_srs_wkt (p, 9,
   282    282           "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
   283    283       add_srs_wkt (p, 10,
   284    284           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   285    285       add_srs_wkt (p, 11,
................................................................................
   292    292           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 174E", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Pulkovo_1942", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=174 +k=1 +x_0=500000 +y_0=0 ");
   298    298       add_proj4text (p, 1,
   299         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          299  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   300    300       add_proj4text (p, 2,
   301         -        ".12 +units=m +no_defs");
          301  +        "0.12 +units=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 174E\",");
   304    304       add_srs_wkt (p, 1,
   305    305           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   306    306       add_srs_wkt (p, 2,
   307    307           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   308    308       add_srs_wkt (p, 3,
   309         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          309  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   310    310       add_srs_wkt (p, 4,
   311         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          311  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   312    312       add_srs_wkt (p, 5,
   313         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          313  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   314    314       add_srs_wkt (p, 6,
   315         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          315  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   316    316       add_srs_wkt (p, 7,
   317         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          317  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   318    318       add_srs_wkt (p, 8,
   319    319           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   320    320       add_srs_wkt (p, 9,
   321    321           "ude_of_origin\",0],PARAMETER[\"central_meridian\",174],P");
   322    322       add_srs_wkt (p, 10,
   323    323           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   324    324       add_srs_wkt (p, 11,
................................................................................
   331    331           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 177E", 0, 1,
   332    332           "Krassowsky 1940", "Greenwich",
   333    333           "Pulkovo_1942", "Transverse_Mercator", "metre",
   334    334           "X", "North", "Y", "East");
   335    335       add_proj4text (p, 0,
   336    336           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
   337    337       add_proj4text (p, 1,
   338         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          338  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   339    339       add_proj4text (p, 2,
   340         -        ".12 +units=m +no_defs");
          340  +        "0.12 +units=m +no_defs");
   341    341       add_srs_wkt (p, 0,
   342    342           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 177E\",");
   343    343       add_srs_wkt (p, 1,
   344    344           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   345    345       add_srs_wkt (p, 2,
   346    346           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   347    347       add_srs_wkt (p, 3,
   348         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          348  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   349    349       add_srs_wkt (p, 4,
   350         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          350  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   351    351       add_srs_wkt (p, 5,
   352         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          352  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   353    353       add_srs_wkt (p, 6,
   354         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          354  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   355    355       add_srs_wkt (p, 7,
   356         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          356  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   357    357       add_srs_wkt (p, 8,
   358    358           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   359    359       add_srs_wkt (p, 9,
   360    360           "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
   361    361       add_srs_wkt (p, 10,
   362    362           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   363    363       add_srs_wkt (p, 11,
................................................................................
   370    370           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 180E", 0, 1,
   371    371           "Krassowsky 1940", "Greenwich",
   372    372           "Pulkovo_1942", "Transverse_Mercator", "metre",
   373    373           "X", "North", "Y", "East");
   374    374       add_proj4text (p, 0,
   375    375           "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=500000 +y_0=0 ");
   376    376       add_proj4text (p, 1,
   377         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          377  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   378    378       add_proj4text (p, 2,
   379         -        ".12 +units=m +no_defs");
          379  +        "0.12 +units=m +no_defs");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 180E\",");
   382    382       add_srs_wkt (p, 1,
   383    383           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   384    384       add_srs_wkt (p, 2,
   385    385           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   386    386       add_srs_wkt (p, 3,
   387         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          387  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   388    388       add_srs_wkt (p, 4,
   389         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          389  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   390    390       add_srs_wkt (p, 5,
   391         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          391  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   392    392       add_srs_wkt (p, 6,
   393         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          393  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   394    394       add_srs_wkt (p, 7,
   395         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          395  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   396    396       add_srs_wkt (p, 8,
   397    397           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   398    398       add_srs_wkt (p, 9,
   399    399           "ude_of_origin\",0],PARAMETER[\"central_meridian\",180],P");
   400    400       add_srs_wkt (p, 10,
   401    401           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   402    402       add_srs_wkt (p, 11,
................................................................................
   409    409           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 177W", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Pulkovo_1942", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
   415    415       add_proj4text (p, 1,
   416         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          416  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   417    417       add_proj4text (p, 2,
   418         -        "0.12 +units=m +no_defs");
          418  +        "-0.12 +units=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 177W\",");
   421    421       add_srs_wkt (p, 1,
   422    422           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   423    423       add_srs_wkt (p, 2,
   424    424           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   425    425       add_srs_wkt (p, 3,
   426         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          426  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   427    427       add_srs_wkt (p, 4,
   428         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          428  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   429    429       add_srs_wkt (p, 5,
   430         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          430  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   431    431       add_srs_wkt (p, 6,
   432         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          432  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   433    433       add_srs_wkt (p, 7,
   434         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          434  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   435    435       add_srs_wkt (p, 8,
   436    436           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   437    437       add_srs_wkt (p, 9,
   438    438           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
   439    439       add_srs_wkt (p, 10,
   440    440           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   441    441       add_srs_wkt (p, 11,
................................................................................
   448    448           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 174W", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Pulkovo_1942", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=-174 +k=1 +x_0=500000 +y_0=0");
   454    454       add_proj4text (p, 1,
   455         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          455  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   456    456       add_proj4text (p, 2,
   457         -        "0.12 +units=m +no_defs");
          457  +        "-0.12 +units=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 174W\",");
   460    460       add_srs_wkt (p, 1,
   461    461           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   462    462       add_srs_wkt (p, 2,
   463    463           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   464    464       add_srs_wkt (p, 3,
   465         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          465  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   466    466       add_srs_wkt (p, 4,
   467         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          467  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   468    468       add_srs_wkt (p, 5,
   469         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          469  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   470    470       add_srs_wkt (p, 6,
   471         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          471  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   472    472       add_srs_wkt (p, 7,
   473         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          473  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   474    474       add_srs_wkt (p, 8,
   475    475           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   476    476       add_srs_wkt (p, 9,
   477    477           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-174],");
   478    478       add_srs_wkt (p, 10,
   479    479           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   480    480       add_srs_wkt (p, 11,
................................................................................
   487    487           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 171W", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Pulkovo_1942", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
   493    493       add_proj4text (p, 1,
   494         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          494  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   495    495       add_proj4text (p, 2,
   496         -        "0.12 +units=m +no_defs");
          496  +        "-0.12 +units=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 171W\",");
   499    499       add_srs_wkt (p, 1,
   500    500           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   501    501       add_srs_wkt (p, 2,
   502    502           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   503    503       add_srs_wkt (p, 3,
   504         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          504  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   505    505       add_srs_wkt (p, 4,
   506         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          506  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   507    507       add_srs_wkt (p, 5,
   508         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          508  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   509    509       add_srs_wkt (p, 6,
   510         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          510  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   511    511       add_srs_wkt (p, 7,
   512         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          512  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   513    513       add_srs_wkt (p, 8,
   514    514           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   515    515       add_srs_wkt (p, 9,
   516    516           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
   517    517       add_srs_wkt (p, 10,
   518    518           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   519    519       add_srs_wkt (p, 11,
................................................................................
   526    526           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 168W", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Pulkovo_1942", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=-168 +k=1 +x_0=500000 +y_0=0");
   532    532       add_proj4text (p, 1,
   533         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          533  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   534    534       add_proj4text (p, 2,
   535         -        "0.12 +units=m +no_defs");
          535  +        "-0.12 +units=m +no_defs");
   536    536       add_srs_wkt (p, 0,
   537    537           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 168W\",");
   538    538       add_srs_wkt (p, 1,
   539    539           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   540    540       add_srs_wkt (p, 2,
   541    541           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   542    542       add_srs_wkt (p, 3,
   543         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          543  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   544    544       add_srs_wkt (p, 4,
   545         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          545  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   546    546       add_srs_wkt (p, 5,
   547         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          547  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   548    548       add_srs_wkt (p, 6,
   549         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          549  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   550    550       add_srs_wkt (p, 7,
   551         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          551  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   552    552       add_srs_wkt (p, 8,
   553    553           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   554    554       add_srs_wkt (p, 9,
   555    555           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-168],");
   556    556       add_srs_wkt (p, 10,
   557    557           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   558    558       add_srs_wkt (p, 11,
................................................................................
   565    565           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 7", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Pulkovo_1995", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=7500000 +y_0=0 ");
   571    571       add_proj4text (p, 1,
   572         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          572  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   573    573       add_proj4text (p, 2,
   574         -        "2 +units=m +no_defs");
          574  +        ".22 +units=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 7\",G");
   577    577       add_srs_wkt (p, 1,
   578    578           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   579    579       add_srs_wkt (p, 2,
   580    580           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   581    581       add_srs_wkt (p, 3,
   582         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   583         -    add_srs_wkt (p, 4,
   584         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   585         -    add_srs_wkt (p, 5,
   586         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   587         -    add_srs_wkt (p, 6,
   588         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   589         -    add_srs_wkt (p, 7,
   590         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   591         -    add_srs_wkt (p, 8,
   592         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   593         -    add_srs_wkt (p, 9,
   594         -        "of_origin\",0],PARAMETER[\"central_meridian\",21],PARAME");
   595         -    add_srs_wkt (p, 10,
   596         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",7500");
   597         -    add_srs_wkt (p, 11,
   598         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
   599         -    add_srs_wkt (p, 12,
   600         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   601         -    add_srs_wkt (p, 13,
   602         -        ",EAST],AUTHORITY[\"EPSG\",\"2641\"]]");
          582  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          583  +    add_srs_wkt (p, 4,
          584  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          585  +    add_srs_wkt (p, 5,
          586  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          587  +    add_srs_wkt (p, 6,
          588  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          589  +    add_srs_wkt (p, 7,
          590  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          591  +    add_srs_wkt (p, 8,
          592  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          593  +    add_srs_wkt (p, 9,
          594  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
          595  +    add_srs_wkt (p, 10,
          596  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",75");
          597  +    add_srs_wkt (p, 11,
          598  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
          599  +    add_srs_wkt (p, 12,
          600  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
          601  +    add_srs_wkt (p, 13,
          602  +        "\",EAST],AUTHORITY[\"EPSG\",\"2641\"]]");
   603    603       p = add_epsg_def_ex (filter, first, last, 2642, "epsg", 2642,
   604    604           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 8", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Pulkovo_1995", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=8500000 +y_0=0 ");
   610    610       add_proj4text (p, 1,
   611         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          611  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   612    612       add_proj4text (p, 2,
   613         -        "2 +units=m +no_defs");
          613  +        ".22 +units=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 8\",G");
   616    616       add_srs_wkt (p, 1,
   617    617           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   618    618       add_srs_wkt (p, 2,
   619    619           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   620    620       add_srs_wkt (p, 3,
   621         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   622         -    add_srs_wkt (p, 4,
   623         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   624         -    add_srs_wkt (p, 5,
   625         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   626         -    add_srs_wkt (p, 6,
   627         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   628         -    add_srs_wkt (p, 7,
   629         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   630         -    add_srs_wkt (p, 8,
   631         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   632         -    add_srs_wkt (p, 9,
   633         -        "of_origin\",0],PARAMETER[\"central_meridian\",24],PARAME");
   634         -    add_srs_wkt (p, 10,
   635         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",8500");
   636         -    add_srs_wkt (p, 11,
   637         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
   638         -    add_srs_wkt (p, 12,
   639         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   640         -    add_srs_wkt (p, 13,
   641         -        ",EAST],AUTHORITY[\"EPSG\",\"2642\"]]");
          621  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          622  +    add_srs_wkt (p, 4,
          623  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          624  +    add_srs_wkt (p, 5,
          625  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          626  +    add_srs_wkt (p, 6,
          627  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          628  +    add_srs_wkt (p, 7,
          629  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          630  +    add_srs_wkt (p, 8,
          631  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          632  +    add_srs_wkt (p, 9,
          633  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",24],PARA");
          634  +    add_srs_wkt (p, 10,
          635  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",85");
          636  +    add_srs_wkt (p, 11,
          637  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
          638  +    add_srs_wkt (p, 12,
          639  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
          640  +    add_srs_wkt (p, 13,
          641  +        "\",EAST],AUTHORITY[\"EPSG\",\"2642\"]]");
   642    642       p = add_epsg_def_ex (filter, first, last, 2643, "epsg", 2643,
   643    643           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 9", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Pulkovo_1995", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=9500000 +y_0=0 ");
   649    649       add_proj4text (p, 1,
   650         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          650  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   651    651       add_proj4text (p, 2,
   652         -        "2 +units=m +no_defs");
          652  +        ".22 +units=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 9\",G");
   655    655       add_srs_wkt (p, 1,
   656    656           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   657    657       add_srs_wkt (p, 2,
   658    658           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   659    659       add_srs_wkt (p, 3,
   660         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   661         -    add_srs_wkt (p, 4,
   662         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   663         -    add_srs_wkt (p, 5,
   664         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   665         -    add_srs_wkt (p, 6,
   666         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   667         -    add_srs_wkt (p, 7,
   668         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   669         -    add_srs_wkt (p, 8,
   670         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   671         -    add_srs_wkt (p, 9,
   672         -        "of_origin\",0],PARAMETER[\"central_meridian\",27],PARAME");
   673         -    add_srs_wkt (p, 10,
   674         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",9500");
   675         -    add_srs_wkt (p, 11,
   676         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
   677         -    add_srs_wkt (p, 12,
   678         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   679         -    add_srs_wkt (p, 13,
   680         -        ",EAST],AUTHORITY[\"EPSG\",\"2643\"]]");
          660  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          661  +    add_srs_wkt (p, 4,
          662  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          663  +    add_srs_wkt (p, 5,
          664  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          665  +    add_srs_wkt (p, 6,
          666  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          667  +    add_srs_wkt (p, 7,
          668  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          669  +    add_srs_wkt (p, 8,
          670  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          671  +    add_srs_wkt (p, 9,
          672  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
          673  +    add_srs_wkt (p, 10,
          674  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",95");
          675  +    add_srs_wkt (p, 11,
          676  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
          677  +    add_srs_wkt (p, 12,
          678  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
          679  +    add_srs_wkt (p, 13,
          680  +        "\",EAST],AUTHORITY[\"EPSG\",\"2643\"]]");
   681    681       p = add_epsg_def_ex (filter, first, last, 2644, "epsg", 2644,
   682    682           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 10", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Pulkovo_1995", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=10500000 +y_0=0");
   688    688       add_proj4text (p, 1,
   689         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
          689  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
   690    690       add_proj4text (p, 2,
   691         -        "22 +units=m +no_defs");
          691  +        "0.22 +units=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 10\",");
   694    694       add_srs_wkt (p, 1,
   695    695           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   696    696       add_srs_wkt (p, 2,
   697    697           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   698    698       add_srs_wkt (p, 3,
   699         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
          699  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          700  +    add_srs_wkt (p, 4,
          701  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          702  +    add_srs_wkt (p, 5,
          703  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          704  +    add_srs_wkt (p, 6,
          705  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          706  +    add_srs_wkt (p, 7,
          707  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          708  +    add_srs_wkt (p, 8,
          709  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          710  +    add_srs_wkt (p, 9,
          711  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",30],PA");
          712  +    add_srs_wkt (p, 10,
          713  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          714  +    add_srs_wkt (p, 11,
          715  +        "10500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          716  +    add_srs_wkt (p, 12,
          717  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          718  +    add_srs_wkt (p, 13,
          719  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2644\"]]");
          720  +    p = add_epsg_def_ex (filter, first, last, 2645, "epsg", 2645,
          721  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 11", 0, 1,
          722  +        "Krassowsky 1940", "Greenwich",
          723  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          724  +        "X", "North", "Y", "East");
          725  +    add_proj4text (p, 0,
          726  +        "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=11500000 +y_0=0");
          727  +    add_proj4text (p, 1,
          728  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          729  +    add_proj4text (p, 2,
          730  +        "0.22 +units=m +no_defs");
          731  +    add_srs_wkt (p, 0,
          732  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 11\",");
          733  +    add_srs_wkt (p, 1,
          734  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          735  +    add_srs_wkt (p, 2,
          736  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          737  +    add_srs_wkt (p, 3,
          738  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          739  +    add_srs_wkt (p, 4,
          740  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          741  +    add_srs_wkt (p, 5,
          742  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          743  +    add_srs_wkt (p, 6,
          744  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          745  +    add_srs_wkt (p, 7,
          746  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          747  +    add_srs_wkt (p, 8,
          748  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          749  +    add_srs_wkt (p, 9,
          750  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",33],PA");
          751  +    add_srs_wkt (p, 10,
          752  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          753  +    add_srs_wkt (p, 11,
          754  +        "11500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          755  +    add_srs_wkt (p, 12,
          756  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          757  +    add_srs_wkt (p, 13,
          758  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2645\"]]");
          759  +    p = add_epsg_def_ex (filter, first, last, 2646, "epsg", 2646,
          760  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 12", 0, 1,
          761  +        "Krassowsky 1940", "Greenwich",
          762  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          763  +        "X", "North", "Y", "East");
          764  +    add_proj4text (p, 0,
          765  +        "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=12500000 +y_0=0");
          766  +    add_proj4text (p, 1,
          767  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          768  +    add_proj4text (p, 2,
          769  +        "0.22 +units=m +no_defs");
          770  +    add_srs_wkt (p, 0,
          771  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 12\",");
          772  +    add_srs_wkt (p, 1,
          773  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          774  +    add_srs_wkt (p, 2,
          775  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          776  +    add_srs_wkt (p, 3,
          777  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          778  +    add_srs_wkt (p, 4,
          779  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          780  +    add_srs_wkt (p, 5,
          781  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          782  +    add_srs_wkt (p, 6,
          783  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          784  +    add_srs_wkt (p, 7,
          785  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          786  +    add_srs_wkt (p, 8,
          787  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          788  +    add_srs_wkt (p, 9,
          789  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",36],PA");
          790  +    add_srs_wkt (p, 10,
          791  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          792  +    add_srs_wkt (p, 11,
          793  +        "12500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          794  +    add_srs_wkt (p, 12,
          795  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          796  +    add_srs_wkt (p, 13,
          797  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2646\"]]");
          798  +    p = add_epsg_def_ex (filter, first, last, 2647, "epsg", 2647,
          799  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 13", 0, 1,
          800  +        "Krassowsky 1940", "Greenwich",
          801  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          802  +        "X", "North", "Y", "East");
          803  +    add_proj4text (p, 0,
          804  +        "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=13500000 +y_0=0");
          805  +    add_proj4text (p, 1,
          806  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          807  +    add_proj4text (p, 2,
          808  +        "0.22 +units=m +no_defs");
          809  +    add_srs_wkt (p, 0,
          810  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 13\",");
          811  +    add_srs_wkt (p, 1,
          812  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          813  +    add_srs_wkt (p, 2,
          814  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          815  +    add_srs_wkt (p, 3,
          816  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          817  +    add_srs_wkt (p, 4,
          818  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          819  +    add_srs_wkt (p, 5,
          820  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          821  +    add_srs_wkt (p, 6,
          822  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          823  +    add_srs_wkt (p, 7,
          824  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          825  +    add_srs_wkt (p, 8,
          826  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          827  +    add_srs_wkt (p, 9,
          828  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",39],PA");
          829  +    add_srs_wkt (p, 10,
          830  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          831  +    add_srs_wkt (p, 11,
          832  +        "13500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          833  +    add_srs_wkt (p, 12,
          834  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          835  +    add_srs_wkt (p, 13,
          836  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2647\"]]");
          837  +    p = add_epsg_def_ex (filter, first, last, 2648, "epsg", 2648,
          838  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 14", 0, 1,
          839  +        "Krassowsky 1940", "Greenwich",
          840  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          841  +        "X", "North", "Y", "East");
          842  +    add_proj4text (p, 0,
          843  +        "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=14500000 +y_0=0");
          844  +    add_proj4text (p, 1,
          845  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          846  +    add_proj4text (p, 2,
          847  +        "0.22 +units=m +no_defs");
          848  +    add_srs_wkt (p, 0,
          849  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 14\",");
          850  +    add_srs_wkt (p, 1,
          851  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          852  +    add_srs_wkt (p, 2,
          853  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          854  +    add_srs_wkt (p, 3,
          855  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          856  +    add_srs_wkt (p, 4,
          857  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          858  +    add_srs_wkt (p, 5,
          859  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          860  +    add_srs_wkt (p, 6,
          861  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          862  +    add_srs_wkt (p, 7,
          863  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          864  +    add_srs_wkt (p, 8,
          865  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          866  +    add_srs_wkt (p, 9,
          867  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",42],PA");
          868  +    add_srs_wkt (p, 10,
          869  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          870  +    add_srs_wkt (p, 11,
          871  +        "14500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          872  +    add_srs_wkt (p, 12,
          873  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          874  +    add_srs_wkt (p, 13,
          875  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2648\"]]");
          876  +    p = add_epsg_def_ex (filter, first, last, 2649, "epsg", 2649,
          877  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 15", 0, 1,
          878  +        "Krassowsky 1940", "Greenwich",
          879  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          880  +        "X", "North", "Y", "East");
          881  +    add_proj4text (p, 0,
          882  +        "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=15500000 +y_0=0");
          883  +    add_proj4text (p, 1,
          884  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          885  +    add_proj4text (p, 2,
          886  +        "0.22 +units=m +no_defs");
          887  +    add_srs_wkt (p, 0,
          888  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 15\",");
          889  +    add_srs_wkt (p, 1,
          890  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          891  +    add_srs_wkt (p, 2,
          892  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          893  +    add_srs_wkt (p, 3,
          894  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          895  +    add_srs_wkt (p, 4,
          896  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          897  +    add_srs_wkt (p, 5,
          898  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          899  +    add_srs_wkt (p, 6,
          900  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          901  +    add_srs_wkt (p, 7,
          902  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          903  +    add_srs_wkt (p, 8,
          904  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          905  +    add_srs_wkt (p, 9,
          906  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",45],PA");
          907  +    add_srs_wkt (p, 10,
          908  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          909  +    add_srs_wkt (p, 11,
          910  +        "15500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          911  +    add_srs_wkt (p, 12,
          912  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          913  +    add_srs_wkt (p, 13,
          914  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2649\"]]");
          915  +    p = add_epsg_def_ex (filter, first, last, 2650, "epsg", 2650,
          916  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 16", 0, 1,
          917  +        "Krassowsky 1940", "Greenwich",
          918  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          919  +        "X", "North", "Y", "East");
          920  +    add_proj4text (p, 0,
          921  +        "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=16500000 +y_0=0");
          922  +    add_proj4text (p, 1,
          923  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          924  +    add_proj4text (p, 2,
          925  +        "0.22 +units=m +no_defs");
          926  +    add_srs_wkt (p, 0,
          927  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 16\",");
          928  +    add_srs_wkt (p, 1,
          929  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          930  +    add_srs_wkt (p, 2,
          931  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          932  +    add_srs_wkt (p, 3,
          933  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          934  +    add_srs_wkt (p, 4,
          935  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          936  +    add_srs_wkt (p, 5,
          937  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          938  +    add_srs_wkt (p, 6,
          939  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          940  +    add_srs_wkt (p, 7,
          941  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          942  +    add_srs_wkt (p, 8,
          943  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          944  +    add_srs_wkt (p, 9,
          945  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",48],PA");
          946  +    add_srs_wkt (p, 10,
          947  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          948  +    add_srs_wkt (p, 11,
          949  +        "16500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          950  +    add_srs_wkt (p, 12,
          951  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          952  +    add_srs_wkt (p, 13,
          953  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2650\"]]");
          954  +    p = add_epsg_def_ex (filter, first, last, 2651, "epsg", 2651,
          955  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 17", 0, 1,
          956  +        "Krassowsky 1940", "Greenwich",
          957  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          958  +        "X", "North", "Y", "East");
          959  +    add_proj4text (p, 0,
          960  +        "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=17500000 +y_0=0");
          961  +    add_proj4text (p, 1,
          962  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
          963  +    add_proj4text (p, 2,
          964  +        "0.22 +units=m +no_defs");
          965  +    add_srs_wkt (p, 0,
          966  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 17\",");
          967  +    add_srs_wkt (p, 1,
          968  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          969  +    add_srs_wkt (p, 2,
          970  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          971  +    add_srs_wkt (p, 3,
          972  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          973  +    add_srs_wkt (p, 4,
          974  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          975  +    add_srs_wkt (p, 5,
          976  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          977  +    add_srs_wkt (p, 6,
          978  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          979  +    add_srs_wkt (p, 7,
          980  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          981  +    add_srs_wkt (p, 8,
          982  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          983  +    add_srs_wkt (p, 9,
          984  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",51],PA");
          985  +    add_srs_wkt (p, 10,
          986  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          987  +    add_srs_wkt (p, 11,
          988  +        "17500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
          989  +    add_srs_wkt (p, 12,
          990  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
          991  +    add_srs_wkt (p, 13,
          992  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2651\"]]");
          993  +    p = add_epsg_def_ex (filter, first, last, 2652, "epsg", 2652,
          994  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 18", 0, 1,
          995  +        "Krassowsky 1940", "Greenwich",
          996  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          997  +        "X", "North", "Y", "East");
          998  +    add_proj4text (p, 0,
          999  +        "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=18500000 +y_0=0");
         1000  +    add_proj4text (p, 1,
         1001  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1002  +    add_proj4text (p, 2,
         1003  +        "0.22 +units=m +no_defs");
         1004  +    add_srs_wkt (p, 0,
         1005  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 18\",");
         1006  +    add_srs_wkt (p, 1,
         1007  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1008  +    add_srs_wkt (p, 2,
         1009  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1010  +    add_srs_wkt (p, 3,
         1011  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1012  +    add_srs_wkt (p, 4,
         1013  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1014  +    add_srs_wkt (p, 5,
         1015  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1016  +    add_srs_wkt (p, 6,
         1017  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1018  +    add_srs_wkt (p, 7,
         1019  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1020  +    add_srs_wkt (p, 8,
         1021  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1022  +    add_srs_wkt (p, 9,
         1023  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",54],PA");
         1024  +    add_srs_wkt (p, 10,
         1025  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1026  +    add_srs_wkt (p, 11,
         1027  +        "18500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1028  +    add_srs_wkt (p, 12,
         1029  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1030  +    add_srs_wkt (p, 13,
         1031  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2652\"]]");
         1032  +    p = add_epsg_def_ex (filter, first, last, 2653, "epsg", 2653,
         1033  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 19", 0, 1,
         1034  +        "Krassowsky 1940", "Greenwich",
         1035  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1036  +        "X", "North", "Y", "East");
         1037  +    add_proj4text (p, 0,
         1038  +        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=19500000 +y_0=0");
         1039  +    add_proj4text (p, 1,
         1040  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1041  +    add_proj4text (p, 2,
         1042  +        "0.22 +units=m +no_defs");
         1043  +    add_srs_wkt (p, 0,
         1044  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 19\",");
         1045  +    add_srs_wkt (p, 1,
         1046  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1047  +    add_srs_wkt (p, 2,
         1048  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1049  +    add_srs_wkt (p, 3,
         1050  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1051  +    add_srs_wkt (p, 4,
         1052  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1053  +    add_srs_wkt (p, 5,
         1054  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1055  +    add_srs_wkt (p, 6,
         1056  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1057  +    add_srs_wkt (p, 7,
         1058  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1059  +    add_srs_wkt (p, 8,
         1060  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1061  +    add_srs_wkt (p, 9,
         1062  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",57],PA");
         1063  +    add_srs_wkt (p, 10,
         1064  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1065  +    add_srs_wkt (p, 11,
         1066  +        "19500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1067  +    add_srs_wkt (p, 12,
         1068  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1069  +    add_srs_wkt (p, 13,
         1070  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2653\"]]");
         1071  +    p = add_epsg_def_ex (filter, first, last, 2654, "epsg", 2654,
         1072  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 20", 0, 1,
         1073  +        "Krassowsky 1940", "Greenwich",
         1074  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1075  +        "X", "North", "Y", "East");
         1076  +    add_proj4text (p, 0,
         1077  +        "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=20500000 +y_0=0");
         1078  +    add_proj4text (p, 1,
         1079  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1080  +    add_proj4text (p, 2,
         1081  +        "0.22 +units=m +no_defs");
         1082  +    add_srs_wkt (p, 0,
         1083  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 20\",");
         1084  +    add_srs_wkt (p, 1,
         1085  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1086  +    add_srs_wkt (p, 2,
         1087  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1088  +    add_srs_wkt (p, 3,
         1089  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1090  +    add_srs_wkt (p, 4,
         1091  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1092  +    add_srs_wkt (p, 5,
         1093  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1094  +    add_srs_wkt (p, 6,
         1095  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1096  +    add_srs_wkt (p, 7,
         1097  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1098  +    add_srs_wkt (p, 8,
         1099  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1100  +    add_srs_wkt (p, 9,
         1101  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",60],PA");
         1102  +    add_srs_wkt (p, 10,
         1103  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1104  +    add_srs_wkt (p, 11,
         1105  +        "20500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1106  +    add_srs_wkt (p, 12,
         1107  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1108  +    add_srs_wkt (p, 13,
         1109  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2654\"]]");
         1110  +    p = add_epsg_def_ex (filter, first, last, 2655, "epsg", 2655,
         1111  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 21", 0, 1,
         1112  +        "Krassowsky 1940", "Greenwich",
         1113  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1114  +        "X", "North", "Y", "East");
         1115  +    add_proj4text (p, 0,
         1116  +        "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=21500000 +y_0=0");
         1117  +    add_proj4text (p, 1,
         1118  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1119  +    add_proj4text (p, 2,
         1120  +        "0.22 +units=m +no_defs");
         1121  +    add_srs_wkt (p, 0,
         1122  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 21\",");
         1123  +    add_srs_wkt (p, 1,
         1124  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1125  +    add_srs_wkt (p, 2,
         1126  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1127  +    add_srs_wkt (p, 3,
         1128  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1129  +    add_srs_wkt (p, 4,
         1130  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1131  +    add_srs_wkt (p, 5,
         1132  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1133  +    add_srs_wkt (p, 6,
         1134  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1135  +    add_srs_wkt (p, 7,
         1136  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1137  +    add_srs_wkt (p, 8,
         1138  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1139  +    add_srs_wkt (p, 9,
         1140  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",63],PA");
         1141  +    add_srs_wkt (p, 10,
         1142  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1143  +    add_srs_wkt (p, 11,
         1144  +        "21500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1145  +    add_srs_wkt (p, 12,
         1146  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1147  +    add_srs_wkt (p, 13,
         1148  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2655\"]]");
         1149  +    p = add_epsg_def_ex (filter, first, last, 2656, "epsg", 2656,
         1150  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 22", 0, 1,
         1151  +        "Krassowsky 1940", "Greenwich",
         1152  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1153  +        "X", "North", "Y", "East");
         1154  +    add_proj4text (p, 0,
         1155  +        "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=22500000 +y_0=0");
         1156  +    add_proj4text (p, 1,
         1157  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1158  +    add_proj4text (p, 2,
         1159  +        "0.22 +units=m +no_defs");
         1160  +    add_srs_wkt (p, 0,
         1161  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 22\",");
         1162  +    add_srs_wkt (p, 1,
         1163  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1164  +    add_srs_wkt (p, 2,
         1165  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1166  +    add_srs_wkt (p, 3,
         1167  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1168  +    add_srs_wkt (p, 4,
         1169  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1170  +    add_srs_wkt (p, 5,
         1171  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1172  +    add_srs_wkt (p, 6,
         1173  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1174  +    add_srs_wkt (p, 7,
         1175  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1176  +    add_srs_wkt (p, 8,
         1177  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1178  +    add_srs_wkt (p, 9,
         1179  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",66],PA");
         1180  +    add_srs_wkt (p, 10,
         1181  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1182  +    add_srs_wkt (p, 11,
         1183  +        "22500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1184  +    add_srs_wkt (p, 12,
         1185  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1186  +    add_srs_wkt (p, 13,
         1187  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2656\"]]");
         1188  +    p = add_epsg_def_ex (filter, first, last, 2657, "epsg", 2657,
         1189  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 23", 0, 1,
         1190  +        "Krassowsky 1940", "Greenwich",
         1191  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1192  +        "X", "North", "Y", "East");
         1193  +    add_proj4text (p, 0,
         1194  +        "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=23500000 +y_0=0");
         1195  +    add_proj4text (p, 1,
         1196  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1197  +    add_proj4text (p, 2,
         1198  +        "0.22 +units=m +no_defs");
         1199  +    add_srs_wkt (p, 0,
         1200  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 23\",");
         1201  +    add_srs_wkt (p, 1,
         1202  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1203  +    add_srs_wkt (p, 2,
         1204  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1205  +    add_srs_wkt (p, 3,
         1206  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1207  +    add_srs_wkt (p, 4,
         1208  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1209  +    add_srs_wkt (p, 5,
         1210  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1211  +    add_srs_wkt (p, 6,
         1212  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1213  +    add_srs_wkt (p, 7,
         1214  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1215  +    add_srs_wkt (p, 8,
         1216  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1217  +    add_srs_wkt (p, 9,
         1218  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",69],PA");
         1219  +    add_srs_wkt (p, 10,
         1220  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1221  +    add_srs_wkt (p, 11,
         1222  +        "23500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1223  +    add_srs_wkt (p, 12,
         1224  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1225  +    add_srs_wkt (p, 13,
         1226  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2657\"]]");
         1227  +    p = add_epsg_def_ex (filter, first, last, 2658, "epsg", 2658,
         1228  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 24", 0, 1,
         1229  +        "Krassowsky 1940", "Greenwich",
         1230  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1231  +        "X", "North", "Y", "East");
         1232  +    add_proj4text (p, 0,
         1233  +        "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=24500000 +y_0=0");
         1234  +    add_proj4text (p, 1,
         1235  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1236  +    add_proj4text (p, 2,
         1237  +        "0.22 +units=m +no_defs");
         1238  +    add_srs_wkt (p, 0,
         1239  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 24\",");
         1240  +    add_srs_wkt (p, 1,
         1241  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1242  +    add_srs_wkt (p, 2,
         1243  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1244  +    add_srs_wkt (p, 3,
         1245  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1246  +    add_srs_wkt (p, 4,
         1247  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1248  +    add_srs_wkt (p, 5,
         1249  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1250  +    add_srs_wkt (p, 6,
         1251  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1252  +    add_srs_wkt (p, 7,
         1253  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1254  +    add_srs_wkt (p, 8,
         1255  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1256  +    add_srs_wkt (p, 9,
         1257  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",72],PA");
         1258  +    add_srs_wkt (p, 10,
         1259  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1260  +    add_srs_wkt (p, 11,
         1261  +        "24500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1262  +    add_srs_wkt (p, 12,
         1263  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1264  +    add_srs_wkt (p, 13,
         1265  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2658\"]]");
         1266  +    p = add_epsg_def_ex (filter, first, last, 2659, "epsg", 2659,
         1267  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 25", 0, 1,
         1268  +        "Krassowsky 1940", "Greenwich",
         1269  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1270  +        "X", "North", "Y", "East");
         1271  +    add_proj4text (p, 0,
         1272  +        "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=25500000 +y_0=0");
         1273  +    add_proj4text (p, 1,
         1274  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1275  +    add_proj4text (p, 2,
         1276  +        "0.22 +units=m +no_defs");
         1277  +    add_srs_wkt (p, 0,
         1278  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 25\",");
         1279  +    add_srs_wkt (p, 1,
         1280  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1281  +    add_srs_wkt (p, 2,
         1282  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1283  +    add_srs_wkt (p, 3,
         1284  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1285  +    add_srs_wkt (p, 4,
         1286  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1287  +    add_srs_wkt (p, 5,
         1288  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1289  +    add_srs_wkt (p, 6,
         1290  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1291  +    add_srs_wkt (p, 7,
         1292  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1293  +    add_srs_wkt (p, 8,
         1294  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1295  +    add_srs_wkt (p, 9,
         1296  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",75],PA");
         1297  +    add_srs_wkt (p, 10,
         1298  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1299  +    add_srs_wkt (p, 11,
         1300  +        "25500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1301  +    add_srs_wkt (p, 12,
         1302  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1303  +    add_srs_wkt (p, 13,
         1304  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2659\"]]");
         1305  +    p = add_epsg_def_ex (filter, first, last, 2660, "epsg", 2660,
         1306  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 26", 0, 1,
         1307  +        "Krassowsky 1940", "Greenwich",
         1308  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1309  +        "X", "North", "Y", "East");
         1310  +    add_proj4text (p, 0,
         1311  +        "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=26500000 +y_0=0");
         1312  +    add_proj4text (p, 1,
         1313  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1314  +    add_proj4text (p, 2,
         1315  +        "0.22 +units=m +no_defs");
         1316  +    add_srs_wkt (p, 0,
         1317  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 26\",");
         1318  +    add_srs_wkt (p, 1,
         1319  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1320  +    add_srs_wkt (p, 2,
         1321  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1322  +    add_srs_wkt (p, 3,
         1323  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1324  +    add_srs_wkt (p, 4,
         1325  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1326  +    add_srs_wkt (p, 5,
         1327  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1328  +    add_srs_wkt (p, 6,
         1329  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1330  +    add_srs_wkt (p, 7,
         1331  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1332  +    add_srs_wkt (p, 8,
         1333  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1334  +    add_srs_wkt (p, 9,
         1335  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",78],PA");
         1336  +    add_srs_wkt (p, 10,
         1337  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1338  +    add_srs_wkt (p, 11,
         1339  +        "26500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1340  +    add_srs_wkt (p, 12,
         1341  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1342  +    add_srs_wkt (p, 13,
         1343  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2660\"]]");
         1344  +    p = add_epsg_def_ex (filter, first, last, 2661, "epsg", 2661,
         1345  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 27", 0, 1,
         1346  +        "Krassowsky 1940", "Greenwich",
         1347  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1348  +        "X", "North", "Y", "East");
         1349  +    add_proj4text (p, 0,
         1350  +        "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=27500000 +y_0=0");
         1351  +    add_proj4text (p, 1,
         1352  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1353  +    add_proj4text (p, 2,
         1354  +        "0.22 +units=m +no_defs");
         1355  +    add_srs_wkt (p, 0,
         1356  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 27\",");
         1357  +    add_srs_wkt (p, 1,
         1358  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1359  +    add_srs_wkt (p, 2,
         1360  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1361  +    add_srs_wkt (p, 3,
         1362  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1363  +    add_srs_wkt (p, 4,
         1364  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1365  +    add_srs_wkt (p, 5,
         1366  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1367  +    add_srs_wkt (p, 6,
         1368  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1369  +    add_srs_wkt (p, 7,
         1370  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1371  +    add_srs_wkt (p, 8,
         1372  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1373  +    add_srs_wkt (p, 9,
         1374  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",81],PA");
         1375  +    add_srs_wkt (p, 10,
         1376  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1377  +    add_srs_wkt (p, 11,
         1378  +        "27500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1379  +    add_srs_wkt (p, 12,
         1380  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1381  +    add_srs_wkt (p, 13,
         1382  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2661\"]]");
         1383  +    p = add_epsg_def_ex (filter, first, last, 2662, "epsg", 2662,
         1384  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 28", 0, 1,
         1385  +        "Krassowsky 1940", "Greenwich",
         1386  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1387  +        "X", "North", "Y", "East");
         1388  +    add_proj4text (p, 0,
         1389  +        "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=28500000 +y_0=0");
         1390  +    add_proj4text (p, 1,
         1391  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1392  +    add_proj4text (p, 2,
         1393  +        "0.22 +units=m +no_defs");
         1394  +    add_srs_wkt (p, 0,
         1395  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 28\",");
         1396  +    add_srs_wkt (p, 1,
         1397  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1398  +    add_srs_wkt (p, 2,
         1399  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1400  +    add_srs_wkt (p, 3,
         1401  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1402  +    add_srs_wkt (p, 4,
         1403  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1404  +    add_srs_wkt (p, 5,
         1405  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1406  +    add_srs_wkt (p, 6,
         1407  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1408  +    add_srs_wkt (p, 7,
         1409  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1410  +    add_srs_wkt (p, 8,
         1411  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1412  +    add_srs_wkt (p, 9,
         1413  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",84],PA");
         1414  +    add_srs_wkt (p, 10,
         1415  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1416  +    add_srs_wkt (p, 11,
         1417  +        "28500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1418  +    add_srs_wkt (p, 12,
         1419  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1420  +    add_srs_wkt (p, 13,
         1421  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2662\"]]");
         1422  +    p = add_epsg_def_ex (filter, first, last, 2663, "epsg", 2663,
         1423  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 29", 0, 1,
         1424  +        "Krassowsky 1940", "Greenwich",
         1425  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1426  +        "X", "North", "Y", "East");
         1427  +    add_proj4text (p, 0,
         1428  +        "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=29500000 +y_0=0");
         1429  +    add_proj4text (p, 1,
         1430  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1431  +    add_proj4text (p, 2,
         1432  +        "0.22 +units=m +no_defs");
         1433  +    add_srs_wkt (p, 0,
         1434  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 29\",");
         1435  +    add_srs_wkt (p, 1,
         1436  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1437  +    add_srs_wkt (p, 2,
         1438  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1439  +    add_srs_wkt (p, 3,
         1440  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1441  +    add_srs_wkt (p, 4,
         1442  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1443  +    add_srs_wkt (p, 5,
         1444  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1445  +    add_srs_wkt (p, 6,
         1446  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1447  +    add_srs_wkt (p, 7,
         1448  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1449  +    add_srs_wkt (p, 8,
         1450  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1451  +    add_srs_wkt (p, 9,
         1452  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",87],PA");
         1453  +    add_srs_wkt (p, 10,
         1454  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1455  +    add_srs_wkt (p, 11,
         1456  +        "29500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1457  +    add_srs_wkt (p, 12,
         1458  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1459  +    add_srs_wkt (p, 13,
         1460  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2663\"]]");
         1461  +    p = add_epsg_def_ex (filter, first, last, 2664, "epsg", 2664,
         1462  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 30", 0, 1,
         1463  +        "Krassowsky 1940", "Greenwich",
         1464  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1465  +        "X", "North", "Y", "East");
         1466  +    add_proj4text (p, 0,
         1467  +        "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=30500000 +y_0=0");
         1468  +    add_proj4text (p, 1,
         1469  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1470  +    add_proj4text (p, 2,
         1471  +        "0.22 +units=m +no_defs");
         1472  +    add_srs_wkt (p, 0,
         1473  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 30\",");
         1474  +    add_srs_wkt (p, 1,
         1475  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1476  +    add_srs_wkt (p, 2,
         1477  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1478  +    add_srs_wkt (p, 3,
         1479  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1480  +    add_srs_wkt (p, 4,
         1481  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1482  +    add_srs_wkt (p, 5,
         1483  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1484  +    add_srs_wkt (p, 6,
         1485  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1486  +    add_srs_wkt (p, 7,
         1487  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1488  +    add_srs_wkt (p, 8,
         1489  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1490  +    add_srs_wkt (p, 9,
         1491  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",90],PA");
         1492  +    add_srs_wkt (p, 10,
         1493  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1494  +    add_srs_wkt (p, 11,
         1495  +        "30500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1496  +    add_srs_wkt (p, 12,
         1497  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1498  +    add_srs_wkt (p, 13,
         1499  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2664\"]]");
         1500  +    p = add_epsg_def_ex (filter, first, last, 2665, "epsg", 2665,
         1501  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 31", 0, 1,
         1502  +        "Krassowsky 1940", "Greenwich",
         1503  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1504  +        "X", "North", "Y", "East");
         1505  +    add_proj4text (p, 0,
         1506  +        "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=31500000 +y_0=0");
         1507  +    add_proj4text (p, 1,
         1508  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1509  +    add_proj4text (p, 2,
         1510  +        "0.22 +units=m +no_defs");
         1511  +    add_srs_wkt (p, 0,
         1512  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 31\",");
         1513  +    add_srs_wkt (p, 1,
         1514  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1515  +    add_srs_wkt (p, 2,
         1516  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1517  +    add_srs_wkt (p, 3,
         1518  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1519  +    add_srs_wkt (p, 4,
         1520  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1521  +    add_srs_wkt (p, 5,
         1522  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1523  +    add_srs_wkt (p, 6,
         1524  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1525  +    add_srs_wkt (p, 7,
         1526  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1527  +    add_srs_wkt (p, 8,
         1528  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1529  +    add_srs_wkt (p, 9,
         1530  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",93],PA");
         1531  +    add_srs_wkt (p, 10,
         1532  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1533  +    add_srs_wkt (p, 11,
         1534  +        "31500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1535  +    add_srs_wkt (p, 12,
         1536  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1537  +    add_srs_wkt (p, 13,
         1538  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2665\"]]");
         1539  +    p = add_epsg_def_ex (filter, first, last, 2666, "epsg", 2666,
         1540  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 32", 0, 1,
         1541  +        "Krassowsky 1940", "Greenwich",
         1542  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1543  +        "X", "North", "Y", "East");
         1544  +    add_proj4text (p, 0,
         1545  +        "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=32500000 +y_0=0");
         1546  +    add_proj4text (p, 1,
         1547  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1548  +    add_proj4text (p, 2,
         1549  +        "0.22 +units=m +no_defs");
         1550  +    add_srs_wkt (p, 0,
         1551  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 32\",");
         1552  +    add_srs_wkt (p, 1,
         1553  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1554  +    add_srs_wkt (p, 2,
         1555  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1556  +    add_srs_wkt (p, 3,
         1557  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1558  +    add_srs_wkt (p, 4,
         1559  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1560  +    add_srs_wkt (p, 5,
         1561  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1562  +    add_srs_wkt (p, 6,
         1563  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1564  +    add_srs_wkt (p, 7,
         1565  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1566  +    add_srs_wkt (p, 8,
         1567  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1568  +    add_srs_wkt (p, 9,
         1569  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",96],PA");
         1570  +    add_srs_wkt (p, 10,
         1571  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1572  +    add_srs_wkt (p, 11,
         1573  +        "32500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1574  +    add_srs_wkt (p, 12,
         1575  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1576  +    add_srs_wkt (p, 13,
         1577  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2666\"]]");
         1578  +    p = add_epsg_def_ex (filter, first, last, 2667, "epsg", 2667,
         1579  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 33", 0, 1,
         1580  +        "Krassowsky 1940", "Greenwich",
         1581  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1582  +        "X", "North", "Y", "East");
         1583  +    add_proj4text (p, 0,
         1584  +        "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=33500000 +y_0=0");
         1585  +    add_proj4text (p, 1,
         1586  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         1587  +    add_proj4text (p, 2,
         1588  +        "0.22 +units=m +no_defs");
         1589  +    add_srs_wkt (p, 0,
         1590  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 33\",");
         1591  +    add_srs_wkt (p, 1,
         1592  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1593  +    add_srs_wkt (p, 2,
         1594  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1595  +    add_srs_wkt (p, 3,
         1596  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1597  +    add_srs_wkt (p, 4,
         1598  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1599  +    add_srs_wkt (p, 5,
         1600  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1601  +    add_srs_wkt (p, 6,
         1602  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1603  +    add_srs_wkt (p, 7,
         1604  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1605  +    add_srs_wkt (p, 8,
         1606  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1607  +    add_srs_wkt (p, 9,
         1608  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",99],PA");
         1609  +    add_srs_wkt (p, 10,
         1610  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1611  +    add_srs_wkt (p, 11,
         1612  +        "33500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1613  +    add_srs_wkt (p, 12,
         1614  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1615  +    add_srs_wkt (p, 13,
         1616  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2667\"]]");
         1617  +    p = add_epsg_def_ex (filter, first, last, 2668, "epsg", 2668,
         1618  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 34", 0, 1,
         1619  +        "Krassowsky 1940", "Greenwich",
         1620  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1621  +        "X", "North", "Y", "East");
         1622  +    add_proj4text (p, 0,
         1623  +        "+proj=tmerc +lat_0=0 +lon_0=102 +k=1 +x_0=34500000 +y_0=");
         1624  +    add_proj4text (p, 1,
         1625  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1626  +    add_proj4text (p, 2,
         1627  +        "-0.22 +units=m +no_defs");
         1628  +    add_srs_wkt (p, 0,
         1629  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 34\",");
         1630  +    add_srs_wkt (p, 1,
         1631  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1632  +    add_srs_wkt (p, 2,
         1633  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1634  +    add_srs_wkt (p, 3,
         1635  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1636  +    add_srs_wkt (p, 4,
         1637  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1638  +    add_srs_wkt (p, 5,
         1639  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1640  +    add_srs_wkt (p, 6,
         1641  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1642  +    add_srs_wkt (p, 7,
         1643  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1644  +    add_srs_wkt (p, 8,
         1645  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1646  +    add_srs_wkt (p, 9,
         1647  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",102],P");
         1648  +    add_srs_wkt (p, 10,
         1649  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1650  +    add_srs_wkt (p, 11,
         1651  +        ",34500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1652  +    add_srs_wkt (p, 12,
         1653  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1654  +    add_srs_wkt (p, 13,
         1655  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2668\"]]");
         1656  +    p = add_epsg_def_ex (filter, first, last, 2669, "epsg", 2669,
         1657  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 35", 0, 1,
         1658  +        "Krassowsky 1940", "Greenwich",
         1659  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1660  +        "X", "North", "Y", "East");
         1661  +    add_proj4text (p, 0,
         1662  +        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=35500000 +y_0=");
         1663  +    add_proj4text (p, 1,
         1664  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1665  +    add_proj4text (p, 2,
         1666  +        "-0.22 +units=m +no_defs");
         1667  +    add_srs_wkt (p, 0,
         1668  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 35\",");
         1669  +    add_srs_wkt (p, 1,
         1670  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1671  +    add_srs_wkt (p, 2,
         1672  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1673  +    add_srs_wkt (p, 3,
         1674  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1675  +    add_srs_wkt (p, 4,
         1676  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1677  +    add_srs_wkt (p, 5,
         1678  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1679  +    add_srs_wkt (p, 6,
         1680  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1681  +    add_srs_wkt (p, 7,
         1682  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1683  +    add_srs_wkt (p, 8,
         1684  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1685  +    add_srs_wkt (p, 9,
         1686  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
         1687  +    add_srs_wkt (p, 10,
         1688  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1689  +    add_srs_wkt (p, 11,
         1690  +        ",35500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1691  +    add_srs_wkt (p, 12,
         1692  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1693  +    add_srs_wkt (p, 13,
         1694  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2669\"]]");
         1695  +    p = add_epsg_def_ex (filter, first, last, 2670, "epsg", 2670,
         1696  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 36", 0, 1,
         1697  +        "Krassowsky 1940", "Greenwich",
         1698  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1699  +        "X", "North", "Y", "East");
         1700  +    add_proj4text (p, 0,
         1701  +        "+proj=tmerc +lat_0=0 +lon_0=108 +k=1 +x_0=36500000 +y_0=");
         1702  +    add_proj4text (p, 1,
         1703  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1704  +    add_proj4text (p, 2,
         1705  +        "-0.22 +units=m +no_defs");
         1706  +    add_srs_wkt (p, 0,
         1707  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 36\",");
         1708  +    add_srs_wkt (p, 1,
         1709  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1710  +    add_srs_wkt (p, 2,
         1711  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1712  +    add_srs_wkt (p, 3,
         1713  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1714  +    add_srs_wkt (p, 4,
         1715  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1716  +    add_srs_wkt (p, 5,
         1717  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1718  +    add_srs_wkt (p, 6,
         1719  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1720  +    add_srs_wkt (p, 7,
         1721  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1722  +    add_srs_wkt (p, 8,
         1723  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1724  +    add_srs_wkt (p, 9,
         1725  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",108],P");
         1726  +    add_srs_wkt (p, 10,
         1727  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1728  +    add_srs_wkt (p, 11,
         1729  +        ",36500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1730  +    add_srs_wkt (p, 12,
         1731  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1732  +    add_srs_wkt (p, 13,
         1733  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2670\"]]");
         1734  +    p = add_epsg_def_ex (filter, first, last, 2671, "epsg", 2671,
         1735  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 37", 0, 1,
         1736  +        "Krassowsky 1940", "Greenwich",
         1737  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1738  +        "X", "North", "Y", "East");
         1739  +    add_proj4text (p, 0,
         1740  +        "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=37500000 +y_0=");
         1741  +    add_proj4text (p, 1,
         1742  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1743  +    add_proj4text (p, 2,
         1744  +        "-0.22 +units=m +no_defs");
         1745  +    add_srs_wkt (p, 0,
         1746  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 37\",");
         1747  +    add_srs_wkt (p, 1,
         1748  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1749  +    add_srs_wkt (p, 2,
         1750  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1751  +    add_srs_wkt (p, 3,
         1752  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1753  +    add_srs_wkt (p, 4,
         1754  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1755  +    add_srs_wkt (p, 5,
         1756  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1757  +    add_srs_wkt (p, 6,
         1758  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1759  +    add_srs_wkt (p, 7,
         1760  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1761  +    add_srs_wkt (p, 8,
         1762  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1763  +    add_srs_wkt (p, 9,
         1764  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
         1765  +    add_srs_wkt (p, 10,
         1766  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1767  +    add_srs_wkt (p, 11,
         1768  +        ",37500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1769  +    add_srs_wkt (p, 12,
         1770  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1771  +    add_srs_wkt (p, 13,
         1772  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2671\"]]");
         1773  +    p = add_epsg_def_ex (filter, first, last, 2672, "epsg", 2672,
         1774  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 38", 0, 1,
         1775  +        "Krassowsky 1940", "Greenwich",
         1776  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1777  +        "X", "North", "Y", "East");
         1778  +    add_proj4text (p, 0,
         1779  +        "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=38500000 +y_0=");
         1780  +    add_proj4text (p, 1,
         1781  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1782  +    add_proj4text (p, 2,
         1783  +        "-0.22 +units=m +no_defs");
         1784  +    add_srs_wkt (p, 0,
         1785  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 38\",");
         1786  +    add_srs_wkt (p, 1,
         1787  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1788  +    add_srs_wkt (p, 2,
         1789  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1790  +    add_srs_wkt (p, 3,
         1791  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1792  +    add_srs_wkt (p, 4,
         1793  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1794  +    add_srs_wkt (p, 5,
         1795  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1796  +    add_srs_wkt (p, 6,
         1797  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1798  +    add_srs_wkt (p, 7,
         1799  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1800  +    add_srs_wkt (p, 8,
         1801  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1802  +    add_srs_wkt (p, 9,
         1803  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",114],P");
         1804  +    add_srs_wkt (p, 10,
         1805  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1806  +    add_srs_wkt (p, 11,
         1807  +        ",38500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1808  +    add_srs_wkt (p, 12,
         1809  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1810  +    add_srs_wkt (p, 13,
         1811  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2672\"]]");
         1812  +    p = add_epsg_def_ex (filter, first, last, 2673, "epsg", 2673,
         1813  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 39", 0, 1,
         1814  +        "Krassowsky 1940", "Greenwich",
         1815  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1816  +        "X", "North", "Y", "East");
         1817  +    add_proj4text (p, 0,
         1818  +        "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=39500000 +y_0=");
         1819  +    add_proj4text (p, 1,
         1820  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1821  +    add_proj4text (p, 2,
         1822  +        "-0.22 +units=m +no_defs");
         1823  +    add_srs_wkt (p, 0,
         1824  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 39\",");
         1825  +    add_srs_wkt (p, 1,
         1826  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1827  +    add_srs_wkt (p, 2,
         1828  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1829  +    add_srs_wkt (p, 3,
         1830  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1831  +    add_srs_wkt (p, 4,
         1832  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1833  +    add_srs_wkt (p, 5,
         1834  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1835  +    add_srs_wkt (p, 6,
         1836  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1837  +    add_srs_wkt (p, 7,
         1838  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1839  +    add_srs_wkt (p, 8,
         1840  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1841  +    add_srs_wkt (p, 9,
         1842  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
         1843  +    add_srs_wkt (p, 10,
         1844  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1845  +    add_srs_wkt (p, 11,
         1846  +        ",39500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1847  +    add_srs_wkt (p, 12,
         1848  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1849  +    add_srs_wkt (p, 13,
         1850  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2673\"]]");
         1851  +    p = add_epsg_def_ex (filter, first, last, 2674, "epsg", 2674,
         1852  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 40", 0, 1,
         1853  +        "Krassowsky 1940", "Greenwich",
         1854  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1855  +        "X", "North", "Y", "East");
         1856  +    add_proj4text (p, 0,
         1857  +        "+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=40500000 +y_0=");
         1858  +    add_proj4text (p, 1,
         1859  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1860  +    add_proj4text (p, 2,
         1861  +        "-0.22 +units=m +no_defs");
         1862  +    add_srs_wkt (p, 0,
         1863  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 40\",");
         1864  +    add_srs_wkt (p, 1,
         1865  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1866  +    add_srs_wkt (p, 2,
         1867  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1868  +    add_srs_wkt (p, 3,
         1869  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1870  +    add_srs_wkt (p, 4,
         1871  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1872  +    add_srs_wkt (p, 5,
         1873  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1874  +    add_srs_wkt (p, 6,
         1875  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1876  +    add_srs_wkt (p, 7,
         1877  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1878  +    add_srs_wkt (p, 8,
         1879  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1880  +    add_srs_wkt (p, 9,
         1881  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",120],P");
         1882  +    add_srs_wkt (p, 10,
         1883  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1884  +    add_srs_wkt (p, 11,
         1885  +        ",40500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1886  +    add_srs_wkt (p, 12,
         1887  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1888  +    add_srs_wkt (p, 13,
         1889  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2674\"]]");
         1890  +    p = add_epsg_def_ex (filter, first, last, 2675, "epsg", 2675,
         1891  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 41", 0, 1,
         1892  +        "Krassowsky 1940", "Greenwich",
         1893  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1894  +        "X", "North", "Y", "East");
         1895  +    add_proj4text (p, 0,
         1896  +        "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=41500000 +y_0=");
         1897  +    add_proj4text (p, 1,
         1898  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1899  +    add_proj4text (p, 2,
         1900  +        "-0.22 +units=m +no_defs");
         1901  +    add_srs_wkt (p, 0,
         1902  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 41\",");
         1903  +    add_srs_wkt (p, 1,
         1904  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1905  +    add_srs_wkt (p, 2,
         1906  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1907  +    add_srs_wkt (p, 3,
         1908  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1909  +    add_srs_wkt (p, 4,
         1910  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1911  +    add_srs_wkt (p, 5,
         1912  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1913  +    add_srs_wkt (p, 6,
         1914  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1915  +    add_srs_wkt (p, 7,
         1916  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1917  +    add_srs_wkt (p, 8,
         1918  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1919  +    add_srs_wkt (p, 9,
         1920  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
         1921  +    add_srs_wkt (p, 10,
         1922  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1923  +    add_srs_wkt (p, 11,
         1924  +        ",41500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1925  +    add_srs_wkt (p, 12,
         1926  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1927  +    add_srs_wkt (p, 13,
         1928  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2675\"]]");
         1929  +    p = add_epsg_def_ex (filter, first, last, 2676, "epsg", 2676,
         1930  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 42", 0, 1,
         1931  +        "Krassowsky 1940", "Greenwich",
         1932  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1933  +        "X", "North", "Y", "East");
         1934  +    add_proj4text (p, 0,
         1935  +        "+proj=tmerc +lat_0=0 +lon_0=126 +k=1 +x_0=42500000 +y_0=");
         1936  +    add_proj4text (p, 1,
         1937  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1938  +    add_proj4text (p, 2,
         1939  +        "-0.22 +units=m +no_defs");
         1940  +    add_srs_wkt (p, 0,
         1941  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 42\",");
         1942  +    add_srs_wkt (p, 1,
         1943  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1944  +    add_srs_wkt (p, 2,
         1945  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1946  +    add_srs_wkt (p, 3,
         1947  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1948  +    add_srs_wkt (p, 4,
         1949  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1950  +    add_srs_wkt (p, 5,
         1951  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1952  +    add_srs_wkt (p, 6,
         1953  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1954  +    add_srs_wkt (p, 7,
         1955  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1956  +    add_srs_wkt (p, 8,
         1957  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1958  +    add_srs_wkt (p, 9,
         1959  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",126],P");
         1960  +    add_srs_wkt (p, 10,
         1961  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1962  +    add_srs_wkt (p, 11,
         1963  +        ",42500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1964  +    add_srs_wkt (p, 12,
         1965  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1966  +    add_srs_wkt (p, 13,
         1967  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2676\"]]");
         1968  +    p = add_epsg_def_ex (filter, first, last, 2677, "epsg", 2677,
         1969  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 43", 0, 1,
         1970  +        "Krassowsky 1940", "Greenwich",
         1971  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         1972  +        "X", "North", "Y", "East");
         1973  +    add_proj4text (p, 0,
         1974  +        "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=43500000 +y_0=");
         1975  +    add_proj4text (p, 1,
         1976  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         1977  +    add_proj4text (p, 2,
         1978  +        "-0.22 +units=m +no_defs");
         1979  +    add_srs_wkt (p, 0,
         1980  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 43\",");
         1981  +    add_srs_wkt (p, 1,
         1982  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         1983  +    add_srs_wkt (p, 2,
         1984  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         1985  +    add_srs_wkt (p, 3,
         1986  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1987  +    add_srs_wkt (p, 4,
         1988  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1989  +    add_srs_wkt (p, 5,
         1990  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1991  +    add_srs_wkt (p, 6,
         1992  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1993  +    add_srs_wkt (p, 7,
         1994  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1995  +    add_srs_wkt (p, 8,
         1996  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1997  +    add_srs_wkt (p, 9,
         1998  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
         1999  +    add_srs_wkt (p, 10,
         2000  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2001  +    add_srs_wkt (p, 11,
         2002  +        ",43500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2003  +    add_srs_wkt (p, 12,
         2004  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2005  +    add_srs_wkt (p, 13,
         2006  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2677\"]]");
         2007  +    p = add_epsg_def_ex (filter, first, last, 2678, "epsg", 2678,
         2008  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 44", 0, 1,
         2009  +        "Krassowsky 1940", "Greenwich",
         2010  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2011  +        "X", "North", "Y", "East");
         2012  +    add_proj4text (p, 0,
         2013  +        "+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=44500000 +y_0=");
         2014  +    add_proj4text (p, 1,
         2015  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2016  +    add_proj4text (p, 2,
         2017  +        "-0.22 +units=m +no_defs");
         2018  +    add_srs_wkt (p, 0,
         2019  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 44\",");
         2020  +    add_srs_wkt (p, 1,
         2021  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2022  +    add_srs_wkt (p, 2,
         2023  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2024  +    add_srs_wkt (p, 3,
         2025  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2026  +    add_srs_wkt (p, 4,
         2027  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2028  +    add_srs_wkt (p, 5,
         2029  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2030  +    add_srs_wkt (p, 6,
         2031  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2032  +    add_srs_wkt (p, 7,
         2033  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2034  +    add_srs_wkt (p, 8,
         2035  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2036  +    add_srs_wkt (p, 9,
         2037  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",132],P");
         2038  +    add_srs_wkt (p, 10,
         2039  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2040  +    add_srs_wkt (p, 11,
         2041  +        ",44500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2042  +    add_srs_wkt (p, 12,
         2043  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2044  +    add_srs_wkt (p, 13,
         2045  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2678\"]]");
         2046  +    p = add_epsg_def_ex (filter, first, last, 2679, "epsg", 2679,
         2047  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 45", 0, 1,
         2048  +        "Krassowsky 1940", "Greenwich",
         2049  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2050  +        "X", "North", "Y", "East");
         2051  +    add_proj4text (p, 0,
         2052  +        "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=45500000 +y_0=");
         2053  +    add_proj4text (p, 1,
         2054  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2055  +    add_proj4text (p, 2,
         2056  +        "-0.22 +units=m +no_defs");
         2057  +    add_srs_wkt (p, 0,
         2058  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 45\",");
         2059  +    add_srs_wkt (p, 1,
         2060  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2061  +    add_srs_wkt (p, 2,
         2062  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2063  +    add_srs_wkt (p, 3,
         2064  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2065  +    add_srs_wkt (p, 4,
         2066  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2067  +    add_srs_wkt (p, 5,
         2068  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2069  +    add_srs_wkt (p, 6,
         2070  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2071  +    add_srs_wkt (p, 7,
         2072  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2073  +    add_srs_wkt (p, 8,
         2074  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2075  +    add_srs_wkt (p, 9,
         2076  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
         2077  +    add_srs_wkt (p, 10,
         2078  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2079  +    add_srs_wkt (p, 11,
         2080  +        ",45500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2081  +    add_srs_wkt (p, 12,
         2082  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2083  +    add_srs_wkt (p, 13,
         2084  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2679\"]]");
         2085  +    p = add_epsg_def_ex (filter, first, last, 2680, "epsg", 2680,
         2086  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 46", 0, 1,
         2087  +        "Krassowsky 1940", "Greenwich",
         2088  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2089  +        "X", "North", "Y", "East");
         2090  +    add_proj4text (p, 0,
         2091  +        "+proj=tmerc +lat_0=0 +lon_0=138 +k=1 +x_0=46500000 +y_0=");
         2092  +    add_proj4text (p, 1,
         2093  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2094  +    add_proj4text (p, 2,
         2095  +        "-0.22 +units=m +no_defs");
         2096  +    add_srs_wkt (p, 0,
         2097  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 46\",");
         2098  +    add_srs_wkt (p, 1,
         2099  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2100  +    add_srs_wkt (p, 2,
         2101  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2102  +    add_srs_wkt (p, 3,
         2103  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2104  +    add_srs_wkt (p, 4,
         2105  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2106  +    add_srs_wkt (p, 5,
         2107  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2108  +    add_srs_wkt (p, 6,
         2109  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2110  +    add_srs_wkt (p, 7,
         2111  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2112  +    add_srs_wkt (p, 8,
         2113  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2114  +    add_srs_wkt (p, 9,
         2115  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",138],P");
         2116  +    add_srs_wkt (p, 10,
         2117  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2118  +    add_srs_wkt (p, 11,
         2119  +        ",46500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2120  +    add_srs_wkt (p, 12,
         2121  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2122  +    add_srs_wkt (p, 13,
         2123  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2680\"]]");
         2124  +    p = add_epsg_def_ex (filter, first, last, 2681, "epsg", 2681,
         2125  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 47", 0, 1,
         2126  +        "Krassowsky 1940", "Greenwich",
         2127  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2128  +        "X", "North", "Y", "East");
         2129  +    add_proj4text (p, 0,
         2130  +        "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=47500000 +y_0=");
         2131  +    add_proj4text (p, 1,
         2132  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2133  +    add_proj4text (p, 2,
         2134  +        "-0.22 +units=m +no_defs");
         2135  +    add_srs_wkt (p, 0,
         2136  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 47\",");
         2137  +    add_srs_wkt (p, 1,
         2138  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2139  +    add_srs_wkt (p, 2,
         2140  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2141  +    add_srs_wkt (p, 3,
         2142  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2143  +    add_srs_wkt (p, 4,
         2144  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2145  +    add_srs_wkt (p, 5,
         2146  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2147  +    add_srs_wkt (p, 6,
         2148  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2149  +    add_srs_wkt (p, 7,
         2150  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2151  +    add_srs_wkt (p, 8,
         2152  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2153  +    add_srs_wkt (p, 9,
         2154  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
         2155  +    add_srs_wkt (p, 10,
         2156  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2157  +    add_srs_wkt (p, 11,
         2158  +        ",47500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2159  +    add_srs_wkt (p, 12,
         2160  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2161  +    add_srs_wkt (p, 13,
         2162  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2681\"]]");
         2163  +    p = add_epsg_def_ex (filter, first, last, 2682, "epsg", 2682,
         2164  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 48", 0, 1,
         2165  +        "Krassowsky 1940", "Greenwich",
         2166  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2167  +        "X", "North", "Y", "East");
         2168  +    add_proj4text (p, 0,
         2169  +        "+proj=tmerc +lat_0=0 +lon_0=144 +k=1 +x_0=48500000 +y_0=");
         2170  +    add_proj4text (p, 1,
         2171  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2172  +    add_proj4text (p, 2,
         2173  +        "-0.22 +units=m +no_defs");
         2174  +    add_srs_wkt (p, 0,
         2175  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 48\",");
         2176  +    add_srs_wkt (p, 1,
         2177  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2178  +    add_srs_wkt (p, 2,
         2179  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2180  +    add_srs_wkt (p, 3,
         2181  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2182  +    add_srs_wkt (p, 4,
         2183  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2184  +    add_srs_wkt (p, 5,
         2185  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2186  +    add_srs_wkt (p, 6,
         2187  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2188  +    add_srs_wkt (p, 7,
         2189  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2190  +    add_srs_wkt (p, 8,
         2191  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2192  +    add_srs_wkt (p, 9,
         2193  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",144],P");
         2194  +    add_srs_wkt (p, 10,
         2195  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2196  +    add_srs_wkt (p, 11,
         2197  +        ",48500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2198  +    add_srs_wkt (p, 12,
         2199  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2200  +    add_srs_wkt (p, 13,
         2201  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2682\"]]");
         2202  +    p = add_epsg_def_ex (filter, first, last, 2683, "epsg", 2683,
         2203  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 49", 0, 1,
         2204  +        "Krassowsky 1940", "Greenwich",
         2205  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2206  +        "X", "North", "Y", "East");
         2207  +    add_proj4text (p, 0,
         2208  +        "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=49500000 +y_0=");
         2209  +    add_proj4text (p, 1,
         2210  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2211  +    add_proj4text (p, 2,
         2212  +        "-0.22 +units=m +no_defs");
         2213  +    add_srs_wkt (p, 0,
         2214  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 49\",");
         2215  +    add_srs_wkt (p, 1,
         2216  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2217  +    add_srs_wkt (p, 2,
         2218  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2219  +    add_srs_wkt (p, 3,
         2220  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2221  +    add_srs_wkt (p, 4,
         2222  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2223  +    add_srs_wkt (p, 5,
         2224  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2225  +    add_srs_wkt (p, 6,
         2226  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2227  +    add_srs_wkt (p, 7,
         2228  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2229  +    add_srs_wkt (p, 8,
         2230  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2231  +    add_srs_wkt (p, 9,
         2232  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
         2233  +    add_srs_wkt (p, 10,
         2234  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2235  +    add_srs_wkt (p, 11,
         2236  +        ",49500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2237  +    add_srs_wkt (p, 12,
         2238  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2239  +    add_srs_wkt (p, 13,
         2240  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2683\"]]");
         2241  +    p = add_epsg_def_ex (filter, first, last, 2684, "epsg", 2684,
         2242  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 50", 0, 1,
         2243  +        "Krassowsky 1940", "Greenwich",
         2244  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2245  +        "X", "North", "Y", "East");
         2246  +    add_proj4text (p, 0,
         2247  +        "+proj=tmerc +lat_0=0 +lon_0=150 +k=1 +x_0=50500000 +y_0=");
         2248  +    add_proj4text (p, 1,
         2249  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2250  +    add_proj4text (p, 2,
         2251  +        "-0.22 +units=m +no_defs");
         2252  +    add_srs_wkt (p, 0,
         2253  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 50\",");
         2254  +    add_srs_wkt (p, 1,
         2255  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2256  +    add_srs_wkt (p, 2,
         2257  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2258  +    add_srs_wkt (p, 3,
         2259  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2260  +    add_srs_wkt (p, 4,
         2261  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2262  +    add_srs_wkt (p, 5,
         2263  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2264  +    add_srs_wkt (p, 6,
         2265  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2266  +    add_srs_wkt (p, 7,
         2267  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2268  +    add_srs_wkt (p, 8,
         2269  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2270  +    add_srs_wkt (p, 9,
         2271  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",150],P");
         2272  +    add_srs_wkt (p, 10,
         2273  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2274  +    add_srs_wkt (p, 11,
         2275  +        ",50500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2276  +    add_srs_wkt (p, 12,
         2277  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2278  +    add_srs_wkt (p, 13,
         2279  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2684\"]]");
         2280  +    p = add_epsg_def_ex (filter, first, last, 2685, "epsg", 2685,
         2281  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 51", 0, 1,
         2282  +        "Krassowsky 1940", "Greenwich",
         2283  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2284  +        "X", "North", "Y", "East");
         2285  +    add_proj4text (p, 0,
         2286  +        "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=51500000 +y_0=");
         2287  +    add_proj4text (p, 1,
         2288  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2289  +    add_proj4text (p, 2,
         2290  +        "-0.22 +units=m +no_defs");
         2291  +    add_srs_wkt (p, 0,
         2292  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 51\",");
         2293  +    add_srs_wkt (p, 1,
         2294  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2295  +    add_srs_wkt (p, 2,
         2296  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2297  +    add_srs_wkt (p, 3,
         2298  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2299  +    add_srs_wkt (p, 4,
         2300  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2301  +    add_srs_wkt (p, 5,
         2302  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2303  +    add_srs_wkt (p, 6,
         2304  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2305  +    add_srs_wkt (p, 7,
         2306  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2307  +    add_srs_wkt (p, 8,
         2308  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2309  +    add_srs_wkt (p, 9,
         2310  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
         2311  +    add_srs_wkt (p, 10,
         2312  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2313  +    add_srs_wkt (p, 11,
         2314  +        ",51500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2315  +    add_srs_wkt (p, 12,
         2316  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2317  +    add_srs_wkt (p, 13,
         2318  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2685\"]]");
         2319  +    p = add_epsg_def_ex (filter, first, last, 2686, "epsg", 2686,
         2320  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 52", 0, 1,
         2321  +        "Krassowsky 1940", "Greenwich",
         2322  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2323  +        "X", "North", "Y", "East");
         2324  +    add_proj4text (p, 0,
         2325  +        "+proj=tmerc +lat_0=0 +lon_0=156 +k=1 +x_0=52500000 +y_0=");
         2326  +    add_proj4text (p, 1,
         2327  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2328  +    add_proj4text (p, 2,
         2329  +        "-0.22 +units=m +no_defs");
         2330  +    add_srs_wkt (p, 0,
         2331  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 52\",");
         2332  +    add_srs_wkt (p, 1,
         2333  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2334  +    add_srs_wkt (p, 2,
         2335  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2336  +    add_srs_wkt (p, 3,
         2337  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2338  +    add_srs_wkt (p, 4,
         2339  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2340  +    add_srs_wkt (p, 5,
         2341  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2342  +    add_srs_wkt (p, 6,
         2343  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2344  +    add_srs_wkt (p, 7,
         2345  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2346  +    add_srs_wkt (p, 8,
         2347  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2348  +    add_srs_wkt (p, 9,
         2349  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",156],P");
         2350  +    add_srs_wkt (p, 10,
         2351  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2352  +    add_srs_wkt (p, 11,
         2353  +        ",52500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2354  +    add_srs_wkt (p, 12,
         2355  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2356  +    add_srs_wkt (p, 13,
         2357  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2686\"]]");
         2358  +    p = add_epsg_def_ex (filter, first, last, 2687, "epsg", 2687,
         2359  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 53", 0, 1,
         2360  +        "Krassowsky 1940", "Greenwich",
         2361  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2362  +        "X", "North", "Y", "East");
         2363  +    add_proj4text (p, 0,
         2364  +        "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=53500000 +y_0=");
         2365  +    add_proj4text (p, 1,
         2366  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2367  +    add_proj4text (p, 2,
         2368  +        "-0.22 +units=m +no_defs");
         2369  +    add_srs_wkt (p, 0,
         2370  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 53\",");
         2371  +    add_srs_wkt (p, 1,
         2372  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2373  +    add_srs_wkt (p, 2,
         2374  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2375  +    add_srs_wkt (p, 3,
         2376  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2377  +    add_srs_wkt (p, 4,
         2378  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2379  +    add_srs_wkt (p, 5,
         2380  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2381  +    add_srs_wkt (p, 6,
         2382  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2383  +    add_srs_wkt (p, 7,
         2384  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2385  +    add_srs_wkt (p, 8,
         2386  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2387  +    add_srs_wkt (p, 9,
         2388  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
         2389  +    add_srs_wkt (p, 10,
         2390  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2391  +    add_srs_wkt (p, 11,
         2392  +        ",53500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2393  +    add_srs_wkt (p, 12,
         2394  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2395  +    add_srs_wkt (p, 13,
         2396  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2687\"]]");
         2397  +    p = add_epsg_def_ex (filter, first, last, 2688, "epsg", 2688,
         2398  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 54", 0, 1,
         2399  +        "Krassowsky 1940", "Greenwich",
         2400  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2401  +        "X", "North", "Y", "East");
         2402  +    add_proj4text (p, 0,
         2403  +        "+proj=tmerc +lat_0=0 +lon_0=162 +k=1 +x_0=54500000 +y_0=");
         2404  +    add_proj4text (p, 1,
         2405  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2406  +    add_proj4text (p, 2,
         2407  +        "-0.22 +units=m +no_defs");
         2408  +    add_srs_wkt (p, 0,
         2409  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 54\",");
         2410  +    add_srs_wkt (p, 1,
         2411  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2412  +    add_srs_wkt (p, 2,
         2413  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2414  +    add_srs_wkt (p, 3,
         2415  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2416  +    add_srs_wkt (p, 4,
         2417  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2418  +    add_srs_wkt (p, 5,
         2419  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2420  +    add_srs_wkt (p, 6,
         2421  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2422  +    add_srs_wkt (p, 7,
         2423  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2424  +    add_srs_wkt (p, 8,
         2425  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2426  +    add_srs_wkt (p, 9,
         2427  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",162],P");
         2428  +    add_srs_wkt (p, 10,
         2429  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2430  +    add_srs_wkt (p, 11,
         2431  +        ",54500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2432  +    add_srs_wkt (p, 12,
         2433  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2434  +    add_srs_wkt (p, 13,
         2435  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2688\"]]");
         2436  +    p = add_epsg_def_ex (filter, first, last, 2689, "epsg", 2689,
         2437  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 55", 0, 1,
         2438  +        "Krassowsky 1940", "Greenwich",
         2439  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2440  +        "X", "North", "Y", "East");
         2441  +    add_proj4text (p, 0,
         2442  +        "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=55500000 +y_0=");
         2443  +    add_proj4text (p, 1,
         2444  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2445  +    add_proj4text (p, 2,
         2446  +        "-0.22 +units=m +no_defs");
         2447  +    add_srs_wkt (p, 0,
         2448  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 55\",");
         2449  +    add_srs_wkt (p, 1,
         2450  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2451  +    add_srs_wkt (p, 2,
         2452  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2453  +    add_srs_wkt (p, 3,
         2454  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2455  +    add_srs_wkt (p, 4,
         2456  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2457  +    add_srs_wkt (p, 5,
         2458  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2459  +    add_srs_wkt (p, 6,
         2460  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2461  +    add_srs_wkt (p, 7,
         2462  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2463  +    add_srs_wkt (p, 8,
         2464  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2465  +    add_srs_wkt (p, 9,
         2466  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
         2467  +    add_srs_wkt (p, 10,
         2468  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2469  +    add_srs_wkt (p, 11,
         2470  +        ",55500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2471  +    add_srs_wkt (p, 12,
         2472  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2473  +    add_srs_wkt (p, 13,
         2474  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2689\"]]");
         2475  +    p = add_epsg_def_ex (filter, first, last, 2690, "epsg", 2690,
         2476  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 56", 0, 1,
         2477  +        "Krassowsky 1940", "Greenwich",
         2478  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2479  +        "X", "North", "Y", "East");
         2480  +    add_proj4text (p, 0,
         2481  +        "+proj=tmerc +lat_0=0 +lon_0=168 +k=1 +x_0=56500000 +y_0=");
         2482  +    add_proj4text (p, 1,
         2483  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2484  +    add_proj4text (p, 2,
         2485  +        "-0.22 +units=m +no_defs");
         2486  +    add_srs_wkt (p, 0,
         2487  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 56\",");
         2488  +    add_srs_wkt (p, 1,
         2489  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2490  +    add_srs_wkt (p, 2,
         2491  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2492  +    add_srs_wkt (p, 3,
         2493  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2494  +    add_srs_wkt (p, 4,
         2495  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2496  +    add_srs_wkt (p, 5,
         2497  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2498  +    add_srs_wkt (p, 6,
         2499  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2500  +    add_srs_wkt (p, 7,
         2501  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2502  +    add_srs_wkt (p, 8,
         2503  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2504  +    add_srs_wkt (p, 9,
         2505  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",168],P");
         2506  +    add_srs_wkt (p, 10,
         2507  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2508  +    add_srs_wkt (p, 11,
         2509  +        ",56500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2510  +    add_srs_wkt (p, 12,
         2511  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2512  +    add_srs_wkt (p, 13,
         2513  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2690\"]]");
         2514  +    p = add_epsg_def_ex (filter, first, last, 2691, "epsg", 2691,
         2515  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 57", 0, 1,
         2516  +        "Krassowsky 1940", "Greenwich",
         2517  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2518  +        "X", "North", "Y", "East");
         2519  +    add_proj4text (p, 0,
         2520  +        "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=57500000 +y_0=");
         2521  +    add_proj4text (p, 1,
         2522  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2523  +    add_proj4text (p, 2,
         2524  +        "-0.22 +units=m +no_defs");
         2525  +    add_srs_wkt (p, 0,
         2526  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 57\",");
         2527  +    add_srs_wkt (p, 1,
         2528  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2529  +    add_srs_wkt (p, 2,
         2530  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2531  +    add_srs_wkt (p, 3,
         2532  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2533  +    add_srs_wkt (p, 4,
         2534  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2535  +    add_srs_wkt (p, 5,
         2536  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2537  +    add_srs_wkt (p, 6,
         2538  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2539  +    add_srs_wkt (p, 7,
         2540  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2541  +    add_srs_wkt (p, 8,
         2542  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2543  +    add_srs_wkt (p, 9,
         2544  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
         2545  +    add_srs_wkt (p, 10,
         2546  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2547  +    add_srs_wkt (p, 11,
         2548  +        ",57500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2549  +    add_srs_wkt (p, 12,
         2550  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2551  +    add_srs_wkt (p, 13,
         2552  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2691\"]]");
         2553  +    p = add_epsg_def_ex (filter, first, last, 2692, "epsg", 2692,
         2554  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 58", 0, 1,
         2555  +        "Krassowsky 1940", "Greenwich",
         2556  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2557  +        "X", "North", "Y", "East");
         2558  +    add_proj4text (p, 0,
         2559  +        "+proj=tmerc +lat_0=0 +lon_0=174 +k=1 +x_0=58500000 +y_0=");
         2560  +    add_proj4text (p, 1,
         2561  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2562  +    add_proj4text (p, 2,
         2563  +        "-0.22 +units=m +no_defs");
         2564  +    add_srs_wkt (p, 0,
         2565  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 58\",");
         2566  +    add_srs_wkt (p, 1,
         2567  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2568  +    add_srs_wkt (p, 2,
         2569  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2570  +    add_srs_wkt (p, 3,
         2571  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2572  +    add_srs_wkt (p, 4,
         2573  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2574  +    add_srs_wkt (p, 5,
         2575  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2576  +    add_srs_wkt (p, 6,
         2577  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2578  +    add_srs_wkt (p, 7,
         2579  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2580  +    add_srs_wkt (p, 8,
         2581  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2582  +    add_srs_wkt (p, 9,
         2583  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",174],P");
         2584  +    add_srs_wkt (p, 10,
         2585  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2586  +    add_srs_wkt (p, 11,
         2587  +        ",58500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2588  +    add_srs_wkt (p, 12,
         2589  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2590  +    add_srs_wkt (p, 13,
         2591  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2692\"]]");
         2592  +    p = add_epsg_def_ex (filter, first, last, 2693, "epsg", 2693,
         2593  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 59", 0, 1,
         2594  +        "Krassowsky 1940", "Greenwich",
         2595  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2596  +        "X", "North", "Y", "East");
         2597  +    add_proj4text (p, 0,
         2598  +        "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=59500000 +y_0=");
         2599  +    add_proj4text (p, 1,
         2600  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2601  +    add_proj4text (p, 2,
         2602  +        "-0.22 +units=m +no_defs");
         2603  +    add_srs_wkt (p, 0,
         2604  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 59\",");
         2605  +    add_srs_wkt (p, 1,
         2606  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2607  +    add_srs_wkt (p, 2,
         2608  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2609  +    add_srs_wkt (p, 3,
         2610  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2611  +    add_srs_wkt (p, 4,
         2612  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2613  +    add_srs_wkt (p, 5,
         2614  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2615  +    add_srs_wkt (p, 6,
         2616  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2617  +    add_srs_wkt (p, 7,
         2618  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2619  +    add_srs_wkt (p, 8,
         2620  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2621  +    add_srs_wkt (p, 9,
         2622  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
         2623  +    add_srs_wkt (p, 10,
         2624  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2625  +    add_srs_wkt (p, 11,
         2626  +        ",59500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2627  +    add_srs_wkt (p, 12,
         2628  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2629  +    add_srs_wkt (p, 13,
         2630  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2693\"]]");
         2631  +    p = add_epsg_def_ex (filter, first, last, 2694, "epsg", 2694,
         2632  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 60 (deprecated)", 0, 1,
         2633  +        "Krassowsky 1940", "Greenwich",
         2634  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2635  +        "X", "North", "Y", "East");
         2636  +    add_proj4text (p, 0,
         2637  +        "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=60000000 +y_0=");
         2638  +    add_proj4text (p, 1,
         2639  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
         2640  +    add_proj4text (p, 2,
         2641  +        "-0.22 +units=m +no_defs");
         2642  +    add_srs_wkt (p, 0,
         2643  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 60 (d");
         2644  +    add_srs_wkt (p, 1,
         2645  +        "eprecated)\",GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_199");
         2646  +    add_srs_wkt (p, 2,
         2647  +        "5\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY");
         2648  +    add_srs_wkt (p, 3,
         2649  +        "[\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,");
         2650  +    add_srs_wkt (p, 4,
         2651  +        "0.13,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Green");
         2652  +    add_srs_wkt (p, 5,
         2653  +        "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
         2654  +    add_srs_wkt (p, 6,
         2655  +        ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
         2656  +    add_srs_wkt (p, 7,
         2657  +        "atitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EP");
         2658  +    add_srs_wkt (p, 8,
         2659  +        "SG\",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARA");
         2660  +    add_srs_wkt (p, 9,
         2661  +        "METER[\"latitude_of_origin\",0],PARAMETER[\"central_meri");
         2662  +    add_srs_wkt (p, 10,
         2663  +        "dian\",180],PARAMETER[\"scale_factor\",1],PARAMETER[\"fa");
         2664  +    add_srs_wkt (p, 11,
         2665  +        "lse_easting\",60000000],PARAMETER[\"false_northing\",0],");
         2666  +    add_srs_wkt (p, 12,
         2667  +        "UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\"");
         2668  +    add_srs_wkt (p, 13,
         2669  +        ",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"2694\"]]");
         2670  +    p = add_epsg_def_ex (filter, first, last, 2695, "epsg", 2695,
         2671  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 61", 0, 1,
         2672  +        "Krassowsky 1940", "Greenwich",
         2673  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2674  +        "X", "North", "Y", "East");
         2675  +    add_proj4text (p, 0,
         2676  +        "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=61500000 +y_0");
         2677  +    add_proj4text (p, 1,
         2678  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
         2679  +    add_proj4text (p, 2,
         2680  +        ",-0.22 +units=m +no_defs");
         2681  +    add_srs_wkt (p, 0,
         2682  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 61\",");
         2683  +    add_srs_wkt (p, 1,
         2684  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2685  +    add_srs_wkt (p, 2,
         2686  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2687  +    add_srs_wkt (p, 3,
         2688  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2689  +    add_srs_wkt (p, 4,
         2690  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2691  +    add_srs_wkt (p, 5,
         2692  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2693  +    add_srs_wkt (p, 6,
         2694  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2695  +    add_srs_wkt (p, 7,
         2696  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2697  +    add_srs_wkt (p, 8,
         2698  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2699  +    add_srs_wkt (p, 9,
         2700  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
         2701  +    add_srs_wkt (p, 10,
         2702  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2703  +    add_srs_wkt (p, 11,
         2704  +        ",61500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2705  +    add_srs_wkt (p, 12,
         2706  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2707  +    add_srs_wkt (p, 13,
         2708  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2695\"]]");
         2709  +    p = add_epsg_def_ex (filter, first, last, 2696, "epsg", 2696,
         2710  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 62", 0, 1,
         2711  +        "Krassowsky 1940", "Greenwich",
         2712  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2713  +        "X", "North", "Y", "East");
         2714  +    add_proj4text (p, 0,
         2715  +        "+proj=tmerc +lat_0=0 +lon_0=-174 +k=1 +x_0=62500000 +y_0");
         2716  +    add_proj4text (p, 1,
         2717  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
         2718  +    add_proj4text (p, 2,
         2719  +        ",-0.22 +units=m +no_defs");
         2720  +    add_srs_wkt (p, 0,
         2721  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 62\",");
         2722  +    add_srs_wkt (p, 1,
         2723  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2724  +    add_srs_wkt (p, 2,
         2725  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2726  +    add_srs_wkt (p, 3,
         2727  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2728  +    add_srs_wkt (p, 4,
         2729  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2730  +    add_srs_wkt (p, 5,
         2731  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2732  +    add_srs_wkt (p, 6,
         2733  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2734  +    add_srs_wkt (p, 7,
         2735  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2736  +    add_srs_wkt (p, 8,
         2737  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2738  +    add_srs_wkt (p, 9,
         2739  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-174],");
         2740  +    add_srs_wkt (p, 10,
         2741  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2742  +    add_srs_wkt (p, 11,
         2743  +        ",62500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2744  +    add_srs_wkt (p, 12,
         2745  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2746  +    add_srs_wkt (p, 13,
         2747  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2696\"]]");
         2748  +    p = add_epsg_def_ex (filter, first, last, 2697, "epsg", 2697,
         2749  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 63", 0, 1,
         2750  +        "Krassowsky 1940", "Greenwich",
         2751  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2752  +        "X", "North", "Y", "East");
         2753  +    add_proj4text (p, 0,
         2754  +        "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=63500000 +y_0");
         2755  +    add_proj4text (p, 1,
         2756  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
         2757  +    add_proj4text (p, 2,
         2758  +        ",-0.22 +units=m +no_defs");
         2759  +    add_srs_wkt (p, 0,
         2760  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 63\",");
         2761  +    add_srs_wkt (p, 1,
         2762  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2763  +    add_srs_wkt (p, 2,
         2764  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2765  +    add_srs_wkt (p, 3,
         2766  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2767  +    add_srs_wkt (p, 4,
         2768  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2769  +    add_srs_wkt (p, 5,
         2770  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2771  +    add_srs_wkt (p, 6,
         2772  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2773  +    add_srs_wkt (p, 7,
         2774  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2775  +    add_srs_wkt (p, 8,
         2776  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2777  +    add_srs_wkt (p, 9,
         2778  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
         2779  +    add_srs_wkt (p, 10,
         2780  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2781  +    add_srs_wkt (p, 11,
         2782  +        ",63500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2783  +    add_srs_wkt (p, 12,
         2784  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2785  +    add_srs_wkt (p, 13,
         2786  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2697\"]]");
         2787  +    p = add_epsg_def_ex (filter, first, last, 2698, "epsg", 2698,
         2788  +        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 64", 0, 1,
         2789  +        "Krassowsky 1940", "Greenwich",
         2790  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2791  +        "X", "North", "Y", "East");
         2792  +    add_proj4text (p, 0,
         2793  +        "+proj=tmerc +lat_0=0 +lon_0=-168 +k=1 +x_0=64500000 +y_0");
         2794  +    add_proj4text (p, 1,
         2795  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
         2796  +    add_proj4text (p, 2,
         2797  +        ",-0.22 +units=m +no_defs");
         2798  +    add_srs_wkt (p, 0,
         2799  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 64\",");
         2800  +    add_srs_wkt (p, 1,
         2801  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         2802  +    add_srs_wkt (p, 2,
         2803  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         2804  +    add_srs_wkt (p, 3,
         2805  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         2806  +    add_srs_wkt (p, 4,
         2807  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         2808  +    add_srs_wkt (p, 5,
         2809  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         2810  +    add_srs_wkt (p, 6,
         2811  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         2812  +    add_srs_wkt (p, 7,
         2813  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2814  +    add_srs_wkt (p, 8,
         2815  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         2816  +    add_srs_wkt (p, 9,
         2817  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-168],");
         2818  +    add_srs_wkt (p, 10,
         2819  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         2820  +    add_srs_wkt (p, 11,
         2821  +        ",64500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         2822  +    add_srs_wkt (p, 12,
         2823  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         2824  +    add_srs_wkt (p, 13,
         2825  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2698\"]]");
         2826  +    p = add_epsg_def_ex (filter, first, last, 2699, "epsg", 2699,
         2827  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E", 0, 1,
         2828  +        "Krassowsky 1940", "Greenwich",
         2829  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2830  +        "X", "North", "Y", "East");
         2831  +    add_proj4text (p, 0,
         2832  +        "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
         2833  +    add_proj4text (p, 1,
         2834  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         2835  +    add_proj4text (p, 2,
         2836  +        "22 +units=m +no_defs");
         2837  +    add_srs_wkt (p, 0,
         2838  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E\",G");
         2839  +    add_srs_wkt (p, 1,
         2840  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         2841  +    add_srs_wkt (p, 2,
         2842  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         2843  +    add_srs_wkt (p, 3,
         2844  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
         2845  +    add_srs_wkt (p, 4,
         2846  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         2847  +    add_srs_wkt (p, 5,
         2848  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         2849  +    add_srs_wkt (p, 6,
         2850  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         2851  +    add_srs_wkt (p, 7,
         2852  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         2853  +    add_srs_wkt (p, 8,
         2854  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         2855  +    add_srs_wkt (p, 9,
         2856  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
         2857  +    add_srs_wkt (p, 10,
         2858  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         2859  +    add_srs_wkt (p, 11,
         2860  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         2861  +    add_srs_wkt (p, 12,
         2862  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         2863  +    add_srs_wkt (p, 13,
         2864  +        ",EAST],AUTHORITY[\"EPSG\",\"2699\"]]");
         2865  +    p = add_epsg_def_ex (filter, first, last, 2700, "epsg", 2700,
         2866  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E", 0, 1,
         2867  +        "Krassowsky 1940", "Greenwich",
         2868  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2869  +        "X", "North", "Y", "East");
         2870  +    add_proj4text (p, 0,
         2871  +        "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=500000 +y_0=0 +");
         2872  +    add_proj4text (p, 1,
         2873  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         2874  +    add_proj4text (p, 2,
         2875  +        "22 +units=m +no_defs");
         2876  +    add_srs_wkt (p, 0,
         2877  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E\",G");
         2878  +    add_srs_wkt (p, 1,
         2879  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         2880  +    add_srs_wkt (p, 2,
         2881  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         2882  +    add_srs_wkt (p, 3,
         2883  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
         2884  +    add_srs_wkt (p, 4,
         2885  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         2886  +    add_srs_wkt (p, 5,
         2887  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         2888  +    add_srs_wkt (p, 6,
         2889  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         2890  +    add_srs_wkt (p, 7,
         2891  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         2892  +    add_srs_wkt (p, 8,
         2893  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         2894  +    add_srs_wkt (p, 9,
         2895  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",24],PARA");
         2896  +    add_srs_wkt (p, 10,
         2897  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         2898  +    add_srs_wkt (p, 11,
         2899  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         2900  +    add_srs_wkt (p, 12,
         2901  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         2902  +    add_srs_wkt (p, 13,
         2903  +        ",EAST],AUTHORITY[\"EPSG\",\"2700\"]]");
         2904  +    p = add_epsg_def_ex (filter, first, last, 2701, "epsg", 2701,
         2905  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E", 0, 1,
         2906  +        "Krassowsky 1940", "Greenwich",
         2907  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2908  +        "X", "North", "Y", "East");
         2909  +    add_proj4text (p, 0,
         2910  +        "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
         2911  +    add_proj4text (p, 1,
         2912  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         2913  +    add_proj4text (p, 2,
         2914  +        "22 +units=m +no_defs");
         2915  +    add_srs_wkt (p, 0,
         2916  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E\",G");
         2917  +    add_srs_wkt (p, 1,
         2918  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         2919  +    add_srs_wkt (p, 2,
         2920  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         2921  +    add_srs_wkt (p, 3,
         2922  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
         2923  +    add_srs_wkt (p, 4,
         2924  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         2925  +    add_srs_wkt (p, 5,
         2926  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         2927  +    add_srs_wkt (p, 6,
         2928  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         2929  +    add_srs_wkt (p, 7,
         2930  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         2931  +    add_srs_wkt (p, 8,
         2932  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         2933  +    add_srs_wkt (p, 9,
         2934  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
         2935  +    add_srs_wkt (p, 10,
         2936  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         2937  +    add_srs_wkt (p, 11,
         2938  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         2939  +    add_srs_wkt (p, 12,
         2940  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         2941  +    add_srs_wkt (p, 13,
         2942  +        ",EAST],AUTHORITY[\"EPSG\",\"2701\"]]");
         2943  +    p = add_epsg_def_ex (filter, first, last, 2702, "epsg", 2702,
         2944  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E", 0, 1,
         2945  +        "Krassowsky 1940", "Greenwich",
         2946  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2947  +        "X", "North", "Y", "East");
         2948  +    add_proj4text (p, 0,
         2949  +        "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=500000 +y_0=0 +");
         2950  +    add_proj4text (p, 1,
         2951  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         2952  +    add_proj4text (p, 2,
         2953  +        "22 +units=m +no_defs");
         2954  +    add_srs_wkt (p, 0,
         2955  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E\",G");
         2956  +    add_srs_wkt (p, 1,
         2957  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         2958  +    add_srs_wkt (p, 2,
         2959  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         2960  +    add_srs_wkt (p, 3,
         2961  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   700   2962       add_srs_wkt (p, 4,
   701   2963           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   702   2964       add_srs_wkt (p, 5,
   703   2965           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   704   2966       add_srs_wkt (p, 6,
   705   2967           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   706   2968       add_srs_wkt (p, 7,
   707   2969           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   708   2970       add_srs_wkt (p, 8,
   709   2971           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   710   2972       add_srs_wkt (p, 9,
   711   2973           "e_of_origin\",0],PARAMETER[\"central_meridian\",30],PARA");
   712   2974       add_srs_wkt (p, 10,
   713         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",10");
   714         -    add_srs_wkt (p, 11,
   715         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   716         -    add_srs_wkt (p, 12,
   717         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   718         -    add_srs_wkt (p, 13,
   719         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2644\"]]");
   720         -    p = add_epsg_def_ex (filter, first, last, 2645, "epsg", 2645,
   721         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 11", 0, 1,
   722         -        "Krassowsky 1940", "Greenwich",
   723         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   724         -        "X", "North", "Y", "East");
   725         -    add_proj4text (p, 0,
   726         -        "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=11500000 +y_0=0");
   727         -    add_proj4text (p, 1,
   728         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   729         -    add_proj4text (p, 2,
   730         -        "22 +units=m +no_defs");
   731         -    add_srs_wkt (p, 0,
   732         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 11\",");
   733         -    add_srs_wkt (p, 1,
   734         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   735         -    add_srs_wkt (p, 2,
   736         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   737         -    add_srs_wkt (p, 3,
   738         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         2975  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         2976  +    add_srs_wkt (p, 11,
         2977  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         2978  +    add_srs_wkt (p, 12,
         2979  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         2980  +    add_srs_wkt (p, 13,
         2981  +        ",EAST],AUTHORITY[\"EPSG\",\"2702\"]]");
         2982  +    p = add_epsg_def_ex (filter, first, last, 2703, "epsg", 2703,
         2983  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E", 0, 1,
         2984  +        "Krassowsky 1940", "Greenwich",
         2985  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         2986  +        "X", "North", "Y", "East");
         2987  +    add_proj4text (p, 0,
         2988  +        "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
         2989  +    add_proj4text (p, 1,
         2990  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         2991  +    add_proj4text (p, 2,
         2992  +        "22 +units=m +no_defs");
         2993  +    add_srs_wkt (p, 0,
         2994  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E\",G");
         2995  +    add_srs_wkt (p, 1,
         2996  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         2997  +    add_srs_wkt (p, 2,
         2998  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         2999  +    add_srs_wkt (p, 3,
         3000  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   739   3001       add_srs_wkt (p, 4,
   740   3002           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   741   3003       add_srs_wkt (p, 5,
   742   3004           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   743   3005       add_srs_wkt (p, 6,
   744   3006           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   745   3007       add_srs_wkt (p, 7,
   746   3008           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   747   3009       add_srs_wkt (p, 8,
   748   3010           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   749   3011       add_srs_wkt (p, 9,
   750   3012           "e_of_origin\",0],PARAMETER[\"central_meridian\",33],PARA");
   751   3013       add_srs_wkt (p, 10,
   752         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",11");
   753         -    add_srs_wkt (p, 11,
   754         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   755         -    add_srs_wkt (p, 12,
   756         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   757         -    add_srs_wkt (p, 13,
   758         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2645\"]]");
   759         -    p = add_epsg_def_ex (filter, first, last, 2646, "epsg", 2646,
   760         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 12", 0, 1,
   761         -        "Krassowsky 1940", "Greenwich",
   762         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   763         -        "X", "North", "Y", "East");
   764         -    add_proj4text (p, 0,
   765         -        "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=12500000 +y_0=0");
   766         -    add_proj4text (p, 1,
   767         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   768         -    add_proj4text (p, 2,
   769         -        "22 +units=m +no_defs");
   770         -    add_srs_wkt (p, 0,
   771         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 12\",");
   772         -    add_srs_wkt (p, 1,
   773         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   774         -    add_srs_wkt (p, 2,
   775         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   776         -    add_srs_wkt (p, 3,
   777         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3014  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3015  +    add_srs_wkt (p, 11,
         3016  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3017  +    add_srs_wkt (p, 12,
         3018  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3019  +    add_srs_wkt (p, 13,
         3020  +        ",EAST],AUTHORITY[\"EPSG\",\"2703\"]]");
         3021  +    p = add_epsg_def_ex (filter, first, last, 2704, "epsg", 2704,
         3022  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E", 0, 1,
         3023  +        "Krassowsky 1940", "Greenwich",
         3024  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3025  +        "X", "North", "Y", "East");
         3026  +    add_proj4text (p, 0,
         3027  +        "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=500000 +y_0=0 +");
         3028  +    add_proj4text (p, 1,
         3029  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3030  +    add_proj4text (p, 2,
         3031  +        "22 +units=m +no_defs");
         3032  +    add_srs_wkt (p, 0,
         3033  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E\",G");
         3034  +    add_srs_wkt (p, 1,
         3035  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3036  +    add_srs_wkt (p, 2,
         3037  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3038  +    add_srs_wkt (p, 3,
         3039  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   778   3040       add_srs_wkt (p, 4,
   779   3041           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   780   3042       add_srs_wkt (p, 5,
   781   3043           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   782   3044       add_srs_wkt (p, 6,
   783   3045           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   784   3046       add_srs_wkt (p, 7,
   785   3047           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   786   3048       add_srs_wkt (p, 8,
   787   3049           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   788   3050       add_srs_wkt (p, 9,
   789   3051           "e_of_origin\",0],PARAMETER[\"central_meridian\",36],PARA");
   790   3052       add_srs_wkt (p, 10,
   791         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",12");
   792         -    add_srs_wkt (p, 11,
   793         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   794         -    add_srs_wkt (p, 12,
   795         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   796         -    add_srs_wkt (p, 13,
   797         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2646\"]]");
   798         -    p = add_epsg_def_ex (filter, first, last, 2647, "epsg", 2647,
   799         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 13", 0, 1,
   800         -        "Krassowsky 1940", "Greenwich",
   801         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   802         -        "X", "North", "Y", "East");
   803         -    add_proj4text (p, 0,
   804         -        "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=13500000 +y_0=0");
   805         -    add_proj4text (p, 1,
   806         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   807         -    add_proj4text (p, 2,
   808         -        "22 +units=m +no_defs");
   809         -    add_srs_wkt (p, 0,
   810         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 13\",");
   811         -    add_srs_wkt (p, 1,
   812         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   813         -    add_srs_wkt (p, 2,
   814         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   815         -    add_srs_wkt (p, 3,
   816         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3053  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3054  +    add_srs_wkt (p, 11,
         3055  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3056  +    add_srs_wkt (p, 12,
         3057  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3058  +    add_srs_wkt (p, 13,
         3059  +        ",EAST],AUTHORITY[\"EPSG\",\"2704\"]]");
         3060  +    p = add_epsg_def_ex (filter, first, last, 2705, "epsg", 2705,
         3061  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E", 0, 1,
         3062  +        "Krassowsky 1940", "Greenwich",
         3063  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3064  +        "X", "North", "Y", "East");
         3065  +    add_proj4text (p, 0,
         3066  +        "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
         3067  +    add_proj4text (p, 1,
         3068  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3069  +    add_proj4text (p, 2,
         3070  +        "22 +units=m +no_defs");
         3071  +    add_srs_wkt (p, 0,
         3072  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E\",G");
         3073  +    add_srs_wkt (p, 1,
         3074  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3075  +    add_srs_wkt (p, 2,
         3076  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3077  +    add_srs_wkt (p, 3,
         3078  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   817   3079       add_srs_wkt (p, 4,
   818   3080           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   819   3081       add_srs_wkt (p, 5,
   820   3082           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   821   3083       add_srs_wkt (p, 6,
   822   3084           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   823   3085       add_srs_wkt (p, 7,
   824   3086           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   825   3087       add_srs_wkt (p, 8,
   826   3088           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   827   3089       add_srs_wkt (p, 9,
   828   3090           "e_of_origin\",0],PARAMETER[\"central_meridian\",39],PARA");
   829   3091       add_srs_wkt (p, 10,
   830         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",13");
   831         -    add_srs_wkt (p, 11,
   832         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   833         -    add_srs_wkt (p, 12,
   834         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   835         -    add_srs_wkt (p, 13,
   836         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2647\"]]");
   837         -    p = add_epsg_def_ex (filter, first, last, 2648, "epsg", 2648,
   838         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 14", 0, 1,
   839         -        "Krassowsky 1940", "Greenwich",
   840         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   841         -        "X", "North", "Y", "East");
   842         -    add_proj4text (p, 0,
   843         -        "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=14500000 +y_0=0");
   844         -    add_proj4text (p, 1,
   845         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   846         -    add_proj4text (p, 2,
   847         -        "22 +units=m +no_defs");
   848         -    add_srs_wkt (p, 0,
   849         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 14\",");
   850         -    add_srs_wkt (p, 1,
   851         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   852         -    add_srs_wkt (p, 2,
   853         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   854         -    add_srs_wkt (p, 3,
   855         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3092  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3093  +    add_srs_wkt (p, 11,
         3094  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3095  +    add_srs_wkt (p, 12,
         3096  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3097  +    add_srs_wkt (p, 13,
         3098  +        ",EAST],AUTHORITY[\"EPSG\",\"2705\"]]");
         3099  +    p = add_epsg_def_ex (filter, first, last, 2706, "epsg", 2706,
         3100  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E", 0, 1,
         3101  +        "Krassowsky 1940", "Greenwich",
         3102  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3103  +        "X", "North", "Y", "East");
         3104  +    add_proj4text (p, 0,
         3105  +        "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=500000 +y_0=0 +");
         3106  +    add_proj4text (p, 1,
         3107  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3108  +    add_proj4text (p, 2,
         3109  +        "22 +units=m +no_defs");
         3110  +    add_srs_wkt (p, 0,
         3111  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E\",G");
         3112  +    add_srs_wkt (p, 1,
         3113  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3114  +    add_srs_wkt (p, 2,
         3115  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3116  +    add_srs_wkt (p, 3,
         3117  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   856   3118       add_srs_wkt (p, 4,
   857   3119           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   858   3120       add_srs_wkt (p, 5,
   859   3121           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   860   3122       add_srs_wkt (p, 6,
   861   3123           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   862   3124       add_srs_wkt (p, 7,
   863   3125           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   864   3126       add_srs_wkt (p, 8,
   865   3127           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   866   3128       add_srs_wkt (p, 9,
   867   3129           "e_of_origin\",0],PARAMETER[\"central_meridian\",42],PARA");
   868   3130       add_srs_wkt (p, 10,
   869         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",14");
   870         -    add_srs_wkt (p, 11,
   871         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   872         -    add_srs_wkt (p, 12,
   873         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   874         -    add_srs_wkt (p, 13,
   875         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2648\"]]");
   876         -    p = add_epsg_def_ex (filter, first, last, 2649, "epsg", 2649,
   877         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 15", 0, 1,
   878         -        "Krassowsky 1940", "Greenwich",
   879         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   880         -        "X", "North", "Y", "East");
   881         -    add_proj4text (p, 0,
   882         -        "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=15500000 +y_0=0");
   883         -    add_proj4text (p, 1,
   884         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   885         -    add_proj4text (p, 2,
   886         -        "22 +units=m +no_defs");
   887         -    add_srs_wkt (p, 0,
   888         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 15\",");
   889         -    add_srs_wkt (p, 1,
   890         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   891         -    add_srs_wkt (p, 2,
   892         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   893         -    add_srs_wkt (p, 3,
   894         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3131  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3132  +    add_srs_wkt (p, 11,
         3133  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3134  +    add_srs_wkt (p, 12,
         3135  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3136  +    add_srs_wkt (p, 13,
         3137  +        ",EAST],AUTHORITY[\"EPSG\",\"2706\"]]");
         3138  +    p = add_epsg_def_ex (filter, first, last, 2707, "epsg", 2707,
         3139  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E", 0, 1,
         3140  +        "Krassowsky 1940", "Greenwich",
         3141  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3142  +        "X", "North", "Y", "East");
         3143  +    add_proj4text (p, 0,
         3144  +        "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
         3145  +    add_proj4text (p, 1,
         3146  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3147  +    add_proj4text (p, 2,
         3148  +        "22 +units=m +no_defs");
         3149  +    add_srs_wkt (p, 0,
         3150  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E\",G");
         3151  +    add_srs_wkt (p, 1,
         3152  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3153  +    add_srs_wkt (p, 2,
         3154  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3155  +    add_srs_wkt (p, 3,
         3156  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   895   3157       add_srs_wkt (p, 4,
   896   3158           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   897   3159       add_srs_wkt (p, 5,
   898   3160           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   899   3161       add_srs_wkt (p, 6,
   900   3162           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   901   3163       add_srs_wkt (p, 7,
   902   3164           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   903   3165       add_srs_wkt (p, 8,
   904   3166           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   905   3167       add_srs_wkt (p, 9,
   906   3168           "e_of_origin\",0],PARAMETER[\"central_meridian\",45],PARA");
   907   3169       add_srs_wkt (p, 10,
   908         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",15");
   909         -    add_srs_wkt (p, 11,
   910         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   911         -    add_srs_wkt (p, 12,
   912         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   913         -    add_srs_wkt (p, 13,
   914         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2649\"]]");
   915         -    p = add_epsg_def_ex (filter, first, last, 2650, "epsg", 2650,
   916         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 16", 0, 1,
   917         -        "Krassowsky 1940", "Greenwich",
   918         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   919         -        "X", "North", "Y", "East");
   920         -    add_proj4text (p, 0,
   921         -        "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=16500000 +y_0=0");
   922         -    add_proj4text (p, 1,
   923         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   924         -    add_proj4text (p, 2,
   925         -        "22 +units=m +no_defs");
   926         -    add_srs_wkt (p, 0,
   927         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 16\",");
   928         -    add_srs_wkt (p, 1,
   929         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   930         -    add_srs_wkt (p, 2,
   931         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   932         -    add_srs_wkt (p, 3,
   933         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3170  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3171  +    add_srs_wkt (p, 11,
         3172  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3173  +    add_srs_wkt (p, 12,
         3174  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3175  +    add_srs_wkt (p, 13,
         3176  +        ",EAST],AUTHORITY[\"EPSG\",\"2707\"]]");
         3177  +    p = add_epsg_def_ex (filter, first, last, 2708, "epsg", 2708,
         3178  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E", 0, 1,
         3179  +        "Krassowsky 1940", "Greenwich",
         3180  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3181  +        "X", "North", "Y", "East");
         3182  +    add_proj4text (p, 0,
         3183  +        "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=500000 +y_0=0 +");
         3184  +    add_proj4text (p, 1,
         3185  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3186  +    add_proj4text (p, 2,
         3187  +        "22 +units=m +no_defs");
         3188  +    add_srs_wkt (p, 0,
         3189  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E\",G");
         3190  +    add_srs_wkt (p, 1,
         3191  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3192  +    add_srs_wkt (p, 2,
         3193  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3194  +    add_srs_wkt (p, 3,
         3195  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   934   3196       add_srs_wkt (p, 4,
   935   3197           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   936   3198       add_srs_wkt (p, 5,
   937   3199           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   938   3200       add_srs_wkt (p, 6,
   939   3201           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   940   3202       add_srs_wkt (p, 7,
   941   3203           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   942   3204       add_srs_wkt (p, 8,
   943   3205           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   944   3206       add_srs_wkt (p, 9,
   945   3207           "e_of_origin\",0],PARAMETER[\"central_meridian\",48],PARA");
   946   3208       add_srs_wkt (p, 10,
   947         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",16");
   948         -    add_srs_wkt (p, 11,
   949         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   950         -    add_srs_wkt (p, 12,
   951         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   952         -    add_srs_wkt (p, 13,
   953         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2650\"]]");
   954         -    p = add_epsg_def_ex (filter, first, last, 2651, "epsg", 2651,
   955         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 17", 0, 1,
   956         -        "Krassowsky 1940", "Greenwich",
   957         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   958         -        "X", "North", "Y", "East");
   959         -    add_proj4text (p, 0,
   960         -        "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=17500000 +y_0=0");
   961         -    add_proj4text (p, 1,
   962         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
   963         -    add_proj4text (p, 2,
   964         -        "22 +units=m +no_defs");
   965         -    add_srs_wkt (p, 0,
   966         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 17\",");
   967         -    add_srs_wkt (p, 1,
   968         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   969         -    add_srs_wkt (p, 2,
   970         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   971         -    add_srs_wkt (p, 3,
   972         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3209  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3210  +    add_srs_wkt (p, 11,
         3211  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3212  +    add_srs_wkt (p, 12,
         3213  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3214  +    add_srs_wkt (p, 13,
         3215  +        ",EAST],AUTHORITY[\"EPSG\",\"2708\"]]");
         3216  +    p = add_epsg_def_ex (filter, first, last, 2709, "epsg", 2709,
         3217  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E", 0, 1,
         3218  +        "Krassowsky 1940", "Greenwich",
         3219  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3220  +        "X", "North", "Y", "East");
         3221  +    add_proj4text (p, 0,
         3222  +        "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
         3223  +    add_proj4text (p, 1,
         3224  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3225  +    add_proj4text (p, 2,
         3226  +        "22 +units=m +no_defs");
         3227  +    add_srs_wkt (p, 0,
         3228  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E\",G");
         3229  +    add_srs_wkt (p, 1,
         3230  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3231  +    add_srs_wkt (p, 2,
         3232  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3233  +    add_srs_wkt (p, 3,
         3234  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   973   3235       add_srs_wkt (p, 4,
   974   3236           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   975   3237       add_srs_wkt (p, 5,
   976   3238           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   977   3239       add_srs_wkt (p, 6,
   978   3240           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   979   3241       add_srs_wkt (p, 7,
   980   3242           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   981   3243       add_srs_wkt (p, 8,
   982   3244           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   983   3245       add_srs_wkt (p, 9,
   984   3246           "e_of_origin\",0],PARAMETER[\"central_meridian\",51],PARA");
   985   3247       add_srs_wkt (p, 10,
   986         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",17");
   987         -    add_srs_wkt (p, 11,
   988         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
   989         -    add_srs_wkt (p, 12,
   990         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
   991         -    add_srs_wkt (p, 13,
   992         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2651\"]]");
   993         -    p = add_epsg_def_ex (filter, first, last, 2652, "epsg", 2652,
   994         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 18", 0, 1,
   995         -        "Krassowsky 1940", "Greenwich",
   996         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   997         -        "X", "North", "Y", "East");
   998         -    add_proj4text (p, 0,
   999         -        "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=18500000 +y_0=0");
  1000         -    add_proj4text (p, 1,
  1001         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
  1002         -    add_proj4text (p, 2,
  1003         -        "22 +units=m +no_defs");
  1004         -    add_srs_wkt (p, 0,
  1005         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 18\",");
  1006         -    add_srs_wkt (p, 1,
  1007         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1008         -    add_srs_wkt (p, 2,
  1009         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1010         -    add_srs_wkt (p, 3,
  1011         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3248  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3249  +    add_srs_wkt (p, 11,
         3250  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3251  +    add_srs_wkt (p, 12,
         3252  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3253  +    add_srs_wkt (p, 13,
         3254  +        ",EAST],AUTHORITY[\"EPSG\",\"2709\"]]");
         3255  +    p = add_epsg_def_ex (filter, first, last, 2710, "epsg", 2710,
         3256  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E", 0, 1,
         3257  +        "Krassowsky 1940", "Greenwich",
         3258  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3259  +        "X", "North", "Y", "East");
         3260  +    add_proj4text (p, 0,
         3261  +        "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=500000 +y_0=0 +");
         3262  +    add_proj4text (p, 1,
         3263  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3264  +    add_proj4text (p, 2,
         3265  +        "22 +units=m +no_defs");
         3266  +    add_srs_wkt (p, 0,
         3267  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E\",G");
         3268  +    add_srs_wkt (p, 1,
         3269  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3270  +    add_srs_wkt (p, 2,
         3271  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3272  +    add_srs_wkt (p, 3,
         3273  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1012   3274       add_srs_wkt (p, 4,
  1013   3275           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1014   3276       add_srs_wkt (p, 5,
  1015   3277           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1016   3278       add_srs_wkt (p, 6,
  1017   3279           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1018   3280       add_srs_wkt (p, 7,
  1019   3281           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1020   3282       add_srs_wkt (p, 8,
  1021   3283           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1022   3284       add_srs_wkt (p, 9,
  1023   3285           "e_of_origin\",0],PARAMETER[\"central_meridian\",54],PARA");
  1024   3286       add_srs_wkt (p, 10,
  1025         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",18");
  1026         -    add_srs_wkt (p, 11,
  1027         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  1028         -    add_srs_wkt (p, 12,
  1029         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1030         -    add_srs_wkt (p, 13,
  1031         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2652\"]]");
  1032         -    p = add_epsg_def_ex (filter, first, last, 2653, "epsg", 2653,
  1033         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 19", 0, 1,
  1034         -        "Krassowsky 1940", "Greenwich",
  1035         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1036         -        "X", "North", "Y", "East");
  1037         -    add_proj4text (p, 0,
  1038         -        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=19500000 +y_0=0");
  1039         -    add_proj4text (p, 1,
  1040         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
  1041         -    add_proj4text (p, 2,
  1042         -        "22 +units=m +no_defs");
  1043         -    add_srs_wkt (p, 0,
  1044         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 19\",");
  1045         -    add_srs_wkt (p, 1,
  1046         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1047         -    add_srs_wkt (p, 2,
  1048         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1049         -    add_srs_wkt (p, 3,
  1050         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3287  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3288  +    add_srs_wkt (p, 11,
         3289  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3290  +    add_srs_wkt (p, 12,
         3291  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3292  +    add_srs_wkt (p, 13,
         3293  +        ",EAST],AUTHORITY[\"EPSG\",\"2710\"]]");
         3294  +    p = add_epsg_def_ex (filter, first, last, 2711, "epsg", 2711,
         3295  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E", 0, 1,
         3296  +        "Krassowsky 1940", "Greenwich",
         3297  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3298  +        "X", "North", "Y", "East");
         3299  +    add_proj4text (p, 0,
         3300  +        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
         3301  +    add_proj4text (p, 1,
         3302  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3303  +    add_proj4text (p, 2,
         3304  +        "22 +units=m +no_defs");
         3305  +    add_srs_wkt (p, 0,
         3306  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E\",G");
         3307  +    add_srs_wkt (p, 1,
         3308  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3309  +    add_srs_wkt (p, 2,
         3310  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3311  +    add_srs_wkt (p, 3,
         3312  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1051   3313       add_srs_wkt (p, 4,
  1052   3314           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1053   3315       add_srs_wkt (p, 5,
  1054   3316           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1055   3317       add_srs_wkt (p, 6,
  1056   3318           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1057   3319       add_srs_wkt (p, 7,
  1058   3320           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1059   3321       add_srs_wkt (p, 8,
  1060   3322           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1061   3323       add_srs_wkt (p, 9,
  1062   3324           "e_of_origin\",0],PARAMETER[\"central_meridian\",57],PARA");
  1063   3325       add_srs_wkt (p, 10,
  1064         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",19");
  1065         -    add_srs_wkt (p, 11,
  1066         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  1067         -    add_srs_wkt (p, 12,
  1068         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1069         -    add_srs_wkt (p, 13,
  1070         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2653\"]]");
  1071         -    p = add_epsg_def_ex (filter, first, last, 2654, "epsg", 2654,
  1072         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 20", 0, 1,
  1073         -        "Krassowsky 1940", "Greenwich",
  1074         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1075         -        "X", "North", "Y", "East");
  1076         -    add_proj4text (p, 0,
  1077         -        "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=20500000 +y_0=0");
  1078         -    add_proj4text (p, 1,
  1079         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
  1080         -    add_proj4text (p, 2,
  1081         -        "22 +units=m +no_defs");
  1082         -    add_srs_wkt (p, 0,
  1083         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 20\",");
  1084         -    add_srs_wkt (p, 1,
  1085         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1086         -    add_srs_wkt (p, 2,
  1087         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1088         -    add_srs_wkt (p, 3,
  1089         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3326  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3327  +    add_srs_wkt (p, 11,
         3328  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3329  +    add_srs_wkt (p, 12,
         3330  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3331  +    add_srs_wkt (p, 13,
         3332  +        ",EAST],AUTHORITY[\"EPSG\",\"2711\"]]");
         3333  +    p = add_epsg_def_ex (filter, first, last, 2712, "epsg", 2712,
         3334  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E", 0, 1,
         3335  +        "Krassowsky 1940", "Greenwich",
         3336  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3337  +        "X", "North", "Y", "East");
         3338  +    add_proj4text (p, 0,
         3339  +        "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=500000 +y_0=0 +");
         3340  +    add_proj4text (p, 1,
         3341  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3342  +    add_proj4text (p, 2,
         3343  +        "22 +units=m +no_defs");
         3344  +    add_srs_wkt (p, 0,
         3345  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E\",G");
         3346  +    add_srs_wkt (p, 1,
         3347  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3348  +    add_srs_wkt (p, 2,
         3349  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3350  +    add_srs_wkt (p, 3,
         3351  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1090   3352       add_srs_wkt (p, 4,
  1091   3353           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1092   3354       add_srs_wkt (p, 5,
  1093   3355           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1094   3356       add_srs_wkt (p, 6,
  1095   3357           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1096   3358       add_srs_wkt (p, 7,
  1097   3359           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1098   3360       add_srs_wkt (p, 8,
  1099   3361           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1100   3362       add_srs_wkt (p, 9,
  1101   3363           "e_of_origin\",0],PARAMETER[\"central_meridian\",60],PARA");
  1102   3364       add_srs_wkt (p, 10,
  1103         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",20");
  1104         -    add_srs_wkt (p, 11,
  1105         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
  1106         -    add_srs_wkt (p, 12,
  1107         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1108         -    add_srs_wkt (p, 13,
  1109         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2654\"]]");
  1110         -    p = add_epsg_def_ex (filter, first, last, 2655, "epsg", 2655,
  1111         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 21", 0, 1,
  1112         -        "Krassowsky 1940", "Greenwich",
  1113         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1114         -        "X", "North", "Y", "East");
  1115         -    add_proj4text (p, 0,
  1116         -        "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=21500000 +y_0=0");
  1117         -    add_proj4text (p, 1,
  1118         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
  1119         -    add_proj4text (p, 2,
  1120         -        "22 +units=m +no_defs");
  1121         -    add_srs_wkt (p, 0,
  1122         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 21\",");
  1123         -    add_srs_wkt (p, 1,
  1124         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1125         -    add_srs_wkt (p, 2,
  1126         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1127         -    add_srs_wkt (p, 3,
  1128         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3365  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3366  +    add_srs_wkt (p, 11,
         3367  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3368  +    add_srs_wkt (p, 12,
         3369  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3370  +    add_srs_wkt (p, 13,
         3371  +        ",EAST],AUTHORITY[\"EPSG\",\"2712\"]]");
         3372  +    p = add_epsg_def_ex (filter, first, last, 2713, "epsg", 2713,
         3373  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E", 0, 1,
         3374  +        "Krassowsky 1940", "Greenwich",
         3375  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3376  +        "X", "North", "Y", "East");
         3377  +    add_proj4text (p, 0,
         3378  +        "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
         3379  +    add_proj4text (p, 1,
         3380  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
         3381  +    add_proj4text (p, 2,
         3382  +        "22 +units=m +no_defs");
         3383  +    add_srs_wkt (p, 0,
         3384  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E\",G");
         3385  +    add_srs_wkt (p, 1,
         3386  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
         3387  +    add_srs_wkt (p, 2,
         3388  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
         3389  +    add_srs_wkt (p, 3,
         3390  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1129   3391       add_srs_wkt (p, 4,
  1130   3392           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1131   3393       add_srs_wkt (p, 5,
  1132   3394           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1133   3395       add_srs_wkt (p, 6,
  1134   3396           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1135   3397       add_srs_wkt (p, 7,
  1136   3398           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1137   3399       add_srs_wkt (p, 8,
  1138   3400           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1139   3401       add_srs_wkt (p, 9,
  1140   3402           "e_of_origin\",0],PARAMETER[\"central_meridian\",63],PARA");
  1141   3403       add_srs_wkt (p, 10,
  1142         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",21");
         3404  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1143   3405       add_srs_wkt (p, 11,
  1144         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3406  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1145   3407       add_srs_wkt (p, 12,
  1146         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3408  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1147   3409       add_srs_wkt (p, 13,
  1148         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2655\"]]");
  1149         -    p = add_epsg_def_ex (filter, first, last, 2656, "epsg", 2656,
  1150         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 22", 0, 1,
         3410  +        ",EAST],AUTHORITY[\"EPSG\",\"2713\"]]");
         3411  +    p = add_epsg_def_ex (filter, first, last, 2714, "epsg", 2714,
         3412  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E", 0, 1,
  1151   3413           "Krassowsky 1940", "Greenwich",
  1152   3414           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1153   3415           "X", "North", "Y", "East");
  1154   3416       add_proj4text (p, 0,
  1155         -        "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=22500000 +y_0=0");
         3417  +        "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=500000 +y_0=0 +");
  1156   3418       add_proj4text (p, 1,
  1157         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3419  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1158   3420       add_proj4text (p, 2,
  1159   3421           "22 +units=m +no_defs");
  1160   3422       add_srs_wkt (p, 0,
  1161         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 22\",");
         3423  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E\",G");
  1162   3424       add_srs_wkt (p, 1,
  1163         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3425  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1164   3426       add_srs_wkt (p, 2,
  1165         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3427  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1166   3428       add_srs_wkt (p, 3,
  1167         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3429  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1168   3430       add_srs_wkt (p, 4,
  1169   3431           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1170   3432       add_srs_wkt (p, 5,
  1171   3433           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1172   3434       add_srs_wkt (p, 6,
  1173   3435           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1174   3436       add_srs_wkt (p, 7,
  1175   3437           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1176   3438       add_srs_wkt (p, 8,
  1177   3439           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1178   3440       add_srs_wkt (p, 9,
  1179   3441           "e_of_origin\",0],PARAMETER[\"central_meridian\",66],PARA");
  1180   3442       add_srs_wkt (p, 10,
  1181         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",22");
         3443  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1182   3444       add_srs_wkt (p, 11,
  1183         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3445  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1184   3446       add_srs_wkt (p, 12,
  1185         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3447  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1186   3448       add_srs_wkt (p, 13,
  1187         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2656\"]]");
  1188         -    p = add_epsg_def_ex (filter, first, last, 2657, "epsg", 2657,
  1189         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 23", 0, 1,
         3449  +        ",EAST],AUTHORITY[\"EPSG\",\"2714\"]]");
         3450  +    p = add_epsg_def_ex (filter, first, last, 2715, "epsg", 2715,
         3451  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E", 0, 1,
  1190   3452           "Krassowsky 1940", "Greenwich",
  1191   3453           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1192   3454           "X", "North", "Y", "East");
  1193   3455       add_proj4text (p, 0,
  1194         -        "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=23500000 +y_0=0");
         3456  +        "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  1195   3457       add_proj4text (p, 1,
  1196         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3458  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1197   3459       add_proj4text (p, 2,
  1198   3460           "22 +units=m +no_defs");
  1199   3461       add_srs_wkt (p, 0,
  1200         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 23\",");
         3462  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E\",G");
  1201   3463       add_srs_wkt (p, 1,
  1202         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3464  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1203   3465       add_srs_wkt (p, 2,
  1204         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3466  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1205   3467       add_srs_wkt (p, 3,
  1206         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3468  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1207   3469       add_srs_wkt (p, 4,
  1208   3470           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1209   3471       add_srs_wkt (p, 5,
  1210   3472           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1211   3473       add_srs_wkt (p, 6,
  1212   3474           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1213   3475       add_srs_wkt (p, 7,
  1214   3476           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1215   3477       add_srs_wkt (p, 8,
  1216   3478           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1217   3479       add_srs_wkt (p, 9,
  1218   3480           "e_of_origin\",0],PARAMETER[\"central_meridian\",69],PARA");
  1219   3481       add_srs_wkt (p, 10,
  1220         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",23");
         3482  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1221   3483       add_srs_wkt (p, 11,
  1222         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3484  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1223   3485       add_srs_wkt (p, 12,
  1224         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3486  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1225   3487       add_srs_wkt (p, 13,
  1226         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2657\"]]");
  1227         -    p = add_epsg_def_ex (filter, first, last, 2658, "epsg", 2658,
  1228         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 24", 0, 1,
         3488  +        ",EAST],AUTHORITY[\"EPSG\",\"2715\"]]");
         3489  +    p = add_epsg_def_ex (filter, first, last, 2716, "epsg", 2716,
         3490  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E", 0, 1,
  1229   3491           "Krassowsky 1940", "Greenwich",
  1230   3492           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1231   3493           "X", "North", "Y", "East");
  1232   3494       add_proj4text (p, 0,
  1233         -        "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=24500000 +y_0=0");
         3495  +        "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=500000 +y_0=0 +");
  1234   3496       add_proj4text (p, 1,
  1235         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3497  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1236   3498       add_proj4text (p, 2,
  1237   3499           "22 +units=m +no_defs");
  1238   3500       add_srs_wkt (p, 0,
  1239         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 24\",");
         3501  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E\",G");
  1240   3502       add_srs_wkt (p, 1,
  1241         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3503  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1242   3504       add_srs_wkt (p, 2,
  1243         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3505  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1244   3506       add_srs_wkt (p, 3,
  1245         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3507  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1246   3508       add_srs_wkt (p, 4,
  1247   3509           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1248   3510       add_srs_wkt (p, 5,
  1249   3511           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1250   3512       add_srs_wkt (p, 6,
  1251   3513           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1252   3514       add_srs_wkt (p, 7,
  1253   3515           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1254   3516       add_srs_wkt (p, 8,
  1255   3517           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1256   3518       add_srs_wkt (p, 9,
  1257   3519           "e_of_origin\",0],PARAMETER[\"central_meridian\",72],PARA");
  1258   3520       add_srs_wkt (p, 10,
  1259         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",24");
         3521  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1260   3522       add_srs_wkt (p, 11,
  1261         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3523  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1262   3524       add_srs_wkt (p, 12,
  1263         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3525  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1264   3526       add_srs_wkt (p, 13,
  1265         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2658\"]]");
  1266         -    p = add_epsg_def_ex (filter, first, last, 2659, "epsg", 2659,
  1267         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 25", 0, 1,
         3527  +        ",EAST],AUTHORITY[\"EPSG\",\"2716\"]]");
         3528  +    p = add_epsg_def_ex (filter, first, last, 2717, "epsg", 2717,
         3529  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E", 0, 1,
  1268   3530           "Krassowsky 1940", "Greenwich",
  1269   3531           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1270   3532           "X", "North", "Y", "East");
  1271   3533       add_proj4text (p, 0,
  1272         -        "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=25500000 +y_0=0");
         3534  +        "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  1273   3535       add_proj4text (p, 1,
  1274         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3536  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1275   3537       add_proj4text (p, 2,
  1276   3538           "22 +units=m +no_defs");
  1277   3539       add_srs_wkt (p, 0,
  1278         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 25\",");
         3540  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E\",G");
  1279   3541       add_srs_wkt (p, 1,
  1280         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3542  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1281   3543       add_srs_wkt (p, 2,
  1282         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3544  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1283   3545       add_srs_wkt (p, 3,
  1284         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3546  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1285   3547       add_srs_wkt (p, 4,
  1286   3548           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1287   3549       add_srs_wkt (p, 5,
  1288   3550           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1289   3551       add_srs_wkt (p, 6,
  1290   3552           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1291   3553       add_srs_wkt (p, 7,
  1292   3554           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1293   3555       add_srs_wkt (p, 8,
  1294   3556           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1295   3557       add_srs_wkt (p, 9,
  1296   3558           "e_of_origin\",0],PARAMETER[\"central_meridian\",75],PARA");
  1297   3559       add_srs_wkt (p, 10,
  1298         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",25");
         3560  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1299   3561       add_srs_wkt (p, 11,
  1300         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3562  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1301   3563       add_srs_wkt (p, 12,
  1302         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3564  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1303   3565       add_srs_wkt (p, 13,
  1304         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2659\"]]");
  1305         -    p = add_epsg_def_ex (filter, first, last, 2660, "epsg", 2660,
  1306         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 26", 0, 1,
         3566  +        ",EAST],AUTHORITY[\"EPSG\",\"2717\"]]");
         3567  +    p = add_epsg_def_ex (filter, first, last, 2718, "epsg", 2718,
         3568  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E", 0, 1,
  1307   3569           "Krassowsky 1940", "Greenwich",
  1308   3570           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1309   3571           "X", "North", "Y", "East");
  1310   3572       add_proj4text (p, 0,
  1311         -        "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=26500000 +y_0=0");
         3573  +        "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=500000 +y_0=0 +");
  1312   3574       add_proj4text (p, 1,
  1313         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3575  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1314   3576       add_proj4text (p, 2,
  1315   3577           "22 +units=m +no_defs");
  1316   3578       add_srs_wkt (p, 0,
  1317         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 26\",");
         3579  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E\",G");
  1318   3580       add_srs_wkt (p, 1,
  1319         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3581  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1320   3582       add_srs_wkt (p, 2,
  1321         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3583  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1322   3584       add_srs_wkt (p, 3,
  1323         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3585  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1324   3586       add_srs_wkt (p, 4,
  1325   3587           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1326   3588       add_srs_wkt (p, 5,
  1327   3589           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1328   3590       add_srs_wkt (p, 6,
  1329   3591           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1330   3592       add_srs_wkt (p, 7,
  1331   3593           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1332   3594       add_srs_wkt (p, 8,
  1333   3595           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1334   3596       add_srs_wkt (p, 9,
  1335   3597           "e_of_origin\",0],PARAMETER[\"central_meridian\",78],PARA");
  1336   3598       add_srs_wkt (p, 10,
  1337         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",26");
         3599  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1338   3600       add_srs_wkt (p, 11,
  1339         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3601  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1340   3602       add_srs_wkt (p, 12,
  1341         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3603  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1342   3604       add_srs_wkt (p, 13,
  1343         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2660\"]]");
  1344         -    p = add_epsg_def_ex (filter, first, last, 2661, "epsg", 2661,
  1345         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 27", 0, 1,
         3605  +        ",EAST],AUTHORITY[\"EPSG\",\"2718\"]]");
         3606  +    p = add_epsg_def_ex (filter, first, last, 2719, "epsg", 2719,
         3607  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E", 0, 1,
  1346   3608           "Krassowsky 1940", "Greenwich",
  1347   3609           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1348   3610           "X", "North", "Y", "East");
  1349   3611       add_proj4text (p, 0,
  1350         -        "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=27500000 +y_0=0");
         3612  +        "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
  1351   3613       add_proj4text (p, 1,
  1352         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3614  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1353   3615       add_proj4text (p, 2,
  1354   3616           "22 +units=m +no_defs");
  1355   3617       add_srs_wkt (p, 0,
  1356         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 27\",");
         3618  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E\",G");
  1357   3619       add_srs_wkt (p, 1,
  1358         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3620  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1359   3621       add_srs_wkt (p, 2,
  1360         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3622  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1361   3623       add_srs_wkt (p, 3,
  1362         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3624  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1363   3625       add_srs_wkt (p, 4,
  1364   3626           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1365   3627       add_srs_wkt (p, 5,
  1366   3628           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1367   3629       add_srs_wkt (p, 6,
  1368   3630           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1369   3631       add_srs_wkt (p, 7,
  1370   3632           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1371   3633       add_srs_wkt (p, 8,
  1372   3634           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1373   3635       add_srs_wkt (p, 9,
  1374   3636           "e_of_origin\",0],PARAMETER[\"central_meridian\",81],PARA");
  1375   3637       add_srs_wkt (p, 10,
  1376         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",27");
         3638  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1377   3639       add_srs_wkt (p, 11,
  1378         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3640  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1379   3641       add_srs_wkt (p, 12,
  1380         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3642  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1381   3643       add_srs_wkt (p, 13,
  1382         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2661\"]]");
  1383         -    p = add_epsg_def_ex (filter, first, last, 2662, "epsg", 2662,
  1384         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 28", 0, 1,
         3644  +        ",EAST],AUTHORITY[\"EPSG\",\"2719\"]]");
         3645  +    p = add_epsg_def_ex (filter, first, last, 2720, "epsg", 2720,
         3646  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E", 0, 1,
  1385   3647           "Krassowsky 1940", "Greenwich",
  1386   3648           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1387   3649           "X", "North", "Y", "East");
  1388   3650       add_proj4text (p, 0,
  1389         -        "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=28500000 +y_0=0");
         3651  +        "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=500000 +y_0=0 +");
  1390   3652       add_proj4text (p, 1,
  1391         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3653  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1392   3654       add_proj4text (p, 2,
  1393   3655           "22 +units=m +no_defs");
  1394   3656       add_srs_wkt (p, 0,
  1395         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 28\",");
         3657  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E\",G");
  1396   3658       add_srs_wkt (p, 1,
  1397         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3659  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1398   3660       add_srs_wkt (p, 2,
  1399         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3661  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1400   3662       add_srs_wkt (p, 3,
  1401         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3663  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1402   3664       add_srs_wkt (p, 4,
  1403   3665           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1404   3666       add_srs_wkt (p, 5,
  1405   3667           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1406   3668       add_srs_wkt (p, 6,
  1407   3669           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1408   3670       add_srs_wkt (p, 7,
  1409   3671           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1410   3672       add_srs_wkt (p, 8,
  1411   3673           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1412   3674       add_srs_wkt (p, 9,
  1413   3675           "e_of_origin\",0],PARAMETER[\"central_meridian\",84],PARA");
  1414   3676       add_srs_wkt (p, 10,
  1415         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",28");
         3677  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1416   3678       add_srs_wkt (p, 11,
  1417         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3679  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1418   3680       add_srs_wkt (p, 12,
  1419         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3681  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1420   3682       add_srs_wkt (p, 13,
  1421         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2662\"]]");
  1422         -    p = add_epsg_def_ex (filter, first, last, 2663, "epsg", 2663,
  1423         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 29", 0, 1,
         3683  +        ",EAST],AUTHORITY[\"EPSG\",\"2720\"]]");
         3684  +    p = add_epsg_def_ex (filter, first, last, 2721, "epsg", 2721,
         3685  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E", 0, 1,
  1424   3686           "Krassowsky 1940", "Greenwich",
  1425   3687           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1426   3688           "X", "North", "Y", "East");
  1427   3689       add_proj4text (p, 0,
  1428         -        "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=29500000 +y_0=0");
         3690  +        "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
  1429   3691       add_proj4text (p, 1,
  1430         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3692  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1431   3693       add_proj4text (p, 2,
  1432   3694           "22 +units=m +no_defs");
  1433   3695       add_srs_wkt (p, 0,
  1434         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 29\",");
         3696  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E\",G");
  1435   3697       add_srs_wkt (p, 1,
  1436         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3698  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1437   3699       add_srs_wkt (p, 2,
  1438         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3700  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1439   3701       add_srs_wkt (p, 3,
  1440         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3702  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1441   3703       add_srs_wkt (p, 4,
  1442   3704           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1443   3705       add_srs_wkt (p, 5,
  1444   3706           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1445   3707       add_srs_wkt (p, 6,
  1446   3708           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1447   3709       add_srs_wkt (p, 7,
  1448   3710           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1449   3711       add_srs_wkt (p, 8,
  1450   3712           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1451   3713       add_srs_wkt (p, 9,
  1452   3714           "e_of_origin\",0],PARAMETER[\"central_meridian\",87],PARA");
  1453   3715       add_srs_wkt (p, 10,
  1454         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",29");
         3716  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1455   3717       add_srs_wkt (p, 11,
  1456         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3718  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1457   3719       add_srs_wkt (p, 12,
  1458         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3720  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1459   3721       add_srs_wkt (p, 13,
  1460         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2663\"]]");
  1461         -    p = add_epsg_def_ex (filter, first, last, 2664, "epsg", 2664,
  1462         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 30", 0, 1,
         3722  +        ",EAST],AUTHORITY[\"EPSG\",\"2721\"]]");
         3723  +    p = add_epsg_def_ex (filter, first, last, 2722, "epsg", 2722,
         3724  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E", 0, 1,
  1463   3725           "Krassowsky 1940", "Greenwich",
  1464   3726           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1465   3727           "X", "North", "Y", "East");
  1466   3728       add_proj4text (p, 0,
  1467         -        "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=30500000 +y_0=0");
         3729  +        "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=500000 +y_0=0 +");
  1468   3730       add_proj4text (p, 1,
  1469         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3731  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1470   3732       add_proj4text (p, 2,
  1471   3733           "22 +units=m +no_defs");
  1472   3734       add_srs_wkt (p, 0,
  1473         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 30\",");
         3735  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E\",G");
  1474   3736       add_srs_wkt (p, 1,
  1475         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3737  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1476   3738       add_srs_wkt (p, 2,
  1477         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3739  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1478   3740       add_srs_wkt (p, 3,
  1479         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3741  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1480   3742       add_srs_wkt (p, 4,
  1481   3743           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1482   3744       add_srs_wkt (p, 5,
  1483   3745           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1484   3746       add_srs_wkt (p, 6,
  1485   3747           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1486   3748       add_srs_wkt (p, 7,
  1487   3749           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1488   3750       add_srs_wkt (p, 8,
  1489   3751           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1490   3752       add_srs_wkt (p, 9,
  1491   3753           "e_of_origin\",0],PARAMETER[\"central_meridian\",90],PARA");
  1492   3754       add_srs_wkt (p, 10,
  1493         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",30");
         3755  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1494   3756       add_srs_wkt (p, 11,
  1495         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3757  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1496   3758       add_srs_wkt (p, 12,
  1497         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3759  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1498   3760       add_srs_wkt (p, 13,
  1499         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2664\"]]");
  1500         -    p = add_epsg_def_ex (filter, first, last, 2665, "epsg", 2665,
  1501         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 31", 0, 1,
         3761  +        ",EAST],AUTHORITY[\"EPSG\",\"2722\"]]");
         3762  +    p = add_epsg_def_ex (filter, first, last, 2723, "epsg", 2723,
         3763  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E", 0, 1,
  1502   3764           "Krassowsky 1940", "Greenwich",
  1503   3765           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1504   3766           "X", "North", "Y", "East");
  1505   3767       add_proj4text (p, 0,
  1506         -        "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=31500000 +y_0=0");
         3768  +        "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
  1507   3769       add_proj4text (p, 1,
  1508         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3770  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1509   3771       add_proj4text (p, 2,
  1510   3772           "22 +units=m +no_defs");
  1511   3773       add_srs_wkt (p, 0,
  1512         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 31\",");
         3774  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E\",G");
  1513   3775       add_srs_wkt (p, 1,
  1514         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3776  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1515   3777       add_srs_wkt (p, 2,
  1516         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3778  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1517   3779       add_srs_wkt (p, 3,
  1518         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3780  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1519   3781       add_srs_wkt (p, 4,
  1520   3782           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1521   3783       add_srs_wkt (p, 5,
  1522   3784           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1523   3785       add_srs_wkt (p, 6,
  1524   3786           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1525   3787       add_srs_wkt (p, 7,
  1526   3788           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1527   3789       add_srs_wkt (p, 8,
  1528   3790           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1529   3791       add_srs_wkt (p, 9,
  1530   3792           "e_of_origin\",0],PARAMETER[\"central_meridian\",93],PARA");
  1531   3793       add_srs_wkt (p, 10,
  1532         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",31");
         3794  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1533   3795       add_srs_wkt (p, 11,
  1534         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3796  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1535   3797       add_srs_wkt (p, 12,
  1536         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3798  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1537   3799       add_srs_wkt (p, 13,
  1538         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2665\"]]");
  1539         -    p = add_epsg_def_ex (filter, first, last, 2666, "epsg", 2666,
  1540         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 32", 0, 1,
         3800  +        ",EAST],AUTHORITY[\"EPSG\",\"2723\"]]");
         3801  +    p = add_epsg_def_ex (filter, first, last, 2724, "epsg", 2724,
         3802  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E", 0, 1,
  1541   3803           "Krassowsky 1940", "Greenwich",
  1542   3804           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1543   3805           "X", "North", "Y", "East");
  1544   3806       add_proj4text (p, 0,
  1545         -        "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=32500000 +y_0=0");
         3807  +        "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=500000 +y_0=0 +");
  1546   3808       add_proj4text (p, 1,
  1547         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3809  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1548   3810       add_proj4text (p, 2,
  1549   3811           "22 +units=m +no_defs");
  1550   3812       add_srs_wkt (p, 0,
  1551         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 32\",");
         3813  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E\",G");
  1552   3814       add_srs_wkt (p, 1,
  1553         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3815  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1554   3816       add_srs_wkt (p, 2,
  1555         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3817  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1556   3818       add_srs_wkt (p, 3,
  1557         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3819  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1558   3820       add_srs_wkt (p, 4,
  1559   3821           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1560   3822       add_srs_wkt (p, 5,
  1561   3823           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1562   3824       add_srs_wkt (p, 6,
  1563   3825           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1564   3826       add_srs_wkt (p, 7,
  1565   3827           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1566   3828       add_srs_wkt (p, 8,
  1567   3829           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1568   3830       add_srs_wkt (p, 9,
  1569   3831           "e_of_origin\",0],PARAMETER[\"central_meridian\",96],PARA");
  1570   3832       add_srs_wkt (p, 10,
  1571         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",32");
         3833  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1572   3834       add_srs_wkt (p, 11,
  1573         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3835  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1574   3836       add_srs_wkt (p, 12,
  1575         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3837  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1576   3838       add_srs_wkt (p, 13,
  1577         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2666\"]]");
  1578         -    p = add_epsg_def_ex (filter, first, last, 2667, "epsg", 2667,
  1579         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 33", 0, 1,
         3839  +        ",EAST],AUTHORITY[\"EPSG\",\"2724\"]]");
         3840  +    p = add_epsg_def_ex (filter, first, last, 2725, "epsg", 2725,
         3841  +        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E", 0, 1,
  1580   3842           "Krassowsky 1940", "Greenwich",
  1581   3843           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1582   3844           "X", "North", "Y", "East");
  1583   3845       add_proj4text (p, 0,
  1584         -        "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=33500000 +y_0=0");
         3846  +        "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
  1585   3847       add_proj4text (p, 1,
  1586         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3848  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
  1587   3849       add_proj4text (p, 2,
  1588   3850           "22 +units=m +no_defs");
  1589   3851       add_srs_wkt (p, 0,
  1590         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 33\",");
         3852  +        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E\",G");
  1591   3853       add_srs_wkt (p, 1,
  1592         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
         3854  +        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  1593   3855       add_srs_wkt (p, 2,
  1594         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
         3856  +        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  1595   3857       add_srs_wkt (p, 3,
  1596         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3858  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
  1597   3859       add_srs_wkt (p, 4,
  1598   3860           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1599   3861       add_srs_wkt (p, 5,
  1600   3862           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1601   3863       add_srs_wkt (p, 6,
  1602   3864           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1603   3865       add_srs_wkt (p, 7,
  1604   3866           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1605   3867       add_srs_wkt (p, 8,
  1606   3868           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1607   3869       add_srs_wkt (p, 9,
  1608   3870           "e_of_origin\",0],PARAMETER[\"central_meridian\",99],PARA");
  1609   3871       add_srs_wkt (p, 10,
  1610         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",33");
         3872  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  1611   3873       add_srs_wkt (p, 11,
  1612         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         3874  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  1613   3875       add_srs_wkt (p, 12,
  1614         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         3876  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  1615   3877       add_srs_wkt (p, 13,
  1616         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2667\"]]");
  1617         -    p = add_epsg_def_ex (filter, first, last, 2668, "epsg", 2668,
  1618         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 34", 0, 1,
  1619         -        "Krassowsky 1940", "Greenwich",
  1620         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1621         -        "X", "North", "Y", "East");
  1622         -    add_proj4text (p, 0,
  1623         -        "+proj=tmerc +lat_0=0 +lon_0=102 +k=1 +x_0=34500000 +y_0=");
  1624         -    add_proj4text (p, 1,
  1625         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1626         -    add_proj4text (p, 2,
  1627         -        ".22 +units=m +no_defs");
  1628         -    add_srs_wkt (p, 0,
  1629         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 34\",");
  1630         -    add_srs_wkt (p, 1,
  1631         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1632         -    add_srs_wkt (p, 2,
  1633         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1634         -    add_srs_wkt (p, 3,
  1635         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1636         -    add_srs_wkt (p, 4,
  1637         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1638         -    add_srs_wkt (p, 5,
  1639         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1640         -    add_srs_wkt (p, 6,
  1641         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1642         -    add_srs_wkt (p, 7,
  1643         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1644         -    add_srs_wkt (p, 8,
  1645         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1646         -    add_srs_wkt (p, 9,
  1647         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",102],PAR");
  1648         -    add_srs_wkt (p, 10,
  1649         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1650         -    add_srs_wkt (p, 11,
  1651         -        "4500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1652         -    add_srs_wkt (p, 12,
  1653         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1654         -    add_srs_wkt (p, 13,
  1655         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2668\"]]");
  1656         -    p = add_epsg_def_ex (filter, first, last, 2669, "epsg", 2669,
  1657         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 35", 0, 1,
  1658         -        "Krassowsky 1940", "Greenwich",
  1659         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1660         -        "X", "North", "Y", "East");
  1661         -    add_proj4text (p, 0,
  1662         -        "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=35500000 +y_0=");
  1663         -    add_proj4text (p, 1,
  1664         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1665         -    add_proj4text (p, 2,
  1666         -        ".22 +units=m +no_defs");
  1667         -    add_srs_wkt (p, 0,
  1668         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 35\",");
  1669         -    add_srs_wkt (p, 1,
  1670         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1671         -    add_srs_wkt (p, 2,
  1672         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1673         -    add_srs_wkt (p, 3,
  1674         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1675         -    add_srs_wkt (p, 4,
  1676         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1677         -    add_srs_wkt (p, 5,
  1678         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1679         -    add_srs_wkt (p, 6,
  1680         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1681         -    add_srs_wkt (p, 7,
  1682         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1683         -    add_srs_wkt (p, 8,
  1684         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1685         -    add_srs_wkt (p, 9,
  1686         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",105],PAR");
  1687         -    add_srs_wkt (p, 10,
  1688         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1689         -    add_srs_wkt (p, 11,
  1690         -        "5500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1691         -    add_srs_wkt (p, 12,
  1692         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1693         -    add_srs_wkt (p, 13,
  1694         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2669\"]]");
  1695         -    p = add_epsg_def_ex (filter, first, last, 2670, "epsg", 2670,
  1696         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 36", 0, 1,
  1697         -        "Krassowsky 1940", "Greenwich",
  1698         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1699         -        "X", "North", "Y", "East");
  1700         -    add_proj4text (p, 0,
  1701         -        "+proj=tmerc +lat_0=0 +lon_0=108 +k=1 +x_0=36500000 +y_0=");
  1702         -    add_proj4text (p, 1,
  1703         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1704         -    add_proj4text (p, 2,
  1705         -        ".22 +units=m +no_defs");
  1706         -    add_srs_wkt (p, 0,
  1707         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 36\",");
  1708         -    add_srs_wkt (p, 1,
  1709         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1710         -    add_srs_wkt (p, 2,
  1711         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1712         -    add_srs_wkt (p, 3,
  1713         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1714         -    add_srs_wkt (p, 4,
  1715         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1716         -    add_srs_wkt (p, 5,
  1717         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1718         -    add_srs_wkt (p, 6,
  1719         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1720         -    add_srs_wkt (p, 7,
  1721         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1722         -    add_srs_wkt (p, 8,
  1723         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1724         -    add_srs_wkt (p, 9,
  1725         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",108],PAR");
  1726         -    add_srs_wkt (p, 10,
  1727         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1728         -    add_srs_wkt (p, 11,
  1729         -        "6500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1730         -    add_srs_wkt (p, 12,
  1731         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1732         -    add_srs_wkt (p, 13,
  1733         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2670\"]]");
  1734         -    p = add_epsg_def_ex (filter, first, last, 2671, "epsg", 2671,
  1735         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 37", 0, 1,
  1736         -        "Krassowsky 1940", "Greenwich",
  1737         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1738         -        "X", "North", "Y", "East");
  1739         -    add_proj4text (p, 0,
  1740         -        "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=37500000 +y_0=");
  1741         -    add_proj4text (p, 1,
  1742         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1743         -    add_proj4text (p, 2,
  1744         -        ".22 +units=m +no_defs");
  1745         -    add_srs_wkt (p, 0,
  1746         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 37\",");
  1747         -    add_srs_wkt (p, 1,
  1748         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1749         -    add_srs_wkt (p, 2,
  1750         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1751         -    add_srs_wkt (p, 3,
  1752         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1753         -    add_srs_wkt (p, 4,
  1754         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1755         -    add_srs_wkt (p, 5,
  1756         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1757         -    add_srs_wkt (p, 6,
  1758         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1759         -    add_srs_wkt (p, 7,
  1760         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1761         -    add_srs_wkt (p, 8,
  1762         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1763         -    add_srs_wkt (p, 9,
  1764         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",111],PAR");
  1765         -    add_srs_wkt (p, 10,
  1766         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1767         -    add_srs_wkt (p, 11,
  1768         -        "7500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1769         -    add_srs_wkt (p, 12,
  1770         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1771         -    add_srs_wkt (p, 13,
  1772         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2671\"]]");
  1773         -    p = add_epsg_def_ex (filter, first, last, 2672, "epsg", 2672,
  1774         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 38", 0, 1,
  1775         -        "Krassowsky 1940", "Greenwich",
  1776         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1777         -        "X", "North", "Y", "East");
  1778         -    add_proj4text (p, 0,
  1779         -        "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=38500000 +y_0=");
  1780         -    add_proj4text (p, 1,
  1781         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1782         -    add_proj4text (p, 2,
  1783         -        ".22 +units=m +no_defs");
  1784         -    add_srs_wkt (p, 0,
  1785         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 38\",");
  1786         -    add_srs_wkt (p, 1,
  1787         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1788         -    add_srs_wkt (p, 2,
  1789         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1790         -    add_srs_wkt (p, 3,
  1791         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1792         -    add_srs_wkt (p, 4,
  1793         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1794         -    add_srs_wkt (p, 5,
  1795         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1796         -    add_srs_wkt (p, 6,
  1797         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1798         -    add_srs_wkt (p, 7,
  1799         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1800         -    add_srs_wkt (p, 8,
  1801         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1802         -    add_srs_wkt (p, 9,
  1803         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",114],PAR");
  1804         -    add_srs_wkt (p, 10,
  1805         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1806         -    add_srs_wkt (p, 11,
  1807         -        "8500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1808         -    add_srs_wkt (p, 12,
  1809         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1810         -    add_srs_wkt (p, 13,
  1811         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2672\"]]");
  1812         -    p = add_epsg_def_ex (filter, first, last, 2673, "epsg", 2673,
  1813         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 39", 0, 1,
  1814         -        "Krassowsky 1940", "Greenwich",
  1815         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1816         -        "X", "North", "Y", "East");
  1817         -    add_proj4text (p, 0,
  1818         -        "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=39500000 +y_0=");
  1819         -    add_proj4text (p, 1,
  1820         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1821         -    add_proj4text (p, 2,
  1822         -        ".22 +units=m +no_defs");
  1823         -    add_srs_wkt (p, 0,
  1824         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 39\",");
  1825         -    add_srs_wkt (p, 1,
  1826         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1827         -    add_srs_wkt (p, 2,
  1828         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1829         -    add_srs_wkt (p, 3,
  1830         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1831         -    add_srs_wkt (p, 4,
  1832         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1833         -    add_srs_wkt (p, 5,
  1834         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1835         -    add_srs_wkt (p, 6,
  1836         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1837         -    add_srs_wkt (p, 7,
  1838         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1839         -    add_srs_wkt (p, 8,
  1840         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1841         -    add_srs_wkt (p, 9,
  1842         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",117],PAR");
  1843         -    add_srs_wkt (p, 10,
  1844         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",3");
  1845         -    add_srs_wkt (p, 11,
  1846         -        "9500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1847         -    add_srs_wkt (p, 12,
  1848         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1849         -    add_srs_wkt (p, 13,
  1850         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2673\"]]");
  1851         -    p = add_epsg_def_ex (filter, first, last, 2674, "epsg", 2674,
  1852         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 40", 0, 1,
  1853         -        "Krassowsky 1940", "Greenwich",
  1854         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1855         -        "X", "North", "Y", "East");
  1856         -    add_proj4text (p, 0,
  1857         -        "+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=40500000 +y_0=");
  1858         -    add_proj4text (p, 1,
  1859         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1860         -    add_proj4text (p, 2,
  1861         -        ".22 +units=m +no_defs");
  1862         -    add_srs_wkt (p, 0,
  1863         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 40\",");
  1864         -    add_srs_wkt (p, 1,
  1865         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1866         -    add_srs_wkt (p, 2,
  1867         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1868         -    add_srs_wkt (p, 3,
  1869         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1870         -    add_srs_wkt (p, 4,
  1871         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1872         -    add_srs_wkt (p, 5,
  1873         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1874         -    add_srs_wkt (p, 6,
  1875         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1876         -    add_srs_wkt (p, 7,
  1877         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1878         -    add_srs_wkt (p, 8,
  1879         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1880         -    add_srs_wkt (p, 9,
  1881         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",120],PAR");
  1882         -    add_srs_wkt (p, 10,
  1883         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  1884         -    add_srs_wkt (p, 11,
  1885         -        "0500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1886         -    add_srs_wkt (p, 12,
  1887         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1888         -    add_srs_wkt (p, 13,
  1889         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2674\"]]");
  1890         -    p = add_epsg_def_ex (filter, first, last, 2675, "epsg", 2675,
  1891         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 41", 0, 1,
  1892         -        "Krassowsky 1940", "Greenwich",
  1893         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1894         -        "X", "North", "Y", "East");
  1895         -    add_proj4text (p, 0,
  1896         -        "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=41500000 +y_0=");
  1897         -    add_proj4text (p, 1,
  1898         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1899         -    add_proj4text (p, 2,
  1900         -        ".22 +units=m +no_defs");
  1901         -    add_srs_wkt (p, 0,
  1902         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 41\",");
  1903         -    add_srs_wkt (p, 1,
  1904         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1905         -    add_srs_wkt (p, 2,
  1906         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1907         -    add_srs_wkt (p, 3,
  1908         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1909         -    add_srs_wkt (p, 4,
  1910         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1911         -    add_srs_wkt (p, 5,
  1912         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1913         -    add_srs_wkt (p, 6,
  1914         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1915         -    add_srs_wkt (p, 7,
  1916         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1917         -    add_srs_wkt (p, 8,
  1918         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1919         -    add_srs_wkt (p, 9,
  1920         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",123],PAR");
  1921         -    add_srs_wkt (p, 10,
  1922         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  1923         -    add_srs_wkt (p, 11,
  1924         -        "1500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1925         -    add_srs_wkt (p, 12,
  1926         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1927         -    add_srs_wkt (p, 13,
  1928         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2675\"]]");
  1929         -    p = add_epsg_def_ex (filter, first, last, 2676, "epsg", 2676,
  1930         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 42", 0, 1,
  1931         -        "Krassowsky 1940", "Greenwich",
  1932         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1933         -        "X", "North", "Y", "East");
  1934         -    add_proj4text (p, 0,
  1935         -        "+proj=tmerc +lat_0=0 +lon_0=126 +k=1 +x_0=42500000 +y_0=");
  1936         -    add_proj4text (p, 1,
  1937         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1938         -    add_proj4text (p, 2,
  1939         -        ".22 +units=m +no_defs");
  1940         -    add_srs_wkt (p, 0,
  1941         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 42\",");
  1942         -    add_srs_wkt (p, 1,
  1943         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1944         -    add_srs_wkt (p, 2,
  1945         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1946         -    add_srs_wkt (p, 3,
  1947         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1948         -    add_srs_wkt (p, 4,
  1949         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1950         -    add_srs_wkt (p, 5,
  1951         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1952         -    add_srs_wkt (p, 6,
  1953         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1954         -    add_srs_wkt (p, 7,
  1955         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1956         -    add_srs_wkt (p, 8,
  1957         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1958         -    add_srs_wkt (p, 9,
  1959         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",126],PAR");
  1960         -    add_srs_wkt (p, 10,
  1961         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  1962         -    add_srs_wkt (p, 11,
  1963         -        "2500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1964         -    add_srs_wkt (p, 12,
  1965         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1966         -    add_srs_wkt (p, 13,
  1967         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2676\"]]");
  1968         -    p = add_epsg_def_ex (filter, first, last, 2677, "epsg", 2677,
  1969         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 43", 0, 1,
  1970         -        "Krassowsky 1940", "Greenwich",
  1971         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  1972         -        "X", "North", "Y", "East");
  1973         -    add_proj4text (p, 0,
  1974         -        "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=43500000 +y_0=");
  1975         -    add_proj4text (p, 1,
  1976         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  1977         -    add_proj4text (p, 2,
  1978         -        ".22 +units=m +no_defs");
  1979         -    add_srs_wkt (p, 0,
  1980         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 43\",");
  1981         -    add_srs_wkt (p, 1,
  1982         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1983         -    add_srs_wkt (p, 2,
  1984         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1985         -    add_srs_wkt (p, 3,
  1986         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1987         -    add_srs_wkt (p, 4,
  1988         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1989         -    add_srs_wkt (p, 5,
  1990         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1991         -    add_srs_wkt (p, 6,
  1992         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1993         -    add_srs_wkt (p, 7,
  1994         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1995         -    add_srs_wkt (p, 8,
  1996         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1997         -    add_srs_wkt (p, 9,
  1998         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",129],PAR");
  1999         -    add_srs_wkt (p, 10,
  2000         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2001         -    add_srs_wkt (p, 11,
  2002         -        "3500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2003         -    add_srs_wkt (p, 12,
  2004         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2005         -    add_srs_wkt (p, 13,
  2006         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2677\"]]");
  2007         -    p = add_epsg_def_ex (filter, first, last, 2678, "epsg", 2678,
  2008         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 44", 0, 1,
  2009         -        "Krassowsky 1940", "Greenwich",
  2010         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2011         -        "X", "North", "Y", "East");
  2012         -    add_proj4text (p, 0,
  2013         -        "+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=44500000 +y_0=");
  2014         -    add_proj4text (p, 1,
  2015         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2016         -    add_proj4text (p, 2,
  2017         -        ".22 +units=m +no_defs");
  2018         -    add_srs_wkt (p, 0,
  2019         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 44\",");
  2020         -    add_srs_wkt (p, 1,
  2021         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2022         -    add_srs_wkt (p, 2,
  2023         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2024         -    add_srs_wkt (p, 3,
  2025         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2026         -    add_srs_wkt (p, 4,
  2027         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2028         -    add_srs_wkt (p, 5,
  2029         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2030         -    add_srs_wkt (p, 6,
  2031         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2032         -    add_srs_wkt (p, 7,
  2033         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2034         -    add_srs_wkt (p, 8,
  2035         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2036         -    add_srs_wkt (p, 9,
  2037         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",132],PAR");
  2038         -    add_srs_wkt (p, 10,
  2039         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2040         -    add_srs_wkt (p, 11,
  2041         -        "4500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2042         -    add_srs_wkt (p, 12,
  2043         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2044         -    add_srs_wkt (p, 13,
  2045         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2678\"]]");
  2046         -    p = add_epsg_def_ex (filter, first, last, 2679, "epsg", 2679,
  2047         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 45", 0, 1,
  2048         -        "Krassowsky 1940", "Greenwich",
  2049         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2050         -        "X", "North", "Y", "East");
  2051         -    add_proj4text (p, 0,
  2052         -        "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=45500000 +y_0=");
  2053         -    add_proj4text (p, 1,
  2054         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2055         -    add_proj4text (p, 2,
  2056         -        ".22 +units=m +no_defs");
  2057         -    add_srs_wkt (p, 0,
  2058         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 45\",");
  2059         -    add_srs_wkt (p, 1,
  2060         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2061         -    add_srs_wkt (p, 2,
  2062         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2063         -    add_srs_wkt (p, 3,
  2064         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2065         -    add_srs_wkt (p, 4,
  2066         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2067         -    add_srs_wkt (p, 5,
  2068         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2069         -    add_srs_wkt (p, 6,
  2070         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2071         -    add_srs_wkt (p, 7,
  2072         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2073         -    add_srs_wkt (p, 8,
  2074         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2075         -    add_srs_wkt (p, 9,
  2076         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",135],PAR");
  2077         -    add_srs_wkt (p, 10,
  2078         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2079         -    add_srs_wkt (p, 11,
  2080         -        "5500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2081         -    add_srs_wkt (p, 12,
  2082         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2083         -    add_srs_wkt (p, 13,
  2084         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2679\"]]");
  2085         -    p = add_epsg_def_ex (filter, first, last, 2680, "epsg", 2680,
  2086         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 46", 0, 1,
  2087         -        "Krassowsky 1940", "Greenwich",
  2088         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2089         -        "X", "North", "Y", "East");
  2090         -    add_proj4text (p, 0,
  2091         -        "+proj=tmerc +lat_0=0 +lon_0=138 +k=1 +x_0=46500000 +y_0=");
  2092         -    add_proj4text (p, 1,
  2093         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2094         -    add_proj4text (p, 2,
  2095         -        ".22 +units=m +no_defs");
  2096         -    add_srs_wkt (p, 0,
  2097         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 46\",");
  2098         -    add_srs_wkt (p, 1,
  2099         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2100         -    add_srs_wkt (p, 2,
  2101         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2102         -    add_srs_wkt (p, 3,
  2103         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2104         -    add_srs_wkt (p, 4,
  2105         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2106         -    add_srs_wkt (p, 5,
  2107         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2108         -    add_srs_wkt (p, 6,
  2109         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2110         -    add_srs_wkt (p, 7,
  2111         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2112         -    add_srs_wkt (p, 8,
  2113         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2114         -    add_srs_wkt (p, 9,
  2115         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",138],PAR");
  2116         -    add_srs_wkt (p, 10,
  2117         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2118         -    add_srs_wkt (p, 11,
  2119         -        "6500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2120         -    add_srs_wkt (p, 12,
  2121         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2122         -    add_srs_wkt (p, 13,
  2123         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2680\"]]");
  2124         -    p = add_epsg_def_ex (filter, first, last, 2681, "epsg", 2681,
  2125         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 47", 0, 1,
  2126         -        "Krassowsky 1940", "Greenwich",
  2127         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2128         -        "X", "North", "Y", "East");
  2129         -    add_proj4text (p, 0,
  2130         -        "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=47500000 +y_0=");
  2131         -    add_proj4text (p, 1,
  2132         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2133         -    add_proj4text (p, 2,
  2134         -        ".22 +units=m +no_defs");
  2135         -    add_srs_wkt (p, 0,
  2136         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 47\",");
  2137         -    add_srs_wkt (p, 1,
  2138         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2139         -    add_srs_wkt (p, 2,
  2140         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2141         -    add_srs_wkt (p, 3,
  2142         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2143         -    add_srs_wkt (p, 4,
  2144         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2145         -    add_srs_wkt (p, 5,
  2146         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2147         -    add_srs_wkt (p, 6,
  2148         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2149         -    add_srs_wkt (p, 7,
  2150         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2151         -    add_srs_wkt (p, 8,
  2152         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2153         -    add_srs_wkt (p, 9,
  2154         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",141],PAR");
  2155         -    add_srs_wkt (p, 10,
  2156         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2157         -    add_srs_wkt (p, 11,
  2158         -        "7500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2159         -    add_srs_wkt (p, 12,
  2160         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2161         -    add_srs_wkt (p, 13,
  2162         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2681\"]]");
  2163         -    p = add_epsg_def_ex (filter, first, last, 2682, "epsg", 2682,
  2164         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 48", 0, 1,
  2165         -        "Krassowsky 1940", "Greenwich",
  2166         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2167         -        "X", "North", "Y", "East");
  2168         -    add_proj4text (p, 0,
  2169         -        "+proj=tmerc +lat_0=0 +lon_0=144 +k=1 +x_0=48500000 +y_0=");
  2170         -    add_proj4text (p, 1,
  2171         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2172         -    add_proj4text (p, 2,
  2173         -        ".22 +units=m +no_defs");
  2174         -    add_srs_wkt (p, 0,
  2175         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 48\",");
  2176         -    add_srs_wkt (p, 1,
  2177         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2178         -    add_srs_wkt (p, 2,
  2179         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2180         -    add_srs_wkt (p, 3,
  2181         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2182         -    add_srs_wkt (p, 4,
  2183         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2184         -    add_srs_wkt (p, 5,
  2185         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2186         -    add_srs_wkt (p, 6,
  2187         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2188         -    add_srs_wkt (p, 7,
  2189         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2190         -    add_srs_wkt (p, 8,
  2191         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2192         -    add_srs_wkt (p, 9,
  2193         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",144],PAR");
  2194         -    add_srs_wkt (p, 10,
  2195         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2196         -    add_srs_wkt (p, 11,
  2197         -        "8500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2198         -    add_srs_wkt (p, 12,
  2199         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2200         -    add_srs_wkt (p, 13,
  2201         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2682\"]]");
  2202         -    p = add_epsg_def_ex (filter, first, last, 2683, "epsg", 2683,
  2203         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 49", 0, 1,
  2204         -        "Krassowsky 1940", "Greenwich",
  2205         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2206         -        "X", "North", "Y", "East");
  2207         -    add_proj4text (p, 0,
  2208         -        "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=49500000 +y_0=");
  2209         -    add_proj4text (p, 1,
  2210         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2211         -    add_proj4text (p, 2,
  2212         -        ".22 +units=m +no_defs");
  2213         -    add_srs_wkt (p, 0,
  2214         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 49\",");
  2215         -    add_srs_wkt (p, 1,
  2216         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2217         -    add_srs_wkt (p, 2,
  2218         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2219         -    add_srs_wkt (p, 3,
  2220         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2221         -    add_srs_wkt (p, 4,
  2222         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2223         -    add_srs_wkt (p, 5,
  2224         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2225         -    add_srs_wkt (p, 6,
  2226         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2227         -    add_srs_wkt (p, 7,
  2228         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2229         -    add_srs_wkt (p, 8,
  2230         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2231         -    add_srs_wkt (p, 9,
  2232         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",147],PAR");
  2233         -    add_srs_wkt (p, 10,
  2234         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",4");
  2235         -    add_srs_wkt (p, 11,
  2236         -        "9500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2237         -    add_srs_wkt (p, 12,
  2238         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2239         -    add_srs_wkt (p, 13,
  2240         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2683\"]]");
  2241         -    p = add_epsg_def_ex (filter, first, last, 2684, "epsg", 2684,
  2242         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 50", 0, 1,
  2243         -        "Krassowsky 1940", "Greenwich",
  2244         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2245         -        "X", "North", "Y", "East");
  2246         -    add_proj4text (p, 0,
  2247         -        "+proj=tmerc +lat_0=0 +lon_0=150 +k=1 +x_0=50500000 +y_0=");
  2248         -    add_proj4text (p, 1,
  2249         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2250         -    add_proj4text (p, 2,
  2251         -        ".22 +units=m +no_defs");
  2252         -    add_srs_wkt (p, 0,
  2253         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 50\",");
  2254         -    add_srs_wkt (p, 1,
  2255         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2256         -    add_srs_wkt (p, 2,
  2257         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2258         -    add_srs_wkt (p, 3,
  2259         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2260         -    add_srs_wkt (p, 4,
  2261         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2262         -    add_srs_wkt (p, 5,
  2263         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2264         -    add_srs_wkt (p, 6,
  2265         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2266         -    add_srs_wkt (p, 7,
  2267         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2268         -    add_srs_wkt (p, 8,
  2269         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2270         -    add_srs_wkt (p, 9,
  2271         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",150],PAR");
  2272         -    add_srs_wkt (p, 10,
  2273         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2274         -    add_srs_wkt (p, 11,
  2275         -        "0500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2276         -    add_srs_wkt (p, 12,
  2277         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2278         -    add_srs_wkt (p, 13,
  2279         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2684\"]]");
  2280         -    p = add_epsg_def_ex (filter, first, last, 2685, "epsg", 2685,
  2281         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 51", 0, 1,
  2282         -        "Krassowsky 1940", "Greenwich",
  2283         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2284         -        "X", "North", "Y", "East");
  2285         -    add_proj4text (p, 0,
  2286         -        "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=51500000 +y_0=");
  2287         -    add_proj4text (p, 1,
  2288         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2289         -    add_proj4text (p, 2,
  2290         -        ".22 +units=m +no_defs");
  2291         -    add_srs_wkt (p, 0,
  2292         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 51\",");
  2293         -    add_srs_wkt (p, 1,
  2294         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2295         -    add_srs_wkt (p, 2,
  2296         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2297         -    add_srs_wkt (p, 3,
  2298         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2299         -    add_srs_wkt (p, 4,
  2300         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2301         -    add_srs_wkt (p, 5,
  2302         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2303         -    add_srs_wkt (p, 6,
  2304         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2305         -    add_srs_wkt (p, 7,
  2306         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2307         -    add_srs_wkt (p, 8,
  2308         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2309         -    add_srs_wkt (p, 9,
  2310         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",153],PAR");
  2311         -    add_srs_wkt (p, 10,
  2312         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2313         -    add_srs_wkt (p, 11,
  2314         -        "1500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2315         -    add_srs_wkt (p, 12,
  2316         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2317         -    add_srs_wkt (p, 13,
  2318         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2685\"]]");
  2319         -    p = add_epsg_def_ex (filter, first, last, 2686, "epsg", 2686,
  2320         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 52", 0, 1,
  2321         -        "Krassowsky 1940", "Greenwich",
  2322         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2323         -        "X", "North", "Y", "East");
  2324         -    add_proj4text (p, 0,
  2325         -        "+proj=tmerc +lat_0=0 +lon_0=156 +k=1 +x_0=52500000 +y_0=");
  2326         -    add_proj4text (p, 1,
  2327         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2328         -    add_proj4text (p, 2,
  2329         -        ".22 +units=m +no_defs");
  2330         -    add_srs_wkt (p, 0,
  2331         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 52\",");
  2332         -    add_srs_wkt (p, 1,
  2333         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2334         -    add_srs_wkt (p, 2,
  2335         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2336         -    add_srs_wkt (p, 3,
  2337         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2338         -    add_srs_wkt (p, 4,
  2339         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2340         -    add_srs_wkt (p, 5,
  2341         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2342         -    add_srs_wkt (p, 6,
  2343         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2344         -    add_srs_wkt (p, 7,
  2345         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2346         -    add_srs_wkt (p, 8,
  2347         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2348         -    add_srs_wkt (p, 9,
  2349         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",156],PAR");
  2350         -    add_srs_wkt (p, 10,
  2351         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2352         -    add_srs_wkt (p, 11,
  2353         -        "2500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2354         -    add_srs_wkt (p, 12,
  2355         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2356         -    add_srs_wkt (p, 13,
  2357         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2686\"]]");
  2358         -    p = add_epsg_def_ex (filter, first, last, 2687, "epsg", 2687,
  2359         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 53", 0, 1,
  2360         -        "Krassowsky 1940", "Greenwich",
  2361         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2362         -        "X", "North", "Y", "East");
  2363         -    add_proj4text (p, 0,
  2364         -        "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=53500000 +y_0=");
  2365         -    add_proj4text (p, 1,
  2366         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2367         -    add_proj4text (p, 2,
  2368         -        ".22 +units=m +no_defs");
  2369         -    add_srs_wkt (p, 0,
  2370         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 53\",");
  2371         -    add_srs_wkt (p, 1,
  2372         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2373         -    add_srs_wkt (p, 2,
  2374         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2375         -    add_srs_wkt (p, 3,
  2376         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2377         -    add_srs_wkt (p, 4,
  2378         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2379         -    add_srs_wkt (p, 5,
  2380         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2381         -    add_srs_wkt (p, 6,
  2382         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2383         -    add_srs_wkt (p, 7,
  2384         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2385         -    add_srs_wkt (p, 8,
  2386         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2387         -    add_srs_wkt (p, 9,
  2388         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",159],PAR");
  2389         -    add_srs_wkt (p, 10,
  2390         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2391         -    add_srs_wkt (p, 11,
  2392         -        "3500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2393         -    add_srs_wkt (p, 12,
  2394         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2395         -    add_srs_wkt (p, 13,
  2396         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2687\"]]");
  2397         -    p = add_epsg_def_ex (filter, first, last, 2688, "epsg", 2688,
  2398         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 54", 0, 1,
  2399         -        "Krassowsky 1940", "Greenwich",
  2400         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2401         -        "X", "North", "Y", "East");
  2402         -    add_proj4text (p, 0,
  2403         -        "+proj=tmerc +lat_0=0 +lon_0=162 +k=1 +x_0=54500000 +y_0=");
  2404         -    add_proj4text (p, 1,
  2405         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2406         -    add_proj4text (p, 2,
  2407         -        ".22 +units=m +no_defs");
  2408         -    add_srs_wkt (p, 0,
  2409         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 54\",");
  2410         -    add_srs_wkt (p, 1,
  2411         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2412         -    add_srs_wkt (p, 2,
  2413         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2414         -    add_srs_wkt (p, 3,
  2415         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2416         -    add_srs_wkt (p, 4,
  2417         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2418         -    add_srs_wkt (p, 5,
  2419         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2420         -    add_srs_wkt (p, 6,
  2421         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2422         -    add_srs_wkt (p, 7,
  2423         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2424         -    add_srs_wkt (p, 8,
  2425         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2426         -    add_srs_wkt (p, 9,
  2427         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",162],PAR");
  2428         -    add_srs_wkt (p, 10,
  2429         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2430         -    add_srs_wkt (p, 11,
  2431         -        "4500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2432         -    add_srs_wkt (p, 12,
  2433         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2434         -    add_srs_wkt (p, 13,
  2435         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2688\"]]");
  2436         -    p = add_epsg_def_ex (filter, first, last, 2689, "epsg", 2689,
  2437         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 55", 0, 1,
  2438         -        "Krassowsky 1940", "Greenwich",
  2439         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2440         -        "X", "North", "Y", "East");
  2441         -    add_proj4text (p, 0,
  2442         -        "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=55500000 +y_0=");
  2443         -    add_proj4text (p, 1,
  2444         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2445         -    add_proj4text (p, 2,
  2446         -        ".22 +units=m +no_defs");
  2447         -    add_srs_wkt (p, 0,
  2448         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 55\",");
  2449         -    add_srs_wkt (p, 1,
  2450         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2451         -    add_srs_wkt (p, 2,
  2452         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2453         -    add_srs_wkt (p, 3,
  2454         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2455         -    add_srs_wkt (p, 4,
  2456         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2457         -    add_srs_wkt (p, 5,
  2458         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2459         -    add_srs_wkt (p, 6,
  2460         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2461         -    add_srs_wkt (p, 7,
  2462         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2463         -    add_srs_wkt (p, 8,
  2464         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2465         -    add_srs_wkt (p, 9,
  2466         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",165],PAR");
  2467         -    add_srs_wkt (p, 10,
  2468         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2469         -    add_srs_wkt (p, 11,
  2470         -        "5500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2471         -    add_srs_wkt (p, 12,
  2472         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2473         -    add_srs_wkt (p, 13,
  2474         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2689\"]]");
  2475         -    p = add_epsg_def_ex (filter, first, last, 2690, "epsg", 2690,
  2476         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 56", 0, 1,
  2477         -        "Krassowsky 1940", "Greenwich",
  2478         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2479         -        "X", "North", "Y", "East");
  2480         -    add_proj4text (p, 0,
  2481         -        "+proj=tmerc +lat_0=0 +lon_0=168 +k=1 +x_0=56500000 +y_0=");
  2482         -    add_proj4text (p, 1,
  2483         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2484         -    add_proj4text (p, 2,
  2485         -        ".22 +units=m +no_defs");
  2486         -    add_srs_wkt (p, 0,
  2487         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 56\",");
  2488         -    add_srs_wkt (p, 1,
  2489         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2490         -    add_srs_wkt (p, 2,
  2491         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2492         -    add_srs_wkt (p, 3,
  2493         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2494         -    add_srs_wkt (p, 4,
  2495         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2496         -    add_srs_wkt (p, 5,
  2497         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2498         -    add_srs_wkt (p, 6,
  2499         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2500         -    add_srs_wkt (p, 7,
  2501         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2502         -    add_srs_wkt (p, 8,
  2503         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2504         -    add_srs_wkt (p, 9,
  2505         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",168],PAR");
  2506         -    add_srs_wkt (p, 10,
  2507         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2508         -    add_srs_wkt (p, 11,
  2509         -        "6500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2510         -    add_srs_wkt (p, 12,
  2511         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2512         -    add_srs_wkt (p, 13,
  2513         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2690\"]]");
  2514         -    p = add_epsg_def_ex (filter, first, last, 2691, "epsg", 2691,
  2515         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 57", 0, 1,
  2516         -        "Krassowsky 1940", "Greenwich",
  2517         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2518         -        "X", "North", "Y", "East");
  2519         -    add_proj4text (p, 0,
  2520         -        "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=57500000 +y_0=");
  2521         -    add_proj4text (p, 1,
  2522         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2523         -    add_proj4text (p, 2,
  2524         -        ".22 +units=m +no_defs");
  2525         -    add_srs_wkt (p, 0,
  2526         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 57\",");
  2527         -    add_srs_wkt (p, 1,
  2528         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2529         -    add_srs_wkt (p, 2,
  2530         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2531         -    add_srs_wkt (p, 3,
  2532         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2533         -    add_srs_wkt (p, 4,
  2534         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2535         -    add_srs_wkt (p, 5,
  2536         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2537         -    add_srs_wkt (p, 6,
  2538         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2539         -    add_srs_wkt (p, 7,
  2540         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2541         -    add_srs_wkt (p, 8,
  2542         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2543         -    add_srs_wkt (p, 9,
  2544         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",171],PAR");
  2545         -    add_srs_wkt (p, 10,
  2546         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2547         -    add_srs_wkt (p, 11,
  2548         -        "7500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2549         -    add_srs_wkt (p, 12,
  2550         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2551         -    add_srs_wkt (p, 13,
  2552         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2691\"]]");
  2553         -    p = add_epsg_def_ex (filter, first, last, 2692, "epsg", 2692,
  2554         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 58", 0, 1,
  2555         -        "Krassowsky 1940", "Greenwich",
  2556         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2557         -        "X", "North", "Y", "East");
  2558         -    add_proj4text (p, 0,
  2559         -        "+proj=tmerc +lat_0=0 +lon_0=174 +k=1 +x_0=58500000 +y_0=");
  2560         -    add_proj4text (p, 1,
  2561         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2562         -    add_proj4text (p, 2,
  2563         -        ".22 +units=m +no_defs");
  2564         -    add_srs_wkt (p, 0,
  2565         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 58\",");
  2566         -    add_srs_wkt (p, 1,
  2567         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2568         -    add_srs_wkt (p, 2,
  2569         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2570         -    add_srs_wkt (p, 3,
  2571         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2572         -    add_srs_wkt (p, 4,
  2573         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2574         -    add_srs_wkt (p, 5,
  2575         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2576         -    add_srs_wkt (p, 6,
  2577         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2578         -    add_srs_wkt (p, 7,
  2579         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2580         -    add_srs_wkt (p, 8,
  2581         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2582         -    add_srs_wkt (p, 9,
  2583         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",174],PAR");
  2584         -    add_srs_wkt (p, 10,
  2585         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2586         -    add_srs_wkt (p, 11,
  2587         -        "8500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2588         -    add_srs_wkt (p, 12,
  2589         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2590         -    add_srs_wkt (p, 13,
  2591         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2692\"]]");
  2592         -    p = add_epsg_def_ex (filter, first, last, 2693, "epsg", 2693,
  2593         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 59", 0, 1,
  2594         -        "Krassowsky 1940", "Greenwich",
  2595         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2596         -        "X", "North", "Y", "East");
  2597         -    add_proj4text (p, 0,
  2598         -        "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=59500000 +y_0=");
  2599         -    add_proj4text (p, 1,
  2600         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2601         -    add_proj4text (p, 2,
  2602         -        ".22 +units=m +no_defs");
  2603         -    add_srs_wkt (p, 0,
  2604         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 59\",");
  2605         -    add_srs_wkt (p, 1,
  2606         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2607         -    add_srs_wkt (p, 2,
  2608         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2609         -    add_srs_wkt (p, 3,
  2610         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2611         -    add_srs_wkt (p, 4,
  2612         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2613         -    add_srs_wkt (p, 5,
  2614         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2615         -    add_srs_wkt (p, 6,
  2616         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2617         -    add_srs_wkt (p, 7,
  2618         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2619         -    add_srs_wkt (p, 8,
  2620         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2621         -    add_srs_wkt (p, 9,
  2622         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",177],PAR");
  2623         -    add_srs_wkt (p, 10,
  2624         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  2625         -    add_srs_wkt (p, 11,
  2626         -        "9500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  2627         -    add_srs_wkt (p, 12,
  2628         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  2629         -    add_srs_wkt (p, 13,
  2630         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"2693\"]]");
  2631         -    p = add_epsg_def_ex (filter, first, last, 2694, "epsg", 2694,
  2632         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 60 (deprecated)", 0, 1,
  2633         -        "Krassowsky 1940", "Greenwich",
  2634         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2635         -        "X", "North", "Y", "East");
  2636         -    add_proj4text (p, 0,
  2637         -        "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=60000000 +y_0=");
  2638         -    add_proj4text (p, 1,
  2639         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
  2640         -    add_proj4text (p, 2,
  2641         -        ".22 +units=m +no_defs");
  2642         -    add_srs_wkt (p, 0,
  2643         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 60 (d");
  2644         -    add_srs_wkt (p, 1,
  2645         -        "eprecated)\",GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_199");
  2646         -    add_srs_wkt (p, 2,
  2647         -        "5\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY");
  2648         -    add_srs_wkt (p, 3,
  2649         -        "[\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.");
  2650         -    add_srs_wkt (p, 4,
  2651         -        "13,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwi");
  2652         -    add_srs_wkt (p, 5,
  2653         -        "ch\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0");
  2654         -    add_srs_wkt (p, 6,
  2655         -        "174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lat");
  2656         -    add_srs_wkt (p, 7,
  2657         -        "itude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG");
  2658         -    add_srs_wkt (p, 8,
  2659         -        "\",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARAME");
  2660         -    add_srs_wkt (p, 9,
  2661         -        "TER[\"latitude_of_origin\",0],PARAMETER[\"central_meridi");
  2662         -    add_srs_wkt (p, 10,
  2663         -        "an\",180],PARAMETER[\"scale_factor\",1],PARAMETER[\"fals");
  2664         -    add_srs_wkt (p, 11,
  2665         -        "e_easting\",60000000],PARAMETER[\"false_northing\",0],UN");
  2666         -    add_srs_wkt (p, 12,
  2667         -        "IT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",");
  2668         -    add_srs_wkt (p, 13,
  2669         -        "NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"2694\"]]");
  2670         -    p = add_epsg_def_ex (filter, first, last, 2695, "epsg", 2695,
  2671         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 61", 0, 1,
  2672         -        "Krassowsky 1940", "Greenwich",
  2673         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2674         -        "X", "North", "Y", "East");
  2675         -    add_proj4text (p, 0,
  2676         -        "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=61500000 +y_0");
  2677         -    add_proj4text (p, 1,
  2678         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
  2679         -    add_proj4text (p, 2,
  2680         -        "0.22 +units=m +no_defs");
  2681         -    add_srs_wkt (p, 0,
  2682         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 61\",");
  2683         -    add_srs_wkt (p, 1,
  2684         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2685         -    add_srs_wkt (p, 2,
  2686         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2687         -    add_srs_wkt (p, 3,
  2688         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2689         -    add_srs_wkt (p, 4,
  2690         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2691         -    add_srs_wkt (p, 5,
  2692         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2693         -    add_srs_wkt (p, 6,
  2694         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2695         -    add_srs_wkt (p, 7,
  2696         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2697         -    add_srs_wkt (p, 8,
  2698         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2699         -    add_srs_wkt (p, 9,
  2700         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-177],PA");
  2701         -    add_srs_wkt (p, 10,
  2702         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  2703         -    add_srs_wkt (p, 11,
  2704         -        "61500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2705         -    add_srs_wkt (p, 12,
  2706         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2707         -    add_srs_wkt (p, 13,
  2708         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2695\"]]");
  2709         -    p = add_epsg_def_ex (filter, first, last, 2696, "epsg", 2696,
  2710         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 62", 0, 1,
  2711         -        "Krassowsky 1940", "Greenwich",
  2712         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2713         -        "X", "North", "Y", "East");
  2714         -    add_proj4text (p, 0,
  2715         -        "+proj=tmerc +lat_0=0 +lon_0=-174 +k=1 +x_0=62500000 +y_0");
  2716         -    add_proj4text (p, 1,
  2717         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
  2718         -    add_proj4text (p, 2,
  2719         -        "0.22 +units=m +no_defs");
  2720         -    add_srs_wkt (p, 0,
  2721         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 62\",");
  2722         -    add_srs_wkt (p, 1,
  2723         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2724         -    add_srs_wkt (p, 2,
  2725         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2726         -    add_srs_wkt (p, 3,
  2727         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2728         -    add_srs_wkt (p, 4,
  2729         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2730         -    add_srs_wkt (p, 5,
  2731         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2732         -    add_srs_wkt (p, 6,
  2733         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2734         -    add_srs_wkt (p, 7,
  2735         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2736         -    add_srs_wkt (p, 8,
  2737         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2738         -    add_srs_wkt (p, 9,
  2739         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-174],PA");
  2740         -    add_srs_wkt (p, 10,
  2741         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  2742         -    add_srs_wkt (p, 11,
  2743         -        "62500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2744         -    add_srs_wkt (p, 12,
  2745         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2746         -    add_srs_wkt (p, 13,
  2747         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2696\"]]");
  2748         -    p = add_epsg_def_ex (filter, first, last, 2697, "epsg", 2697,
  2749         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 63", 0, 1,
  2750         -        "Krassowsky 1940", "Greenwich",
  2751         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2752         -        "X", "North", "Y", "East");
  2753         -    add_proj4text (p, 0,
  2754         -        "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=63500000 +y_0");
  2755         -    add_proj4text (p, 1,
  2756         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
  2757         -    add_proj4text (p, 2,
  2758         -        "0.22 +units=m +no_defs");
  2759         -    add_srs_wkt (p, 0,
  2760         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 63\",");
  2761         -    add_srs_wkt (p, 1,
  2762         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2763         -    add_srs_wkt (p, 2,
  2764         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2765         -    add_srs_wkt (p, 3,
  2766         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2767         -    add_srs_wkt (p, 4,
  2768         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2769         -    add_srs_wkt (p, 5,
  2770         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2771         -    add_srs_wkt (p, 6,
  2772         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2773         -    add_srs_wkt (p, 7,
  2774         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2775         -    add_srs_wkt (p, 8,
  2776         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2777         -    add_srs_wkt (p, 9,
  2778         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-171],PA");
  2779         -    add_srs_wkt (p, 10,
  2780         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  2781         -    add_srs_wkt (p, 11,
  2782         -        "63500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2783         -    add_srs_wkt (p, 12,
  2784         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2785         -    add_srs_wkt (p, 13,
  2786         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2697\"]]");
  2787         -    p = add_epsg_def_ex (filter, first, last, 2698, "epsg", 2698,
  2788         -        "Pulkovo 1995 / 3-degree Gauss-Kruger zone 64", 0, 1,
  2789         -        "Krassowsky 1940", "Greenwich",
  2790         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2791         -        "X", "North", "Y", "East");
  2792         -    add_proj4text (p, 0,
  2793         -        "+proj=tmerc +lat_0=0 +lon_0=-168 +k=1 +x_0=64500000 +y_0");
  2794         -    add_proj4text (p, 1,
  2795         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
  2796         -    add_proj4text (p, 2,
  2797         -        "0.22 +units=m +no_defs");
  2798         -    add_srs_wkt (p, 0,
  2799         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 64\",");
  2800         -    add_srs_wkt (p, 1,
  2801         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2802         -    add_srs_wkt (p, 2,
  2803         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2804         -    add_srs_wkt (p, 3,
  2805         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  2806         -    add_srs_wkt (p, 4,
  2807         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2808         -    add_srs_wkt (p, 5,
  2809         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2810         -    add_srs_wkt (p, 6,
  2811         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  2812         -    add_srs_wkt (p, 7,
  2813         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  2814         -    add_srs_wkt (p, 8,
  2815         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  2816         -    add_srs_wkt (p, 9,
  2817         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-168],PA");
  2818         -    add_srs_wkt (p, 10,
  2819         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  2820         -    add_srs_wkt (p, 11,
  2821         -        "64500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2822         -    add_srs_wkt (p, 12,
  2823         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2824         -    add_srs_wkt (p, 13,
  2825         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"2698\"]]");
  2826         -    p = add_epsg_def_ex (filter, first, last, 2699, "epsg", 2699,
  2827         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E", 0, 1,
  2828         -        "Krassowsky 1940", "Greenwich",
  2829         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2830         -        "X", "North", "Y", "East");
  2831         -    add_proj4text (p, 0,
  2832         -        "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
  2833         -    add_proj4text (p, 1,
  2834         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  2835         -    add_proj4text (p, 2,
  2836         -        " +units=m +no_defs");
  2837         -    add_srs_wkt (p, 0,
  2838         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E\",G");
  2839         -    add_srs_wkt (p, 1,
  2840         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  2841         -    add_srs_wkt (p, 2,
  2842         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2843         -    add_srs_wkt (p, 3,
  2844         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  2845         -    add_srs_wkt (p, 4,
  2846         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  2847         -    add_srs_wkt (p, 5,
  2848         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  2849         -    add_srs_wkt (p, 6,
  2850         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  2851         -    add_srs_wkt (p, 7,
  2852         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  2853         -    add_srs_wkt (p, 8,
  2854         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  2855         -    add_srs_wkt (p, 9,
  2856         -        "of_origin\",0],PARAMETER[\"central_meridian\",21],PARAME");
  2857         -    add_srs_wkt (p, 10,
  2858         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  2859         -    add_srs_wkt (p, 11,
  2860         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  2861         -    add_srs_wkt (p, 12,
  2862         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  2863         -    add_srs_wkt (p, 13,
  2864         -        "EAST],AUTHORITY[\"EPSG\",\"2699\"]]");
  2865         -    p = add_epsg_def_ex (filter, first, last, 2700, "epsg", 2700,
  2866         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E", 0, 1,
  2867         -        "Krassowsky 1940", "Greenwich",
  2868         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2869         -        "X", "North", "Y", "East");
  2870         -    add_proj4text (p, 0,
  2871         -        "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=500000 +y_0=0 +");
  2872         -    add_proj4text (p, 1,
  2873         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  2874         -    add_proj4text (p, 2,
  2875         -        " +units=m +no_defs");
  2876         -    add_srs_wkt (p, 0,
  2877         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E\",G");
  2878         -    add_srs_wkt (p, 1,
  2879         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  2880         -    add_srs_wkt (p, 2,
  2881         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2882         -    add_srs_wkt (p, 3,
  2883         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  2884         -    add_srs_wkt (p, 4,
  2885         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  2886         -    add_srs_wkt (p, 5,
  2887         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  2888         -    add_srs_wkt (p, 6,
  2889         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  2890         -    add_srs_wkt (p, 7,
  2891         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  2892         -    add_srs_wkt (p, 8,
  2893         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  2894         -    add_srs_wkt (p, 9,
  2895         -        "of_origin\",0],PARAMETER[\"central_meridian\",24],PARAME");
  2896         -    add_srs_wkt (p, 10,
  2897         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  2898         -    add_srs_wkt (p, 11,
  2899         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  2900         -    add_srs_wkt (p, 12,
  2901         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  2902         -    add_srs_wkt (p, 13,
  2903         -        "EAST],AUTHORITY[\"EPSG\",\"2700\"]]");
  2904         -    p = add_epsg_def_ex (filter, first, last, 2701, "epsg", 2701,
  2905         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E", 0, 1,
  2906         -        "Krassowsky 1940", "Greenwich",
  2907         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2908         -        "X", "North", "Y", "East");
  2909         -    add_proj4text (p, 0,
  2910         -        "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
  2911         -    add_proj4text (p, 1,
  2912         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  2913         -    add_proj4text (p, 2,
  2914         -        " +units=m +no_defs");
  2915         -    add_srs_wkt (p, 0,
  2916         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E\",G");
  2917         -    add_srs_wkt (p, 1,
  2918         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  2919         -    add_srs_wkt (p, 2,
  2920         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2921         -    add_srs_wkt (p, 3,
  2922         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  2923         -    add_srs_wkt (p, 4,
  2924         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  2925         -    add_srs_wkt (p, 5,
  2926         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  2927         -    add_srs_wkt (p, 6,
  2928         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  2929         -    add_srs_wkt (p, 7,
  2930         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  2931         -    add_srs_wkt (p, 8,
  2932         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  2933         -    add_srs_wkt (p, 9,
  2934         -        "of_origin\",0],PARAMETER[\"central_meridian\",27],PARAME");
  2935         -    add_srs_wkt (p, 10,
  2936         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  2937         -    add_srs_wkt (p, 11,
  2938         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  2939         -    add_srs_wkt (p, 12,
  2940         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  2941         -    add_srs_wkt (p, 13,
  2942         -        "EAST],AUTHORITY[\"EPSG\",\"2701\"]]");
  2943         -    p = add_epsg_def_ex (filter, first, last, 2702, "epsg", 2702,
  2944         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E", 0, 1,
  2945         -        "Krassowsky 1940", "Greenwich",
  2946         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2947         -        "X", "North", "Y", "East");
  2948         -    add_proj4text (p, 0,
  2949         -        "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=500000 +y_0=0 +");
  2950         -    add_proj4text (p, 1,
  2951         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  2952         -    add_proj4text (p, 2,
  2953         -        " +units=m +no_defs");
  2954         -    add_srs_wkt (p, 0,
  2955         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E\",G");
  2956         -    add_srs_wkt (p, 1,
  2957         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  2958         -    add_srs_wkt (p, 2,
  2959         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2960         -    add_srs_wkt (p, 3,
  2961         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  2962         -    add_srs_wkt (p, 4,
  2963         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  2964         -    add_srs_wkt (p, 5,
  2965         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  2966         -    add_srs_wkt (p, 6,
  2967         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  2968         -    add_srs_wkt (p, 7,
  2969         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  2970         -    add_srs_wkt (p, 8,
  2971         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  2972         -    add_srs_wkt (p, 9,
  2973         -        "of_origin\",0],PARAMETER[\"central_meridian\",30],PARAME");
  2974         -    add_srs_wkt (p, 10,
  2975         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  2976         -    add_srs_wkt (p, 11,
  2977         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  2978         -    add_srs_wkt (p, 12,
  2979         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  2980         -    add_srs_wkt (p, 13,
  2981         -        "EAST],AUTHORITY[\"EPSG\",\"2702\"]]");
  2982         -    p = add_epsg_def_ex (filter, first, last, 2703, "epsg", 2703,
  2983         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E", 0, 1,
  2984         -        "Krassowsky 1940", "Greenwich",
  2985         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  2986         -        "X", "North", "Y", "East");
  2987         -    add_proj4text (p, 0,
  2988         -        "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
  2989         -    add_proj4text (p, 1,
  2990         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  2991         -    add_proj4text (p, 2,
  2992         -        " +units=m +no_defs");
  2993         -    add_srs_wkt (p, 0,
  2994         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E\",G");
  2995         -    add_srs_wkt (p, 1,
  2996         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  2997         -    add_srs_wkt (p, 2,
  2998         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  2999         -    add_srs_wkt (p, 3,
  3000         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3001         -    add_srs_wkt (p, 4,
  3002         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3003         -    add_srs_wkt (p, 5,
  3004         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3005         -    add_srs_wkt (p, 6,
  3006         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3007         -    add_srs_wkt (p, 7,
  3008         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3009         -    add_srs_wkt (p, 8,
  3010         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3011         -    add_srs_wkt (p, 9,
  3012         -        "of_origin\",0],PARAMETER[\"central_meridian\",33],PARAME");
  3013         -    add_srs_wkt (p, 10,
  3014         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3015         -    add_srs_wkt (p, 11,
  3016         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3017         -    add_srs_wkt (p, 12,
  3018         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3019         -    add_srs_wkt (p, 13,
  3020         -        "EAST],AUTHORITY[\"EPSG\",\"2703\"]]");
  3021         -    p = add_epsg_def_ex (filter, first, last, 2704, "epsg", 2704,
  3022         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E", 0, 1,
  3023         -        "Krassowsky 1940", "Greenwich",
  3024         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3025         -        "X", "North", "Y", "East");
  3026         -    add_proj4text (p, 0,
  3027         -        "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=500000 +y_0=0 +");
  3028         -    add_proj4text (p, 1,
  3029         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3030         -    add_proj4text (p, 2,
  3031         -        " +units=m +no_defs");
  3032         -    add_srs_wkt (p, 0,
  3033         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E\",G");
  3034         -    add_srs_wkt (p, 1,
  3035         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3036         -    add_srs_wkt (p, 2,
  3037         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3038         -    add_srs_wkt (p, 3,
  3039         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3040         -    add_srs_wkt (p, 4,
  3041         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3042         -    add_srs_wkt (p, 5,
  3043         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3044         -    add_srs_wkt (p, 6,
  3045         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3046         -    add_srs_wkt (p, 7,
  3047         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3048         -    add_srs_wkt (p, 8,
  3049         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3050         -    add_srs_wkt (p, 9,
  3051         -        "of_origin\",0],PARAMETER[\"central_meridian\",36],PARAME");
  3052         -    add_srs_wkt (p, 10,
  3053         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3054         -    add_srs_wkt (p, 11,
  3055         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3056         -    add_srs_wkt (p, 12,
  3057         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3058         -    add_srs_wkt (p, 13,
  3059         -        "EAST],AUTHORITY[\"EPSG\",\"2704\"]]");
  3060         -    p = add_epsg_def_ex (filter, first, last, 2705, "epsg", 2705,
  3061         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E", 0, 1,
  3062         -        "Krassowsky 1940", "Greenwich",
  3063         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3064         -        "X", "North", "Y", "East");
  3065         -    add_proj4text (p, 0,
  3066         -        "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
  3067         -    add_proj4text (p, 1,
  3068         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3069         -    add_proj4text (p, 2,
  3070         -        " +units=m +no_defs");
  3071         -    add_srs_wkt (p, 0,
  3072         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E\",G");
  3073         -    add_srs_wkt (p, 1,
  3074         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3075         -    add_srs_wkt (p, 2,
  3076         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3077         -    add_srs_wkt (p, 3,
  3078         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3079         -    add_srs_wkt (p, 4,
  3080         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3081         -    add_srs_wkt (p, 5,
  3082         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3083         -    add_srs_wkt (p, 6,
  3084         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3085         -    add_srs_wkt (p, 7,
  3086         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3087         -    add_srs_wkt (p, 8,
  3088         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3089         -    add_srs_wkt (p, 9,
  3090         -        "of_origin\",0],PARAMETER[\"central_meridian\",39],PARAME");
  3091         -    add_srs_wkt (p, 10,
  3092         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3093         -    add_srs_wkt (p, 11,
  3094         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3095         -    add_srs_wkt (p, 12,
  3096         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3097         -    add_srs_wkt (p, 13,
  3098         -        "EAST],AUTHORITY[\"EPSG\",\"2705\"]]");
  3099         -    p = add_epsg_def_ex (filter, first, last, 2706, "epsg", 2706,
  3100         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E", 0, 1,
  3101         -        "Krassowsky 1940", "Greenwich",
  3102         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3103         -        "X", "North", "Y", "East");
  3104         -    add_proj4text (p, 0,
  3105         -        "+proj=tmerc +lat_0=0 +lon_0=42 +k=1 +x_0=500000 +y_0=0 +");
  3106         -    add_proj4text (p, 1,
  3107         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3108         -    add_proj4text (p, 2,
  3109         -        " +units=m +no_defs");
  3110         -    add_srs_wkt (p, 0,
  3111         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E\",G");
  3112         -    add_srs_wkt (p, 1,
  3113         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3114         -    add_srs_wkt (p, 2,
  3115         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3116         -    add_srs_wkt (p, 3,
  3117         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3118         -    add_srs_wkt (p, 4,
  3119         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3120         -    add_srs_wkt (p, 5,
  3121         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3122         -    add_srs_wkt (p, 6,
  3123         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3124         -    add_srs_wkt (p, 7,
  3125         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3126         -    add_srs_wkt (p, 8,
  3127         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3128         -    add_srs_wkt (p, 9,
  3129         -        "of_origin\",0],PARAMETER[\"central_meridian\",42],PARAME");
  3130         -    add_srs_wkt (p, 10,
  3131         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3132         -    add_srs_wkt (p, 11,
  3133         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3134         -    add_srs_wkt (p, 12,
  3135         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3136         -    add_srs_wkt (p, 13,
  3137         -        "EAST],AUTHORITY[\"EPSG\",\"2706\"]]");
  3138         -    p = add_epsg_def_ex (filter, first, last, 2707, "epsg", 2707,
  3139         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E", 0, 1,
  3140         -        "Krassowsky 1940", "Greenwich",
  3141         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3142         -        "X", "North", "Y", "East");
  3143         -    add_proj4text (p, 0,
  3144         -        "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
  3145         -    add_proj4text (p, 1,
  3146         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3147         -    add_proj4text (p, 2,
  3148         -        " +units=m +no_defs");
  3149         -    add_srs_wkt (p, 0,
  3150         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E\",G");
  3151         -    add_srs_wkt (p, 1,
  3152         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3153         -    add_srs_wkt (p, 2,
  3154         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3155         -    add_srs_wkt (p, 3,
  3156         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3157         -    add_srs_wkt (p, 4,
  3158         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3159         -    add_srs_wkt (p, 5,
  3160         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3161         -    add_srs_wkt (p, 6,
  3162         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3163         -    add_srs_wkt (p, 7,
  3164         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3165         -    add_srs_wkt (p, 8,
  3166         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3167         -    add_srs_wkt (p, 9,
  3168         -        "of_origin\",0],PARAMETER[\"central_meridian\",45],PARAME");
  3169         -    add_srs_wkt (p, 10,
  3170         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3171         -    add_srs_wkt (p, 11,
  3172         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3173         -    add_srs_wkt (p, 12,
  3174         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3175         -    add_srs_wkt (p, 13,
  3176         -        "EAST],AUTHORITY[\"EPSG\",\"2707\"]]");
  3177         -    p = add_epsg_def_ex (filter, first, last, 2708, "epsg", 2708,
  3178         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E", 0, 1,
  3179         -        "Krassowsky 1940", "Greenwich",
  3180         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3181         -        "X", "North", "Y", "East");
  3182         -    add_proj4text (p, 0,
  3183         -        "+proj=tmerc +lat_0=0 +lon_0=48 +k=1 +x_0=500000 +y_0=0 +");
  3184         -    add_proj4text (p, 1,
  3185         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3186         -    add_proj4text (p, 2,
  3187         -        " +units=m +no_defs");
  3188         -    add_srs_wkt (p, 0,
  3189         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E\",G");
  3190         -    add_srs_wkt (p, 1,
  3191         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3192         -    add_srs_wkt (p, 2,
  3193         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3194         -    add_srs_wkt (p, 3,
  3195         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3196         -    add_srs_wkt (p, 4,
  3197         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3198         -    add_srs_wkt (p, 5,
  3199         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3200         -    add_srs_wkt (p, 6,
  3201         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3202         -    add_srs_wkt (p, 7,
  3203         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3204         -    add_srs_wkt (p, 8,
  3205         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3206         -    add_srs_wkt (p, 9,
  3207         -        "of_origin\",0],PARAMETER[\"central_meridian\",48],PARAME");
  3208         -    add_srs_wkt (p, 10,
  3209         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3210         -    add_srs_wkt (p, 11,
  3211         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3212         -    add_srs_wkt (p, 12,
  3213         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3214         -    add_srs_wkt (p, 13,
  3215         -        "EAST],AUTHORITY[\"EPSG\",\"2708\"]]");
  3216         -    p = add_epsg_def_ex (filter, first, last, 2709, "epsg", 2709,
  3217         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E", 0, 1,
  3218         -        "Krassowsky 1940", "Greenwich",
  3219         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3220         -        "X", "North", "Y", "East");
  3221         -    add_proj4text (p, 0,
  3222         -        "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
  3223         -    add_proj4text (p, 1,
  3224         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3225         -    add_proj4text (p, 2,
  3226         -        " +units=m +no_defs");
  3227         -    add_srs_wkt (p, 0,
  3228         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E\",G");
  3229         -    add_srs_wkt (p, 1,
  3230         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3231         -    add_srs_wkt (p, 2,
  3232         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3233         -    add_srs_wkt (p, 3,
  3234         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3235         -    add_srs_wkt (p, 4,
  3236         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3237         -    add_srs_wkt (p, 5,
  3238         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3239         -    add_srs_wkt (p, 6,
  3240         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3241         -    add_srs_wkt (p, 7,
  3242         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3243         -    add_srs_wkt (p, 8,
  3244         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3245         -    add_srs_wkt (p, 9,
  3246         -        "of_origin\",0],PARAMETER[\"central_meridian\",51],PARAME");
  3247         -    add_srs_wkt (p, 10,
  3248         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3249         -    add_srs_wkt (p, 11,
  3250         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3251         -    add_srs_wkt (p, 12,
  3252         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3253         -    add_srs_wkt (p, 13,
  3254         -        "EAST],AUTHORITY[\"EPSG\",\"2709\"]]");
  3255         -    p = add_epsg_def_ex (filter, first, last, 2710, "epsg", 2710,
  3256         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E", 0, 1,
  3257         -        "Krassowsky 1940", "Greenwich",
  3258         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3259         -        "X", "North", "Y", "East");
  3260         -    add_proj4text (p, 0,
  3261         -        "+proj=tmerc +lat_0=0 +lon_0=54 +k=1 +x_0=500000 +y_0=0 +");
  3262         -    add_proj4text (p, 1,
  3263         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3264         -    add_proj4text (p, 2,
  3265         -        " +units=m +no_defs");
  3266         -    add_srs_wkt (p, 0,
  3267         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E\",G");
  3268         -    add_srs_wkt (p, 1,
  3269         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3270         -    add_srs_wkt (p, 2,
  3271         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3272         -    add_srs_wkt (p, 3,
  3273         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3274         -    add_srs_wkt (p, 4,
  3275         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3276         -    add_srs_wkt (p, 5,
  3277         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3278         -    add_srs_wkt (p, 6,
  3279         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3280         -    add_srs_wkt (p, 7,
  3281         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3282         -    add_srs_wkt (p, 8,
  3283         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3284         -    add_srs_wkt (p, 9,
  3285         -        "of_origin\",0],PARAMETER[\"central_meridian\",54],PARAME");
  3286         -    add_srs_wkt (p, 10,
  3287         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3288         -    add_srs_wkt (p, 11,
  3289         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3290         -    add_srs_wkt (p, 12,
  3291         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3292         -    add_srs_wkt (p, 13,
  3293         -        "EAST],AUTHORITY[\"EPSG\",\"2710\"]]");
  3294         -    p = add_epsg_def_ex (filter, first, last, 2711, "epsg", 2711,
  3295         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E", 0, 1,
  3296         -        "Krassowsky 1940", "Greenwich",
  3297         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3298         -        "X", "North", "Y", "East");
  3299         -    add_proj4text (p, 0,
  3300         -        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
  3301         -    add_proj4text (p, 1,
  3302         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3303         -    add_proj4text (p, 2,
  3304         -        " +units=m +no_defs");
  3305         -    add_srs_wkt (p, 0,
  3306         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E\",G");
  3307         -    add_srs_wkt (p, 1,
  3308         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3309         -    add_srs_wkt (p, 2,
  3310         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3311         -    add_srs_wkt (p, 3,
  3312         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3313         -    add_srs_wkt (p, 4,
  3314         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3315         -    add_srs_wkt (p, 5,
  3316         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3317         -    add_srs_wkt (p, 6,
  3318         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3319         -    add_srs_wkt (p, 7,
  3320         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3321         -    add_srs_wkt (p, 8,
  3322         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3323         -    add_srs_wkt (p, 9,
  3324         -        "of_origin\",0],PARAMETER[\"central_meridian\",57],PARAME");
  3325         -    add_srs_wkt (p, 10,
  3326         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3327         -    add_srs_wkt (p, 11,
  3328         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3329         -    add_srs_wkt (p, 12,
  3330         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3331         -    add_srs_wkt (p, 13,
  3332         -        "EAST],AUTHORITY[\"EPSG\",\"2711\"]]");
  3333         -    p = add_epsg_def_ex (filter, first, last, 2712, "epsg", 2712,
  3334         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E", 0, 1,
  3335         -        "Krassowsky 1940", "Greenwich",
  3336         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3337         -        "X", "North", "Y", "East");
  3338         -    add_proj4text (p, 0,
  3339         -        "+proj=tmerc +lat_0=0 +lon_0=60 +k=1 +x_0=500000 +y_0=0 +");
  3340         -    add_proj4text (p, 1,
  3341         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3342         -    add_proj4text (p, 2,
  3343         -        " +units=m +no_defs");
  3344         -    add_srs_wkt (p, 0,
  3345         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E\",G");
  3346         -    add_srs_wkt (p, 1,
  3347         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3348         -    add_srs_wkt (p, 2,
  3349         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3350         -    add_srs_wkt (p, 3,
  3351         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3352         -    add_srs_wkt (p, 4,
  3353         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3354         -    add_srs_wkt (p, 5,
  3355         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3356         -    add_srs_wkt (p, 6,
  3357         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3358         -    add_srs_wkt (p, 7,
  3359         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3360         -    add_srs_wkt (p, 8,
  3361         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3362         -    add_srs_wkt (p, 9,
  3363         -        "of_origin\",0],PARAMETER[\"central_meridian\",60],PARAME");
  3364         -    add_srs_wkt (p, 10,
  3365         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3366         -    add_srs_wkt (p, 11,
  3367         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3368         -    add_srs_wkt (p, 12,
  3369         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3370         -    add_srs_wkt (p, 13,
  3371         -        "EAST],AUTHORITY[\"EPSG\",\"2712\"]]");
  3372         -    p = add_epsg_def_ex (filter, first, last, 2713, "epsg", 2713,
  3373         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E", 0, 1,
  3374         -        "Krassowsky 1940", "Greenwich",
  3375         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3376         -        "X", "North", "Y", "East");
  3377         -    add_proj4text (p, 0,
  3378         -        "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
  3379         -    add_proj4text (p, 1,
  3380         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3381         -    add_proj4text (p, 2,
  3382         -        " +units=m +no_defs");
  3383         -    add_srs_wkt (p, 0,
  3384         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E\",G");
  3385         -    add_srs_wkt (p, 1,
  3386         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3387         -    add_srs_wkt (p, 2,
  3388         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3389         -    add_srs_wkt (p, 3,
  3390         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3391         -    add_srs_wkt (p, 4,
  3392         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3393         -    add_srs_wkt (p, 5,
  3394         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3395         -    add_srs_wkt (p, 6,
  3396         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3397         -    add_srs_wkt (p, 7,
  3398         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3399         -    add_srs_wkt (p, 8,
  3400         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3401         -    add_srs_wkt (p, 9,
  3402         -        "of_origin\",0],PARAMETER[\"central_meridian\",63],PARAME");
  3403         -    add_srs_wkt (p, 10,
  3404         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3405         -    add_srs_wkt (p, 11,
  3406         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3407         -    add_srs_wkt (p, 12,
  3408         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3409         -    add_srs_wkt (p, 13,
  3410         -        "EAST],AUTHORITY[\"EPSG\",\"2713\"]]");
  3411         -    p = add_epsg_def_ex (filter, first, last, 2714, "epsg", 2714,
  3412         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E", 0, 1,
  3413         -        "Krassowsky 1940", "Greenwich",
  3414         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3415         -        "X", "North", "Y", "East");
  3416         -    add_proj4text (p, 0,
  3417         -        "+proj=tmerc +lat_0=0 +lon_0=66 +k=1 +x_0=500000 +y_0=0 +");
  3418         -    add_proj4text (p, 1,
  3419         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3420         -    add_proj4text (p, 2,
  3421         -        " +units=m +no_defs");
  3422         -    add_srs_wkt (p, 0,
  3423         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E\",G");
  3424         -    add_srs_wkt (p, 1,
  3425         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3426         -    add_srs_wkt (p, 2,
  3427         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3428         -    add_srs_wkt (p, 3,
  3429         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3430         -    add_srs_wkt (p, 4,
  3431         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3432         -    add_srs_wkt (p, 5,
  3433         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3434         -    add_srs_wkt (p, 6,
  3435         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3436         -    add_srs_wkt (p, 7,
  3437         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3438         -    add_srs_wkt (p, 8,
  3439         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3440         -    add_srs_wkt (p, 9,
  3441         -        "of_origin\",0],PARAMETER[\"central_meridian\",66],PARAME");
  3442         -    add_srs_wkt (p, 10,
  3443         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3444         -    add_srs_wkt (p, 11,
  3445         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3446         -    add_srs_wkt (p, 12,
  3447         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3448         -    add_srs_wkt (p, 13,
  3449         -        "EAST],AUTHORITY[\"EPSG\",\"2714\"]]");
  3450         -    p = add_epsg_def_ex (filter, first, last, 2715, "epsg", 2715,
  3451         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E", 0, 1,
  3452         -        "Krassowsky 1940", "Greenwich",
  3453         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3454         -        "X", "North", "Y", "East");
  3455         -    add_proj4text (p, 0,
  3456         -        "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  3457         -    add_proj4text (p, 1,
  3458         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3459         -    add_proj4text (p, 2,
  3460         -        " +units=m +no_defs");
  3461         -    add_srs_wkt (p, 0,
  3462         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E\",G");
  3463         -    add_srs_wkt (p, 1,
  3464         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3465         -    add_srs_wkt (p, 2,
  3466         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3467         -    add_srs_wkt (p, 3,
  3468         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3469         -    add_srs_wkt (p, 4,
  3470         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3471         -    add_srs_wkt (p, 5,
  3472         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3473         -    add_srs_wkt (p, 6,
  3474         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3475         -    add_srs_wkt (p, 7,
  3476         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3477         -    add_srs_wkt (p, 8,
  3478         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3479         -    add_srs_wkt (p, 9,
  3480         -        "of_origin\",0],PARAMETER[\"central_meridian\",69],PARAME");
  3481         -    add_srs_wkt (p, 10,
  3482         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3483         -    add_srs_wkt (p, 11,
  3484         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3485         -    add_srs_wkt (p, 12,
  3486         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3487         -    add_srs_wkt (p, 13,
  3488         -        "EAST],AUTHORITY[\"EPSG\",\"2715\"]]");
  3489         -    p = add_epsg_def_ex (filter, first, last, 2716, "epsg", 2716,
  3490         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E", 0, 1,
  3491         -        "Krassowsky 1940", "Greenwich",
  3492         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3493         -        "X", "North", "Y", "East");
  3494         -    add_proj4text (p, 0,
  3495         -        "+proj=tmerc +lat_0=0 +lon_0=72 +k=1 +x_0=500000 +y_0=0 +");
  3496         -    add_proj4text (p, 1,
  3497         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3498         -    add_proj4text (p, 2,
  3499         -        " +units=m +no_defs");
  3500         -    add_srs_wkt (p, 0,
  3501         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E\",G");
  3502         -    add_srs_wkt (p, 1,
  3503         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3504         -    add_srs_wkt (p, 2,
  3505         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3506         -    add_srs_wkt (p, 3,
  3507         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3508         -    add_srs_wkt (p, 4,
  3509         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3510         -    add_srs_wkt (p, 5,
  3511         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3512         -    add_srs_wkt (p, 6,
  3513         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3514         -    add_srs_wkt (p, 7,
  3515         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3516         -    add_srs_wkt (p, 8,
  3517         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3518         -    add_srs_wkt (p, 9,
  3519         -        "of_origin\",0],PARAMETER[\"central_meridian\",72],PARAME");
  3520         -    add_srs_wkt (p, 10,
  3521         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3522         -    add_srs_wkt (p, 11,
  3523         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3524         -    add_srs_wkt (p, 12,
  3525         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3526         -    add_srs_wkt (p, 13,
  3527         -        "EAST],AUTHORITY[\"EPSG\",\"2716\"]]");
  3528         -    p = add_epsg_def_ex (filter, first, last, 2717, "epsg", 2717,
  3529         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E", 0, 1,
  3530         -        "Krassowsky 1940", "Greenwich",
  3531         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3532         -        "X", "North", "Y", "East");
  3533         -    add_proj4text (p, 0,
  3534         -        "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  3535         -    add_proj4text (p, 1,
  3536         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3537         -    add_proj4text (p, 2,
  3538         -        " +units=m +no_defs");
  3539         -    add_srs_wkt (p, 0,
  3540         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E\",G");
  3541         -    add_srs_wkt (p, 1,
  3542         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3543         -    add_srs_wkt (p, 2,
  3544         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3545         -    add_srs_wkt (p, 3,
  3546         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3547         -    add_srs_wkt (p, 4,
  3548         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3549         -    add_srs_wkt (p, 5,
  3550         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3551         -    add_srs_wkt (p, 6,
  3552         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3553         -    add_srs_wkt (p, 7,
  3554         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3555         -    add_srs_wkt (p, 8,
  3556         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3557         -    add_srs_wkt (p, 9,
  3558         -        "of_origin\",0],PARAMETER[\"central_meridian\",75],PARAME");
  3559         -    add_srs_wkt (p, 10,
  3560         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3561         -    add_srs_wkt (p, 11,
  3562         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3563         -    add_srs_wkt (p, 12,
  3564         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3565         -    add_srs_wkt (p, 13,
  3566         -        "EAST],AUTHORITY[\"EPSG\",\"2717\"]]");
  3567         -    p = add_epsg_def_ex (filter, first, last, 2718, "epsg", 2718,
  3568         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E", 0, 1,
  3569         -        "Krassowsky 1940", "Greenwich",
  3570         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3571         -        "X", "North", "Y", "East");
  3572         -    add_proj4text (p, 0,
  3573         -        "+proj=tmerc +lat_0=0 +lon_0=78 +k=1 +x_0=500000 +y_0=0 +");
  3574         -    add_proj4text (p, 1,
  3575         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3576         -    add_proj4text (p, 2,
  3577         -        " +units=m +no_defs");
  3578         -    add_srs_wkt (p, 0,
  3579         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E\",G");
  3580         -    add_srs_wkt (p, 1,
  3581         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3582         -    add_srs_wkt (p, 2,
  3583         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3584         -    add_srs_wkt (p, 3,
  3585         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3586         -    add_srs_wkt (p, 4,
  3587         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3588         -    add_srs_wkt (p, 5,
  3589         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3590         -    add_srs_wkt (p, 6,
  3591         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3592         -    add_srs_wkt (p, 7,
  3593         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3594         -    add_srs_wkt (p, 8,
  3595         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3596         -    add_srs_wkt (p, 9,
  3597         -        "of_origin\",0],PARAMETER[\"central_meridian\",78],PARAME");
  3598         -    add_srs_wkt (p, 10,
  3599         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3600         -    add_srs_wkt (p, 11,
  3601         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3602         -    add_srs_wkt (p, 12,
  3603         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3604         -    add_srs_wkt (p, 13,
  3605         -        "EAST],AUTHORITY[\"EPSG\",\"2718\"]]");
  3606         -    p = add_epsg_def_ex (filter, first, last, 2719, "epsg", 2719,
  3607         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E", 0, 1,
  3608         -        "Krassowsky 1940", "Greenwich",
  3609         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3610         -        "X", "North", "Y", "East");
  3611         -    add_proj4text (p, 0,
  3612         -        "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
  3613         -    add_proj4text (p, 1,
  3614         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3615         -    add_proj4text (p, 2,
  3616         -        " +units=m +no_defs");
  3617         -    add_srs_wkt (p, 0,
  3618         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E\",G");
  3619         -    add_srs_wkt (p, 1,
  3620         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3621         -    add_srs_wkt (p, 2,
  3622         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3623         -    add_srs_wkt (p, 3,
  3624         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3625         -    add_srs_wkt (p, 4,
  3626         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3627         -    add_srs_wkt (p, 5,
  3628         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3629         -    add_srs_wkt (p, 6,
  3630         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3631         -    add_srs_wkt (p, 7,
  3632         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3633         -    add_srs_wkt (p, 8,
  3634         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3635         -    add_srs_wkt (p, 9,
  3636         -        "of_origin\",0],PARAMETER[\"central_meridian\",81],PARAME");
  3637         -    add_srs_wkt (p, 10,
  3638         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3639         -    add_srs_wkt (p, 11,
  3640         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3641         -    add_srs_wkt (p, 12,
  3642         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3643         -    add_srs_wkt (p, 13,
  3644         -        "EAST],AUTHORITY[\"EPSG\",\"2719\"]]");
  3645         -    p = add_epsg_def_ex (filter, first, last, 2720, "epsg", 2720,
  3646         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E", 0, 1,
  3647         -        "Krassowsky 1940", "Greenwich",
  3648         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3649         -        "X", "North", "Y", "East");
  3650         -    add_proj4text (p, 0,
  3651         -        "+proj=tmerc +lat_0=0 +lon_0=84 +k=1 +x_0=500000 +y_0=0 +");
  3652         -    add_proj4text (p, 1,
  3653         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3654         -    add_proj4text (p, 2,
  3655         -        " +units=m +no_defs");
  3656         -    add_srs_wkt (p, 0,
  3657         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E\",G");
  3658         -    add_srs_wkt (p, 1,
  3659         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3660         -    add_srs_wkt (p, 2,
  3661         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3662         -    add_srs_wkt (p, 3,
  3663         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3664         -    add_srs_wkt (p, 4,
  3665         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3666         -    add_srs_wkt (p, 5,
  3667         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3668         -    add_srs_wkt (p, 6,
  3669         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3670         -    add_srs_wkt (p, 7,
  3671         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3672         -    add_srs_wkt (p, 8,
  3673         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3674         -    add_srs_wkt (p, 9,
  3675         -        "of_origin\",0],PARAMETER[\"central_meridian\",84],PARAME");
  3676         -    add_srs_wkt (p, 10,
  3677         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3678         -    add_srs_wkt (p, 11,
  3679         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3680         -    add_srs_wkt (p, 12,
  3681         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3682         -    add_srs_wkt (p, 13,
  3683         -        "EAST],AUTHORITY[\"EPSG\",\"2720\"]]");
  3684         -    p = add_epsg_def_ex (filter, first, last, 2721, "epsg", 2721,
  3685         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E", 0, 1,
  3686         -        "Krassowsky 1940", "Greenwich",
  3687         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3688         -        "X", "North", "Y", "East");
  3689         -    add_proj4text (p, 0,
  3690         -        "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
  3691         -    add_proj4text (p, 1,
  3692         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3693         -    add_proj4text (p, 2,
  3694         -        " +units=m +no_defs");
  3695         -    add_srs_wkt (p, 0,
  3696         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E\",G");
  3697         -    add_srs_wkt (p, 1,
  3698         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3699         -    add_srs_wkt (p, 2,
  3700         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3701         -    add_srs_wkt (p, 3,
  3702         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3703         -    add_srs_wkt (p, 4,
  3704         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3705         -    add_srs_wkt (p, 5,
  3706         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3707         -    add_srs_wkt (p, 6,
  3708         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3709         -    add_srs_wkt (p, 7,
  3710         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3711         -    add_srs_wkt (p, 8,
  3712         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3713         -    add_srs_wkt (p, 9,
  3714         -        "of_origin\",0],PARAMETER[\"central_meridian\",87],PARAME");
  3715         -    add_srs_wkt (p, 10,
  3716         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3717         -    add_srs_wkt (p, 11,
  3718         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3719         -    add_srs_wkt (p, 12,
  3720         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3721         -    add_srs_wkt (p, 13,
  3722         -        "EAST],AUTHORITY[\"EPSG\",\"2721\"]]");
  3723         -    p = add_epsg_def_ex (filter, first, last, 2722, "epsg", 2722,
  3724         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E", 0, 1,
  3725         -        "Krassowsky 1940", "Greenwich",
  3726         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3727         -        "X", "North", "Y", "East");
  3728         -    add_proj4text (p, 0,
  3729         -        "+proj=tmerc +lat_0=0 +lon_0=90 +k=1 +x_0=500000 +y_0=0 +");
  3730         -    add_proj4text (p, 1,
  3731         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3732         -    add_proj4text (p, 2,
  3733         -        " +units=m +no_defs");
  3734         -    add_srs_wkt (p, 0,
  3735         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E\",G");
  3736         -    add_srs_wkt (p, 1,
  3737         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3738         -    add_srs_wkt (p, 2,
  3739         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3740         -    add_srs_wkt (p, 3,
  3741         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3742         -    add_srs_wkt (p, 4,
  3743         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3744         -    add_srs_wkt (p, 5,
  3745         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3746         -    add_srs_wkt (p, 6,
  3747         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3748         -    add_srs_wkt (p, 7,
  3749         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3750         -    add_srs_wkt (p, 8,
  3751         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3752         -    add_srs_wkt (p, 9,
  3753         -        "of_origin\",0],PARAMETER[\"central_meridian\",90],PARAME");
  3754         -    add_srs_wkt (p, 10,
  3755         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3756         -    add_srs_wkt (p, 11,
  3757         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3758         -    add_srs_wkt (p, 12,
  3759         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3760         -    add_srs_wkt (p, 13,
  3761         -        "EAST],AUTHORITY[\"EPSG\",\"2722\"]]");
  3762         -    p = add_epsg_def_ex (filter, first, last, 2723, "epsg", 2723,
  3763         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E", 0, 1,
  3764         -        "Krassowsky 1940", "Greenwich",
  3765         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3766         -        "X", "North", "Y", "East");
  3767         -    add_proj4text (p, 0,
  3768         -        "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
  3769         -    add_proj4text (p, 1,
  3770         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3771         -    add_proj4text (p, 2,
  3772         -        " +units=m +no_defs");
  3773         -    add_srs_wkt (p, 0,
  3774         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E\",G");
  3775         -    add_srs_wkt (p, 1,
  3776         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3777         -    add_srs_wkt (p, 2,
  3778         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3779         -    add_srs_wkt (p, 3,
  3780         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3781         -    add_srs_wkt (p, 4,
  3782         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3783         -    add_srs_wkt (p, 5,
  3784         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3785         -    add_srs_wkt (p, 6,
  3786         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3787         -    add_srs_wkt (p, 7,
  3788         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3789         -    add_srs_wkt (p, 8,
  3790         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3791         -    add_srs_wkt (p, 9,
  3792         -        "of_origin\",0],PARAMETER[\"central_meridian\",93],PARAME");
  3793         -    add_srs_wkt (p, 10,
  3794         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3795         -    add_srs_wkt (p, 11,
  3796         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3797         -    add_srs_wkt (p, 12,
  3798         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3799         -    add_srs_wkt (p, 13,
  3800         -        "EAST],AUTHORITY[\"EPSG\",\"2723\"]]");
  3801         -    p = add_epsg_def_ex (filter, first, last, 2724, "epsg", 2724,
  3802         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E", 0, 1,
  3803         -        "Krassowsky 1940", "Greenwich",
  3804         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3805         -        "X", "North", "Y", "East");
  3806         -    add_proj4text (p, 0,
  3807         -        "+proj=tmerc +lat_0=0 +lon_0=96 +k=1 +x_0=500000 +y_0=0 +");
  3808         -    add_proj4text (p, 1,
  3809         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3810         -    add_proj4text (p, 2,
  3811         -        " +units=m +no_defs");
  3812         -    add_srs_wkt (p, 0,
  3813         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E\",G");
  3814         -    add_srs_wkt (p, 1,
  3815         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3816         -    add_srs_wkt (p, 2,
  3817         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3818         -    add_srs_wkt (p, 3,
  3819         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3820         -    add_srs_wkt (p, 4,
  3821         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3822         -    add_srs_wkt (p, 5,
  3823         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3824         -    add_srs_wkt (p, 6,
  3825         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3826         -    add_srs_wkt (p, 7,
  3827         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3828         -    add_srs_wkt (p, 8,
  3829         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3830         -    add_srs_wkt (p, 9,
  3831         -        "of_origin\",0],PARAMETER[\"central_meridian\",96],PARAME");
  3832         -    add_srs_wkt (p, 10,
  3833         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3834         -    add_srs_wkt (p, 11,
  3835         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3836         -    add_srs_wkt (p, 12,
  3837         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3838         -    add_srs_wkt (p, 13,
  3839         -        "EAST],AUTHORITY[\"EPSG\",\"2724\"]]");
  3840         -    p = add_epsg_def_ex (filter, first, last, 2725, "epsg", 2725,
  3841         -        "Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E", 0, 1,
  3842         -        "Krassowsky 1940", "Greenwich",
  3843         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3844         -        "X", "North", "Y", "East");
  3845         -    add_proj4text (p, 0,
  3846         -        "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
  3847         -    add_proj4text (p, 1,
  3848         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
  3849         -    add_proj4text (p, 2,
  3850         -        " +units=m +no_defs");
  3851         -    add_srs_wkt (p, 0,
  3852         -        "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E\",G");
  3853         -    add_srs_wkt (p, 1,
  3854         -        "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
  3855         -    add_srs_wkt (p, 2,
  3856         -        "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3857         -    add_srs_wkt (p, 3,
  3858         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
  3859         -    add_srs_wkt (p, 4,
  3860         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3861         -    add_srs_wkt (p, 5,
  3862         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3863         -    add_srs_wkt (p, 6,
  3864         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  3865         -    add_srs_wkt (p, 7,
  3866         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
  3867         -    add_srs_wkt (p, 8,
  3868         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
  3869         -    add_srs_wkt (p, 9,
  3870         -        "of_origin\",0],PARAMETER[\"central_meridian\",99],PARAME");
  3871         -    add_srs_wkt (p, 10,
  3872         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
  3873         -    add_srs_wkt (p, 11,
  3874         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
  3875         -    add_srs_wkt (p, 12,
  3876         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
  3877         -    add_srs_wkt (p, 13,
  3878         -        "EAST],AUTHORITY[\"EPSG\",\"2725\"]]");
         3878  +        ",EAST],AUTHORITY[\"EPSG\",\"2725\"]]");
  3879   3879       p = add_epsg_def_ex (filter, first, last, 2726, "epsg", 2726,
  3880   3880           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 102E", 0, 1,
  3881   3881           "Krassowsky 1940", "Greenwich",
  3882   3882           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3883   3883           "X", "North", "Y", "East");
  3884   3884       add_proj4text (p, 0,
  3885   3885           "+proj=tmerc +lat_0=0 +lon_0=102 +k=1 +x_0=500000 +y_0=0 ");
  3886   3886       add_proj4text (p, 1,
  3887         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3887  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3888   3888       add_proj4text (p, 2,
  3889         -        "2 +units=m +no_defs");
         3889  +        ".22 +units=m +no_defs");
  3890   3890       add_srs_wkt (p, 0,
  3891   3891           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 102E\",");
  3892   3892       add_srs_wkt (p, 1,
  3893   3893           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  3894   3894       add_srs_wkt (p, 2,
  3895   3895           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3896   3896       add_srs_wkt (p, 3,
  3897         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3897  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  3898   3898       add_srs_wkt (p, 4,
  3899         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3899  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3900   3900       add_srs_wkt (p, 5,
  3901         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3901  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3902   3902       add_srs_wkt (p, 6,
  3903         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3903  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3904   3904       add_srs_wkt (p, 7,
  3905         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         3905  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  3906   3906       add_srs_wkt (p, 8,
  3907         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3907  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3908   3908       add_srs_wkt (p, 9,
  3909         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",102],PAR");
         3909  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",102],P");
  3910   3910       add_srs_wkt (p, 10,
  3911         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3911  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3912   3912       add_srs_wkt (p, 11,
  3913         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3913  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  3914   3914       add_srs_wkt (p, 12,
  3915         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3915  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3916   3916       add_srs_wkt (p, 13,
  3917         -        "\",EAST],AUTHORITY[\"EPSG\",\"2726\"]]");
         3917  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2726\"]]");
  3918   3918       p = add_epsg_def_ex (filter, first, last, 2727, "epsg", 2727,
  3919   3919           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 105E", 0, 1,
  3920   3920           "Krassowsky 1940", "Greenwich",
  3921   3921           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3922   3922           "X", "North", "Y", "East");
  3923   3923       add_proj4text (p, 0,
  3924   3924           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
  3925   3925       add_proj4text (p, 1,
  3926         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3926  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3927   3927       add_proj4text (p, 2,
  3928         -        "2 +units=m +no_defs");
         3928  +        ".22 +units=m +no_defs");
  3929   3929       add_srs_wkt (p, 0,
  3930   3930           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 105E\",");
  3931   3931       add_srs_wkt (p, 1,
  3932   3932           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  3933   3933       add_srs_wkt (p, 2,
  3934   3934           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3935   3935       add_srs_wkt (p, 3,
  3936         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3936  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  3937   3937       add_srs_wkt (p, 4,
  3938         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3938  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3939   3939       add_srs_wkt (p, 5,
  3940         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3940  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3941   3941       add_srs_wkt (p, 6,
  3942         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3942  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3943   3943       add_srs_wkt (p, 7,
  3944         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         3944  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  3945   3945       add_srs_wkt (p, 8,
  3946         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3946  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3947   3947       add_srs_wkt (p, 9,
  3948         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",105],PAR");
         3948  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
  3949   3949       add_srs_wkt (p, 10,
  3950         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3950  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3951   3951       add_srs_wkt (p, 11,
  3952         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3952  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  3953   3953       add_srs_wkt (p, 12,
  3954         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3954  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3955   3955       add_srs_wkt (p, 13,
  3956         -        "\",EAST],AUTHORITY[\"EPSG\",\"2727\"]]");
         3956  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2727\"]]");
  3957   3957       p = add_epsg_def_ex (filter, first, last, 2728, "epsg", 2728,
  3958   3958           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 108E", 0, 1,
  3959   3959           "Krassowsky 1940", "Greenwich",
  3960   3960           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3961   3961           "X", "North", "Y", "East");
  3962   3962       add_proj4text (p, 0,
  3963   3963           "+proj=tmerc +lat_0=0 +lon_0=108 +k=1 +x_0=500000 +y_0=0 ");
  3964   3964       add_proj4text (p, 1,
  3965         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3965  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3966   3966       add_proj4text (p, 2,
  3967         -        "2 +units=m +no_defs");
         3967  +        ".22 +units=m +no_defs");
  3968   3968       add_srs_wkt (p, 0,
  3969   3969           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 108E\",");
  3970   3970       add_srs_wkt (p, 1,
  3971   3971           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  3972   3972       add_srs_wkt (p, 2,
  3973   3973           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3974   3974       add_srs_wkt (p, 3,
  3975         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         3975  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  3976   3976       add_srs_wkt (p, 4,
  3977         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3977  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3978   3978       add_srs_wkt (p, 5,
  3979         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3979  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3980   3980       add_srs_wkt (p, 6,
  3981         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3981  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3982   3982       add_srs_wkt (p, 7,
  3983         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         3983  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  3984   3984       add_srs_wkt (p, 8,
  3985         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3985  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3986   3986       add_srs_wkt (p, 9,
  3987         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",108],PAR");
         3987  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",108],P");
  3988   3988       add_srs_wkt (p, 10,
  3989         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
         3989  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  3990   3990       add_srs_wkt (p, 11,
  3991         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
         3991  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  3992   3992       add_srs_wkt (p, 12,
  3993         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
         3993  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  3994   3994       add_srs_wkt (p, 13,
  3995         -        "\",EAST],AUTHORITY[\"EPSG\",\"2728\"]]");
         3995  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2728\"]]");
  3996   3996   }
  3997   3997   
  3998   3998   #endif /* full EPSG initialization enabled/disabled */
  3999   3999   

Changes to src/srsinit/epsg_inlined_07.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 111E", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Pulkovo_1995", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
    64     64       add_proj4text (p, 1,
    65         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
           65  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
    66     66       add_proj4text (p, 2,
    67         -        "2 +units=m +no_defs");
           67  +        ".22 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 111E\",");
    70     70       add_srs_wkt (p, 1,
    71     71           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
    72     72       add_srs_wkt (p, 2,
    73     73           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
    74     74       add_srs_wkt (p, 3,
    75         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
    76         -    add_srs_wkt (p, 4,
    77         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
    78         -    add_srs_wkt (p, 5,
    79         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
    80         -    add_srs_wkt (p, 6,
    81         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
    82         -    add_srs_wkt (p, 7,
    83         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
    84         -    add_srs_wkt (p, 8,
    85         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
    86         -    add_srs_wkt (p, 9,
    87         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",111],PAR");
    88         -    add_srs_wkt (p, 10,
    89         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
    90         -    add_srs_wkt (p, 11,
    91         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
    92         -    add_srs_wkt (p, 12,
    93         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
    94         -    add_srs_wkt (p, 13,
    95         -        "\",EAST],AUTHORITY[\"EPSG\",\"2729\"]]");
           75  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
           76  +    add_srs_wkt (p, 4,
           77  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
           78  +    add_srs_wkt (p, 5,
           79  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
           80  +    add_srs_wkt (p, 6,
           81  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
           82  +    add_srs_wkt (p, 7,
           83  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
           84  +    add_srs_wkt (p, 8,
           85  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
           86  +    add_srs_wkt (p, 9,
           87  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
           88  +    add_srs_wkt (p, 10,
           89  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
           90  +    add_srs_wkt (p, 11,
           91  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
           92  +    add_srs_wkt (p, 12,
           93  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
           94  +    add_srs_wkt (p, 13,
           95  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2729\"]]");
    96     96       p = add_epsg_def_ex (filter, first, last, 2730, "epsg", 2730,
    97     97           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 114E", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Pulkovo_1995", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 ");
   103    103       add_proj4text (p, 1,
   104         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          104  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   105    105       add_proj4text (p, 2,
   106         -        "2 +units=m +no_defs");
          106  +        ".22 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 114E\",");
   109    109       add_srs_wkt (p, 1,
   110    110           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   111    111       add_srs_wkt (p, 2,
   112    112           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   113    113       add_srs_wkt (p, 3,
   114         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   115         -    add_srs_wkt (p, 4,
   116         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   117         -    add_srs_wkt (p, 5,
   118         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   119         -    add_srs_wkt (p, 6,
   120         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   121         -    add_srs_wkt (p, 7,
   122         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   123         -    add_srs_wkt (p, 8,
   124         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   125         -    add_srs_wkt (p, 9,
   126         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",114],PAR");
   127         -    add_srs_wkt (p, 10,
   128         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   129         -    add_srs_wkt (p, 11,
   130         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   131         -    add_srs_wkt (p, 12,
   132         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   133         -    add_srs_wkt (p, 13,
   134         -        "\",EAST],AUTHORITY[\"EPSG\",\"2730\"]]");
          114  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          115  +    add_srs_wkt (p, 4,
          116  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          117  +    add_srs_wkt (p, 5,
          118  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          119  +    add_srs_wkt (p, 6,
          120  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          121  +    add_srs_wkt (p, 7,
          122  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          123  +    add_srs_wkt (p, 8,
          124  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          125  +    add_srs_wkt (p, 9,
          126  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",114],P");
          127  +    add_srs_wkt (p, 10,
          128  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          129  +    add_srs_wkt (p, 11,
          130  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          131  +    add_srs_wkt (p, 12,
          132  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          133  +    add_srs_wkt (p, 13,
          134  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2730\"]]");
   135    135       p = add_epsg_def_ex (filter, first, last, 2731, "epsg", 2731,
   136    136           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 117E", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Pulkovo_1995", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
   142    142       add_proj4text (p, 1,
   143         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          143  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   144    144       add_proj4text (p, 2,
   145         -        "2 +units=m +no_defs");
          145  +        ".22 +units=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 117E\",");
   148    148       add_srs_wkt (p, 1,
   149    149           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   150    150       add_srs_wkt (p, 2,
   151    151           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   152    152       add_srs_wkt (p, 3,
   153         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   154         -    add_srs_wkt (p, 4,
   155         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   156         -    add_srs_wkt (p, 5,
   157         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   158         -    add_srs_wkt (p, 6,
   159         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   160         -    add_srs_wkt (p, 7,
   161         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   162         -    add_srs_wkt (p, 8,
   163         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   164         -    add_srs_wkt (p, 9,
   165         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",117],PAR");
   166         -    add_srs_wkt (p, 10,
   167         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   168         -    add_srs_wkt (p, 11,
   169         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   170         -    add_srs_wkt (p, 12,
   171         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   172         -    add_srs_wkt (p, 13,
   173         -        "\",EAST],AUTHORITY[\"EPSG\",\"2731\"]]");
          153  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          154  +    add_srs_wkt (p, 4,
          155  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          156  +    add_srs_wkt (p, 5,
          157  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          158  +    add_srs_wkt (p, 6,
          159  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          160  +    add_srs_wkt (p, 7,
          161  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          162  +    add_srs_wkt (p, 8,
          163  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          164  +    add_srs_wkt (p, 9,
          165  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
          166  +    add_srs_wkt (p, 10,
          167  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          168  +    add_srs_wkt (p, 11,
          169  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          170  +    add_srs_wkt (p, 12,
          171  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          172  +    add_srs_wkt (p, 13,
          173  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2731\"]]");
   174    174       p = add_epsg_def_ex (filter, first, last, 2732, "epsg", 2732,
   175    175           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 120E", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Pulkovo_1995", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 ");
   181    181       add_proj4text (p, 1,
   182         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          182  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   183    183       add_proj4text (p, 2,
   184         -        "2 +units=m +no_defs");
          184  +        ".22 +units=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 120E\",");
   187    187       add_srs_wkt (p, 1,
   188    188           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   189    189       add_srs_wkt (p, 2,
   190    190           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   191    191       add_srs_wkt (p, 3,
   192         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   193         -    add_srs_wkt (p, 4,
   194         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   195         -    add_srs_wkt (p, 5,
   196         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   197         -    add_srs_wkt (p, 6,
   198         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   199         -    add_srs_wkt (p, 7,
   200         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   201         -    add_srs_wkt (p, 8,
   202         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   203         -    add_srs_wkt (p, 9,
   204         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",120],PAR");
   205         -    add_srs_wkt (p, 10,
   206         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   207         -    add_srs_wkt (p, 11,
   208         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   209         -    add_srs_wkt (p, 12,
   210         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   211         -    add_srs_wkt (p, 13,
   212         -        "\",EAST],AUTHORITY[\"EPSG\",\"2732\"]]");
          192  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          193  +    add_srs_wkt (p, 4,
          194  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          195  +    add_srs_wkt (p, 5,
          196  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          197  +    add_srs_wkt (p, 6,
          198  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          199  +    add_srs_wkt (p, 7,
          200  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          201  +    add_srs_wkt (p, 8,
          202  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          203  +    add_srs_wkt (p, 9,
          204  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",120],P");
          205  +    add_srs_wkt (p, 10,
          206  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          207  +    add_srs_wkt (p, 11,
          208  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          209  +    add_srs_wkt (p, 12,
          210  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          211  +    add_srs_wkt (p, 13,
          212  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2732\"]]");
   213    213       p = add_epsg_def_ex (filter, first, last, 2733, "epsg", 2733,
   214    214           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 123E", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Pulkovo_1995", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
   220    220       add_proj4text (p, 1,
   221         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          221  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   222    222       add_proj4text (p, 2,
   223         -        "2 +units=m +no_defs");
          223  +        ".22 +units=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 123E\",");
   226    226       add_srs_wkt (p, 1,
   227    227           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   228    228       add_srs_wkt (p, 2,
   229    229           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   230    230       add_srs_wkt (p, 3,
   231         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   232         -    add_srs_wkt (p, 4,
   233         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   234         -    add_srs_wkt (p, 5,
   235         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   236         -    add_srs_wkt (p, 6,
   237         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   238         -    add_srs_wkt (p, 7,
   239         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   240         -    add_srs_wkt (p, 8,
   241         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   242         -    add_srs_wkt (p, 9,
   243         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",123],PAR");
   244         -    add_srs_wkt (p, 10,
   245         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   246         -    add_srs_wkt (p, 11,
   247         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   248         -    add_srs_wkt (p, 12,
   249         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   250         -    add_srs_wkt (p, 13,
   251         -        "\",EAST],AUTHORITY[\"EPSG\",\"2733\"]]");
          231  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          232  +    add_srs_wkt (p, 4,
          233  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          234  +    add_srs_wkt (p, 5,
          235  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          236  +    add_srs_wkt (p, 6,
          237  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          238  +    add_srs_wkt (p, 7,
          239  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          240  +    add_srs_wkt (p, 8,
          241  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          242  +    add_srs_wkt (p, 9,
          243  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
          244  +    add_srs_wkt (p, 10,
          245  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          246  +    add_srs_wkt (p, 11,
          247  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          248  +    add_srs_wkt (p, 12,
          249  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          250  +    add_srs_wkt (p, 13,
          251  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2733\"]]");
   252    252       p = add_epsg_def_ex (filter, first, last, 2734, "epsg", 2734,
   253    253           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 126E", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Pulkovo_1995", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=126 +k=1 +x_0=500000 +y_0=0 ");
   259    259       add_proj4text (p, 1,
   260         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          260  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   261    261       add_proj4text (p, 2,
   262         -        "2 +units=m +no_defs");
          262  +        ".22 +units=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 126E\",");
   265    265       add_srs_wkt (p, 1,
   266    266           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   267    267       add_srs_wkt (p, 2,
   268    268           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   269    269       add_srs_wkt (p, 3,
   270         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   271         -    add_srs_wkt (p, 4,
   272         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   273         -    add_srs_wkt (p, 5,
   274         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   275         -    add_srs_wkt (p, 6,
   276         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   277         -    add_srs_wkt (p, 7,
   278         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   279         -    add_srs_wkt (p, 8,
   280         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   281         -    add_srs_wkt (p, 9,
   282         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",126],PAR");
   283         -    add_srs_wkt (p, 10,
   284         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   285         -    add_srs_wkt (p, 11,
   286         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   287         -    add_srs_wkt (p, 12,
   288         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   289         -    add_srs_wkt (p, 13,
   290         -        "\",EAST],AUTHORITY[\"EPSG\",\"2734\"]]");
          270  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          271  +    add_srs_wkt (p, 4,
          272  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          273  +    add_srs_wkt (p, 5,
          274  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          275  +    add_srs_wkt (p, 6,
          276  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          277  +    add_srs_wkt (p, 7,
          278  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          279  +    add_srs_wkt (p, 8,
          280  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          281  +    add_srs_wkt (p, 9,
          282  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",126],P");
          283  +    add_srs_wkt (p, 10,
          284  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          285  +    add_srs_wkt (p, 11,
          286  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          287  +    add_srs_wkt (p, 12,
          288  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          289  +    add_srs_wkt (p, 13,
          290  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2734\"]]");
   291    291       p = add_epsg_def_ex (filter, first, last, 2735, "epsg", 2735,
   292    292           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 129E", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Pulkovo_1995", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
   298    298       add_proj4text (p, 1,
   299         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          299  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   300    300       add_proj4text (p, 2,
   301         -        "2 +units=m +no_defs");
          301  +        ".22 +units=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 129E\",");
   304    304       add_srs_wkt (p, 1,
   305    305           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   306    306       add_srs_wkt (p, 2,
   307    307           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   308    308       add_srs_wkt (p, 3,
   309         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   310         -    add_srs_wkt (p, 4,
   311         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   312         -    add_srs_wkt (p, 5,
   313         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   314         -    add_srs_wkt (p, 6,
   315         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   316         -    add_srs_wkt (p, 7,
   317         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   318         -    add_srs_wkt (p, 8,
   319         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   320         -    add_srs_wkt (p, 9,
   321         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",129],PAR");
   322         -    add_srs_wkt (p, 10,
   323         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   324         -    add_srs_wkt (p, 11,
   325         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   326         -    add_srs_wkt (p, 12,
   327         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   328         -    add_srs_wkt (p, 13,
   329         -        "\",EAST],AUTHORITY[\"EPSG\",\"2735\"]]");
          309  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          310  +    add_srs_wkt (p, 4,
          311  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          312  +    add_srs_wkt (p, 5,
          313  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          314  +    add_srs_wkt (p, 6,
          315  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          316  +    add_srs_wkt (p, 7,
          317  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          318  +    add_srs_wkt (p, 8,
          319  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          320  +    add_srs_wkt (p, 9,
          321  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
          322  +    add_srs_wkt (p, 10,
          323  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          324  +    add_srs_wkt (p, 11,
          325  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          326  +    add_srs_wkt (p, 12,
          327  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          328  +    add_srs_wkt (p, 13,
          329  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2735\"]]");
   330    330       p = add_epsg_def_ex (filter, first, last, 2736, "epsg", 2736,
   331    331           "Tete / UTM zone 36S", 0, 0,
   332    332           "Clarke 1866", "Greenwich",
   333    333           "Tete", "Transverse_Mercator", "metre",
   334    334           "Easting", "East", "Northing", "North");
   335    335       add_proj4text (p, 0,
   336    336           "+proj=utm +zone=36 +south +ellps=clrk66 +towgs84=-73.472");
................................................................................
   337    337       add_proj4text (p, 1,
   338    338           ",-51.66,-112.482,0.953,4.6,-2.368,0.586 +units=m +no_def");
   339    339       add_proj4text (p, 2,
   340    340           "s");
   341    341       add_srs_wkt (p, 0,
   342    342           "PROJCS[\"Tete / UTM zone 36S\",GEOGCS[\"Tete\",DATUM[\"T");
   343    343       add_srs_wkt (p, 1,
   344         -        "ete\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821389");
          344  +        "ete\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821390");
   345    345       add_srs_wkt (p, 2,
   346         -        "82,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-73.472,-51.66,");
          346  +        "06,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-73.472,-51.66,");
   347    347       add_srs_wkt (p, 3,
   348    348           "-112.482,0.953,4.6,-2.368,0.586],AUTHORITY[\"EPSG\",\"61");
   349    349       add_srs_wkt (p, 4,
   350    350           "27\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   351    351       add_srs_wkt (p, 5,
   352    352           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   353    353       add_srs_wkt (p, 6,
................................................................................
   376    376       add_proj4text (p, 1,
   377    377           ",-51.66,-112.482,0.953,4.6,-2.368,0.586 +units=m +no_def");
   378    378       add_proj4text (p, 2,
   379    379           "s");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"Tete / UTM zone 37S\",GEOGCS[\"Tete\",DATUM[\"T");
   382    382       add_srs_wkt (p, 1,
   383         -        "ete\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821389");
          383  +        "ete\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821390");
   384    384       add_srs_wkt (p, 2,
   385         -        "82,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-73.472,-51.66,");
          385  +        "06,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-73.472,-51.66,");
   386    386       add_srs_wkt (p, 3,
   387    387           "-112.482,0.953,4.6,-2.368,0.586],AUTHORITY[\"EPSG\",\"61");
   388    388       add_srs_wkt (p, 4,
   389    389           "27\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   390    390       add_srs_wkt (p, 5,
   391    391           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   392    392       add_srs_wkt (p, 6,
................................................................................
   409    409           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 132E", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Pulkovo_1995", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=500000 +y_0=0 ");
   415    415       add_proj4text (p, 1,
   416         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          416  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   417    417       add_proj4text (p, 2,
   418         -        "2 +units=m +no_defs");
          418  +        ".22 +units=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 132E\",");
   421    421       add_srs_wkt (p, 1,
   422    422           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   423    423       add_srs_wkt (p, 2,
   424    424           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   425    425       add_srs_wkt (p, 3,
   426         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   427         -    add_srs_wkt (p, 4,
   428         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   429         -    add_srs_wkt (p, 5,
   430         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   431         -    add_srs_wkt (p, 6,
   432         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   433         -    add_srs_wkt (p, 7,
   434         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   435         -    add_srs_wkt (p, 8,
   436         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   437         -    add_srs_wkt (p, 9,
   438         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",132],PAR");
   439         -    add_srs_wkt (p, 10,
   440         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   441         -    add_srs_wkt (p, 11,
   442         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   443         -    add_srs_wkt (p, 12,
   444         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   445         -    add_srs_wkt (p, 13,
   446         -        "\",EAST],AUTHORITY[\"EPSG\",\"2738\"]]");
          426  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          427  +    add_srs_wkt (p, 4,
          428  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          429  +    add_srs_wkt (p, 5,
          430  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          431  +    add_srs_wkt (p, 6,
          432  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          433  +    add_srs_wkt (p, 7,
          434  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          435  +    add_srs_wkt (p, 8,
          436  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          437  +    add_srs_wkt (p, 9,
          438  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",132],P");
          439  +    add_srs_wkt (p, 10,
          440  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          441  +    add_srs_wkt (p, 11,
          442  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          443  +    add_srs_wkt (p, 12,
          444  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          445  +    add_srs_wkt (p, 13,
          446  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2738\"]]");
   447    447       p = add_epsg_def_ex (filter, first, last, 2739, "epsg", 2739,
   448    448           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 135E", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Pulkovo_1995", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
   454    454       add_proj4text (p, 1,
   455         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          455  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   456    456       add_proj4text (p, 2,
   457         -        "2 +units=m +no_defs");
          457  +        ".22 +units=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 135E\",");
   460    460       add_srs_wkt (p, 1,
   461    461           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   462    462       add_srs_wkt (p, 2,
   463    463           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   464    464       add_srs_wkt (p, 3,
   465         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   466         -    add_srs_wkt (p, 4,
   467         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   468         -    add_srs_wkt (p, 5,
   469         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   470         -    add_srs_wkt (p, 6,
   471         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   472         -    add_srs_wkt (p, 7,
   473         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   474         -    add_srs_wkt (p, 8,
   475         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   476         -    add_srs_wkt (p, 9,
   477         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",135],PAR");
   478         -    add_srs_wkt (p, 10,
   479         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   480         -    add_srs_wkt (p, 11,
   481         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   482         -    add_srs_wkt (p, 12,
   483         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   484         -    add_srs_wkt (p, 13,
   485         -        "\",EAST],AUTHORITY[\"EPSG\",\"2739\"]]");
          465  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          466  +    add_srs_wkt (p, 4,
          467  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          468  +    add_srs_wkt (p, 5,
          469  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          470  +    add_srs_wkt (p, 6,
          471  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          472  +    add_srs_wkt (p, 7,
          473  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          474  +    add_srs_wkt (p, 8,
          475  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          476  +    add_srs_wkt (p, 9,
          477  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
          478  +    add_srs_wkt (p, 10,
          479  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          480  +    add_srs_wkt (p, 11,
          481  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          482  +    add_srs_wkt (p, 12,
          483  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          484  +    add_srs_wkt (p, 13,
          485  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2739\"]]");
   486    486       p = add_epsg_def_ex (filter, first, last, 2740, "epsg", 2740,
   487    487           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 138E", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Pulkovo_1995", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=138 +k=1 +x_0=500000 +y_0=0 ");
   493    493       add_proj4text (p, 1,
   494         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          494  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   495    495       add_proj4text (p, 2,
   496         -        "2 +units=m +no_defs");
          496  +        ".22 +units=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 138E\",");
   499    499       add_srs_wkt (p, 1,
   500    500           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   501    501       add_srs_wkt (p, 2,
   502    502           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   503    503       add_srs_wkt (p, 3,
   504         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   505         -    add_srs_wkt (p, 4,
   506         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   507         -    add_srs_wkt (p, 5,
   508         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   509         -    add_srs_wkt (p, 6,
   510         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   511         -    add_srs_wkt (p, 7,
   512         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   513         -    add_srs_wkt (p, 8,
   514         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   515         -    add_srs_wkt (p, 9,
   516         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",138],PAR");
   517         -    add_srs_wkt (p, 10,
   518         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   519         -    add_srs_wkt (p, 11,
   520         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   521         -    add_srs_wkt (p, 12,
   522         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   523         -    add_srs_wkt (p, 13,
   524         -        "\",EAST],AUTHORITY[\"EPSG\",\"2740\"]]");
          504  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          505  +    add_srs_wkt (p, 4,
          506  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          507  +    add_srs_wkt (p, 5,
          508  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          509  +    add_srs_wkt (p, 6,
          510  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          511  +    add_srs_wkt (p, 7,
          512  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          513  +    add_srs_wkt (p, 8,
          514  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          515  +    add_srs_wkt (p, 9,
          516  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",138],P");
          517  +    add_srs_wkt (p, 10,
          518  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          519  +    add_srs_wkt (p, 11,
          520  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          521  +    add_srs_wkt (p, 12,
          522  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          523  +    add_srs_wkt (p, 13,
          524  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2740\"]]");
   525    525       p = add_epsg_def_ex (filter, first, last, 2741, "epsg", 2741,
   526    526           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 141E", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Pulkovo_1995", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
   532    532       add_proj4text (p, 1,
   533         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          533  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   534    534       add_proj4text (p, 2,
   535         -        "2 +units=m +no_defs");
          535  +        ".22 +units=m +no_defs");
   536    536       add_srs_wkt (p, 0,
   537    537           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 141E\",");
   538    538       add_srs_wkt (p, 1,
   539    539           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   540    540       add_srs_wkt (p, 2,
   541    541           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   542    542       add_srs_wkt (p, 3,
   543         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   544         -    add_srs_wkt (p, 4,
   545         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   546         -    add_srs_wkt (p, 5,
   547         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   548         -    add_srs_wkt (p, 6,
   549         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   550         -    add_srs_wkt (p, 7,
   551         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   552         -    add_srs_wkt (p, 8,
   553         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   554         -    add_srs_wkt (p, 9,
   555         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",141],PAR");
   556         -    add_srs_wkt (p, 10,
   557         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   558         -    add_srs_wkt (p, 11,
   559         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   560         -    add_srs_wkt (p, 12,
   561         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   562         -    add_srs_wkt (p, 13,
   563         -        "\",EAST],AUTHORITY[\"EPSG\",\"2741\"]]");
          543  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          544  +    add_srs_wkt (p, 4,
          545  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          546  +    add_srs_wkt (p, 5,
          547  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          548  +    add_srs_wkt (p, 6,
          549  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          550  +    add_srs_wkt (p, 7,
          551  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          552  +    add_srs_wkt (p, 8,
          553  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          554  +    add_srs_wkt (p, 9,
          555  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
          556  +    add_srs_wkt (p, 10,
          557  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          558  +    add_srs_wkt (p, 11,
          559  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          560  +    add_srs_wkt (p, 12,
          561  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          562  +    add_srs_wkt (p, 13,
          563  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2741\"]]");
   564    564       p = add_epsg_def_ex (filter, first, last, 2742, "epsg", 2742,
   565    565           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 144E", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Pulkovo_1995", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=144 +k=1 +x_0=500000 +y_0=0 ");
   571    571       add_proj4text (p, 1,
   572         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          572  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   573    573       add_proj4text (p, 2,
   574         -        "2 +units=m +no_defs");
          574  +        ".22 +units=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 144E\",");
   577    577       add_srs_wkt (p, 1,
   578    578           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   579    579       add_srs_wkt (p, 2,
   580    580           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   581    581       add_srs_wkt (p, 3,
   582         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   583         -    add_srs_wkt (p, 4,
   584         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   585         -    add_srs_wkt (p, 5,
   586         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   587         -    add_srs_wkt (p, 6,
   588         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   589         -    add_srs_wkt (p, 7,
   590         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   591         -    add_srs_wkt (p, 8,
   592         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   593         -    add_srs_wkt (p, 9,
   594         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",144],PAR");
   595         -    add_srs_wkt (p, 10,
   596         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   597         -    add_srs_wkt (p, 11,
   598         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   599         -    add_srs_wkt (p, 12,
   600         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   601         -    add_srs_wkt (p, 13,
   602         -        "\",EAST],AUTHORITY[\"EPSG\",\"2742\"]]");
          582  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          583  +    add_srs_wkt (p, 4,
          584  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          585  +    add_srs_wkt (p, 5,
          586  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          587  +    add_srs_wkt (p, 6,
          588  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          589  +    add_srs_wkt (p, 7,
          590  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          591  +    add_srs_wkt (p, 8,
          592  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          593  +    add_srs_wkt (p, 9,
          594  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",144],P");
          595  +    add_srs_wkt (p, 10,
          596  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          597  +    add_srs_wkt (p, 11,
          598  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          599  +    add_srs_wkt (p, 12,
          600  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          601  +    add_srs_wkt (p, 13,
          602  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2742\"]]");
   603    603       p = add_epsg_def_ex (filter, first, last, 2743, "epsg", 2743,
   604    604           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 147E", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Pulkovo_1995", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
   610    610       add_proj4text (p, 1,
   611         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          611  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   612    612       add_proj4text (p, 2,
   613         -        "2 +units=m +no_defs");
          613  +        ".22 +units=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 147E\",");
   616    616       add_srs_wkt (p, 1,
   617    617           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   618    618       add_srs_wkt (p, 2,
   619    619           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   620    620       add_srs_wkt (p, 3,
   621         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   622         -    add_srs_wkt (p, 4,
   623         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   624         -    add_srs_wkt (p, 5,
   625         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   626         -    add_srs_wkt (p, 6,
   627         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   628         -    add_srs_wkt (p, 7,
   629         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   630         -    add_srs_wkt (p, 8,
   631         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   632         -    add_srs_wkt (p, 9,
   633         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",147],PAR");
   634         -    add_srs_wkt (p, 10,
   635         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   636         -    add_srs_wkt (p, 11,
   637         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   638         -    add_srs_wkt (p, 12,
   639         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   640         -    add_srs_wkt (p, 13,
   641         -        "\",EAST],AUTHORITY[\"EPSG\",\"2743\"]]");
          621  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          622  +    add_srs_wkt (p, 4,
          623  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          624  +    add_srs_wkt (p, 5,
          625  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          626  +    add_srs_wkt (p, 6,
          627  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          628  +    add_srs_wkt (p, 7,
          629  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          630  +    add_srs_wkt (p, 8,
          631  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          632  +    add_srs_wkt (p, 9,
          633  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
          634  +    add_srs_wkt (p, 10,
          635  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          636  +    add_srs_wkt (p, 11,
          637  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          638  +    add_srs_wkt (p, 12,
          639  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          640  +    add_srs_wkt (p, 13,
          641  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2743\"]]");
   642    642       p = add_epsg_def_ex (filter, first, last, 2744, "epsg", 2744,
   643    643           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 150E", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Pulkovo_1995", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=150 +k=1 +x_0=500000 +y_0=0 ");
   649    649       add_proj4text (p, 1,
   650         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          650  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   651    651       add_proj4text (p, 2,
   652         -        "2 +units=m +no_defs");
          652  +        ".22 +units=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 150E\",");
   655    655       add_srs_wkt (p, 1,
   656    656           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   657    657       add_srs_wkt (p, 2,
   658    658           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   659    659       add_srs_wkt (p, 3,
   660         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   661         -    add_srs_wkt (p, 4,
   662         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   663         -    add_srs_wkt (p, 5,
   664         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   665         -    add_srs_wkt (p, 6,
   666         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   667         -    add_srs_wkt (p, 7,
   668         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   669         -    add_srs_wkt (p, 8,
   670         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   671         -    add_srs_wkt (p, 9,
   672         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",150],PAR");
   673         -    add_srs_wkt (p, 10,
   674         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   675         -    add_srs_wkt (p, 11,
   676         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   677         -    add_srs_wkt (p, 12,
   678         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   679         -    add_srs_wkt (p, 13,
   680         -        "\",EAST],AUTHORITY[\"EPSG\",\"2744\"]]");
          660  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          661  +    add_srs_wkt (p, 4,
          662  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          663  +    add_srs_wkt (p, 5,
          664  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          665  +    add_srs_wkt (p, 6,
          666  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          667  +    add_srs_wkt (p, 7,
          668  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          669  +    add_srs_wkt (p, 8,
          670  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          671  +    add_srs_wkt (p, 9,
          672  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",150],P");
          673  +    add_srs_wkt (p, 10,
          674  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          675  +    add_srs_wkt (p, 11,
          676  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          677  +    add_srs_wkt (p, 12,
          678  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          679  +    add_srs_wkt (p, 13,
          680  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2744\"]]");
   681    681       p = add_epsg_def_ex (filter, first, last, 2745, "epsg", 2745,
   682    682           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 153E", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Pulkovo_1995", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
   688    688       add_proj4text (p, 1,
   689         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          689  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   690    690       add_proj4text (p, 2,
   691         -        "2 +units=m +no_defs");
          691  +        ".22 +units=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 153E\",");
   694    694       add_srs_wkt (p, 1,
   695    695           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   696    696       add_srs_wkt (p, 2,
   697    697           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   698    698       add_srs_wkt (p, 3,
   699         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   700         -    add_srs_wkt (p, 4,
   701         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   702         -    add_srs_wkt (p, 5,
   703         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   704         -    add_srs_wkt (p, 6,
   705         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   706         -    add_srs_wkt (p, 7,
   707         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   708         -    add_srs_wkt (p, 8,
   709         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   710         -    add_srs_wkt (p, 9,
   711         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",153],PAR");
   712         -    add_srs_wkt (p, 10,
   713         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   714         -    add_srs_wkt (p, 11,
   715         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   716         -    add_srs_wkt (p, 12,
   717         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   718         -    add_srs_wkt (p, 13,
   719         -        "\",EAST],AUTHORITY[\"EPSG\",\"2745\"]]");
          699  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          700  +    add_srs_wkt (p, 4,
          701  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          702  +    add_srs_wkt (p, 5,
          703  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          704  +    add_srs_wkt (p, 6,
          705  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          706  +    add_srs_wkt (p, 7,
          707  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          708  +    add_srs_wkt (p, 8,
          709  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          710  +    add_srs_wkt (p, 9,
          711  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
          712  +    add_srs_wkt (p, 10,
          713  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          714  +    add_srs_wkt (p, 11,
          715  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          716  +    add_srs_wkt (p, 12,
          717  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          718  +    add_srs_wkt (p, 13,
          719  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2745\"]]");
   720    720       p = add_epsg_def_ex (filter, first, last, 2746, "epsg", 2746,
   721    721           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 156E", 0, 1,
   722    722           "Krassowsky 1940", "Greenwich",
   723    723           "Pulkovo_1995", "Transverse_Mercator", "metre",
   724    724           "X", "North", "Y", "East");
   725    725       add_proj4text (p, 0,
   726    726           "+proj=tmerc +lat_0=0 +lon_0=156 +k=1 +x_0=500000 +y_0=0 ");
   727    727       add_proj4text (p, 1,
   728         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          728  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   729    729       add_proj4text (p, 2,
   730         -        "2 +units=m +no_defs");
          730  +        ".22 +units=m +no_defs");
   731    731       add_srs_wkt (p, 0,
   732    732           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 156E\",");
   733    733       add_srs_wkt (p, 1,
   734    734           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   735    735       add_srs_wkt (p, 2,
   736    736           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   737    737       add_srs_wkt (p, 3,
   738         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   739         -    add_srs_wkt (p, 4,
   740         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   741         -    add_srs_wkt (p, 5,
   742         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   743         -    add_srs_wkt (p, 6,
   744         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   745         -    add_srs_wkt (p, 7,
   746         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   747         -    add_srs_wkt (p, 8,
   748         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   749         -    add_srs_wkt (p, 9,
   750         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",156],PAR");
   751         -    add_srs_wkt (p, 10,
   752         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   753         -    add_srs_wkt (p, 11,
   754         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   755         -    add_srs_wkt (p, 12,
   756         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   757         -    add_srs_wkt (p, 13,
   758         -        "\",EAST],AUTHORITY[\"EPSG\",\"2746\"]]");
          738  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          739  +    add_srs_wkt (p, 4,
          740  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          741  +    add_srs_wkt (p, 5,
          742  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          743  +    add_srs_wkt (p, 6,
          744  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          745  +    add_srs_wkt (p, 7,
          746  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          747  +    add_srs_wkt (p, 8,
          748  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          749  +    add_srs_wkt (p, 9,
          750  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",156],P");
          751  +    add_srs_wkt (p, 10,
          752  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          753  +    add_srs_wkt (p, 11,
          754  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          755  +    add_srs_wkt (p, 12,
          756  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          757  +    add_srs_wkt (p, 13,
          758  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2746\"]]");
   759    759       p = add_epsg_def_ex (filter, first, last, 2747, "epsg", 2747,
   760    760           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 159E", 0, 1,
   761    761           "Krassowsky 1940", "Greenwich",
   762    762           "Pulkovo_1995", "Transverse_Mercator", "metre",
   763    763           "X", "North", "Y", "East");
   764    764       add_proj4text (p, 0,
   765    765           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
   766    766       add_proj4text (p, 1,
   767         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          767  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   768    768       add_proj4text (p, 2,
   769         -        "2 +units=m +no_defs");
          769  +        ".22 +units=m +no_defs");
   770    770       add_srs_wkt (p, 0,
   771    771           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 159E\",");
   772    772       add_srs_wkt (p, 1,
   773    773           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   774    774       add_srs_wkt (p, 2,
   775    775           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   776    776       add_srs_wkt (p, 3,
   777         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   778         -    add_srs_wkt (p, 4,
   779         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   780         -    add_srs_wkt (p, 5,
   781         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   782         -    add_srs_wkt (p, 6,
   783         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   784         -    add_srs_wkt (p, 7,
   785         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   786         -    add_srs_wkt (p, 8,
   787         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   788         -    add_srs_wkt (p, 9,
   789         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",159],PAR");
   790         -    add_srs_wkt (p, 10,
   791         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   792         -    add_srs_wkt (p, 11,
   793         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   794         -    add_srs_wkt (p, 12,
   795         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   796         -    add_srs_wkt (p, 13,
   797         -        "\",EAST],AUTHORITY[\"EPSG\",\"2747\"]]");
          777  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          778  +    add_srs_wkt (p, 4,
          779  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          780  +    add_srs_wkt (p, 5,
          781  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          782  +    add_srs_wkt (p, 6,
          783  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          784  +    add_srs_wkt (p, 7,
          785  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          786  +    add_srs_wkt (p, 8,
          787  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          788  +    add_srs_wkt (p, 9,
          789  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
          790  +    add_srs_wkt (p, 10,
          791  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          792  +    add_srs_wkt (p, 11,
          793  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          794  +    add_srs_wkt (p, 12,
          795  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          796  +    add_srs_wkt (p, 13,
          797  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2747\"]]");
   798    798       p = add_epsg_def_ex (filter, first, last, 2748, "epsg", 2748,
   799    799           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 162E", 0, 1,
   800    800           "Krassowsky 1940", "Greenwich",
   801    801           "Pulkovo_1995", "Transverse_Mercator", "metre",
   802    802           "X", "North", "Y", "East");
   803    803       add_proj4text (p, 0,
   804    804           "+proj=tmerc +lat_0=0 +lon_0=162 +k=1 +x_0=500000 +y_0=0 ");
   805    805       add_proj4text (p, 1,
   806         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          806  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   807    807       add_proj4text (p, 2,
   808         -        "2 +units=m +no_defs");
          808  +        ".22 +units=m +no_defs");
   809    809       add_srs_wkt (p, 0,
   810    810           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 162E\",");
   811    811       add_srs_wkt (p, 1,
   812    812           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   813    813       add_srs_wkt (p, 2,
   814    814           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   815    815       add_srs_wkt (p, 3,
   816         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   817         -    add_srs_wkt (p, 4,
   818         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   819         -    add_srs_wkt (p, 5,
   820         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   821         -    add_srs_wkt (p, 6,
   822         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   823         -    add_srs_wkt (p, 7,
   824         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   825         -    add_srs_wkt (p, 8,
   826         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   827         -    add_srs_wkt (p, 9,
   828         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",162],PAR");
   829         -    add_srs_wkt (p, 10,
   830         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   831         -    add_srs_wkt (p, 11,
   832         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   833         -    add_srs_wkt (p, 12,
   834         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   835         -    add_srs_wkt (p, 13,
   836         -        "\",EAST],AUTHORITY[\"EPSG\",\"2748\"]]");
          816  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          817  +    add_srs_wkt (p, 4,
          818  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          819  +    add_srs_wkt (p, 5,
          820  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          821  +    add_srs_wkt (p, 6,
          822  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          823  +    add_srs_wkt (p, 7,
          824  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          825  +    add_srs_wkt (p, 8,
          826  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          827  +    add_srs_wkt (p, 9,
          828  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",162],P");
          829  +    add_srs_wkt (p, 10,
          830  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          831  +    add_srs_wkt (p, 11,
          832  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          833  +    add_srs_wkt (p, 12,
          834  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          835  +    add_srs_wkt (p, 13,
          836  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2748\"]]");
   837    837       p = add_epsg_def_ex (filter, first, last, 2749, "epsg", 2749,
   838    838           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 165E", 0, 1,
   839    839           "Krassowsky 1940", "Greenwich",
   840    840           "Pulkovo_1995", "Transverse_Mercator", "metre",
   841    841           "X", "North", "Y", "East");
   842    842       add_proj4text (p, 0,
   843    843           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
   844    844       add_proj4text (p, 1,
   845         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          845  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   846    846       add_proj4text (p, 2,
   847         -        "2 +units=m +no_defs");
          847  +        ".22 +units=m +no_defs");
   848    848       add_srs_wkt (p, 0,
   849    849           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 165E\",");
   850    850       add_srs_wkt (p, 1,
   851    851           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   852    852       add_srs_wkt (p, 2,
   853    853           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   854    854       add_srs_wkt (p, 3,
   855         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   856         -    add_srs_wkt (p, 4,
   857         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   858         -    add_srs_wkt (p, 5,
   859         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   860         -    add_srs_wkt (p, 6,
   861         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   862         -    add_srs_wkt (p, 7,
   863         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   864         -    add_srs_wkt (p, 8,
   865         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   866         -    add_srs_wkt (p, 9,
   867         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",165],PAR");
   868         -    add_srs_wkt (p, 10,
   869         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   870         -    add_srs_wkt (p, 11,
   871         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   872         -    add_srs_wkt (p, 12,
   873         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   874         -    add_srs_wkt (p, 13,
   875         -        "\",EAST],AUTHORITY[\"EPSG\",\"2749\"]]");
          855  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          856  +    add_srs_wkt (p, 4,
          857  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          858  +    add_srs_wkt (p, 5,
          859  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          860  +    add_srs_wkt (p, 6,
          861  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          862  +    add_srs_wkt (p, 7,
          863  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          864  +    add_srs_wkt (p, 8,
          865  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          866  +    add_srs_wkt (p, 9,
          867  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
          868  +    add_srs_wkt (p, 10,
          869  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          870  +    add_srs_wkt (p, 11,
          871  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          872  +    add_srs_wkt (p, 12,
          873  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          874  +    add_srs_wkt (p, 13,
          875  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2749\"]]");
   876    876       p = add_epsg_def_ex (filter, first, last, 2750, "epsg", 2750,
   877    877           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 168E", 0, 1,
   878    878           "Krassowsky 1940", "Greenwich",
   879    879           "Pulkovo_1995", "Transverse_Mercator", "metre",
   880    880           "X", "North", "Y", "East");
   881    881       add_proj4text (p, 0,
   882    882           "+proj=tmerc +lat_0=0 +lon_0=168 +k=1 +x_0=500000 +y_0=0 ");
   883    883       add_proj4text (p, 1,
   884         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          884  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   885    885       add_proj4text (p, 2,
   886         -        "2 +units=m +no_defs");
          886  +        ".22 +units=m +no_defs");
   887    887       add_srs_wkt (p, 0,
   888    888           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 168E\",");
   889    889       add_srs_wkt (p, 1,
   890    890           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   891    891       add_srs_wkt (p, 2,
   892    892           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   893    893       add_srs_wkt (p, 3,
   894         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   895         -    add_srs_wkt (p, 4,
   896         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   897         -    add_srs_wkt (p, 5,
   898         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   899         -    add_srs_wkt (p, 6,
   900         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   901         -    add_srs_wkt (p, 7,
   902         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   903         -    add_srs_wkt (p, 8,
   904         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   905         -    add_srs_wkt (p, 9,
   906         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",168],PAR");
   907         -    add_srs_wkt (p, 10,
   908         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   909         -    add_srs_wkt (p, 11,
   910         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   911         -    add_srs_wkt (p, 12,
   912         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   913         -    add_srs_wkt (p, 13,
   914         -        "\",EAST],AUTHORITY[\"EPSG\",\"2750\"]]");
          894  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          895  +    add_srs_wkt (p, 4,
          896  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          897  +    add_srs_wkt (p, 5,
          898  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          899  +    add_srs_wkt (p, 6,
          900  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          901  +    add_srs_wkt (p, 7,
          902  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          903  +    add_srs_wkt (p, 8,
          904  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          905  +    add_srs_wkt (p, 9,
          906  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",168],P");
          907  +    add_srs_wkt (p, 10,
          908  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          909  +    add_srs_wkt (p, 11,
          910  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          911  +    add_srs_wkt (p, 12,
          912  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          913  +    add_srs_wkt (p, 13,
          914  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2750\"]]");
   915    915       p = add_epsg_def_ex (filter, first, last, 2751, "epsg", 2751,
   916    916           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 171E", 0, 1,
   917    917           "Krassowsky 1940", "Greenwich",
   918    918           "Pulkovo_1995", "Transverse_Mercator", "metre",
   919    919           "X", "North", "Y", "East");
   920    920       add_proj4text (p, 0,
   921    921           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
   922    922       add_proj4text (p, 1,
   923         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          923  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   924    924       add_proj4text (p, 2,
   925         -        "2 +units=m +no_defs");
          925  +        ".22 +units=m +no_defs");
   926    926       add_srs_wkt (p, 0,
   927    927           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 171E\",");
   928    928       add_srs_wkt (p, 1,
   929    929           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   930    930       add_srs_wkt (p, 2,
   931    931           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   932    932       add_srs_wkt (p, 3,
   933         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   934         -    add_srs_wkt (p, 4,
   935         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   936         -    add_srs_wkt (p, 5,
   937         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   938         -    add_srs_wkt (p, 6,
   939         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   940         -    add_srs_wkt (p, 7,
   941         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   942         -    add_srs_wkt (p, 8,
   943         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   944         -    add_srs_wkt (p, 9,
   945         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",171],PAR");
   946         -    add_srs_wkt (p, 10,
   947         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   948         -    add_srs_wkt (p, 11,
   949         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   950         -    add_srs_wkt (p, 12,
   951         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   952         -    add_srs_wkt (p, 13,
   953         -        "\",EAST],AUTHORITY[\"EPSG\",\"2751\"]]");
          933  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          934  +    add_srs_wkt (p, 4,
          935  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          936  +    add_srs_wkt (p, 5,
          937  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          938  +    add_srs_wkt (p, 6,
          939  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          940  +    add_srs_wkt (p, 7,
          941  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          942  +    add_srs_wkt (p, 8,
          943  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          944  +    add_srs_wkt (p, 9,
          945  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
          946  +    add_srs_wkt (p, 10,
          947  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          948  +    add_srs_wkt (p, 11,
          949  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          950  +    add_srs_wkt (p, 12,
          951  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          952  +    add_srs_wkt (p, 13,
          953  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2751\"]]");
   954    954       p = add_epsg_def_ex (filter, first, last, 2752, "epsg", 2752,
   955    955           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 174E", 0, 1,
   956    956           "Krassowsky 1940", "Greenwich",
   957    957           "Pulkovo_1995", "Transverse_Mercator", "metre",
   958    958           "X", "North", "Y", "East");
   959    959       add_proj4text (p, 0,
   960    960           "+proj=tmerc +lat_0=0 +lon_0=174 +k=1 +x_0=500000 +y_0=0 ");
   961    961       add_proj4text (p, 1,
   962         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          962  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   963    963       add_proj4text (p, 2,
   964         -        "2 +units=m +no_defs");
          964  +        ".22 +units=m +no_defs");
   965    965       add_srs_wkt (p, 0,
   966    966           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 174E\",");
   967    967       add_srs_wkt (p, 1,
   968    968           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   969    969       add_srs_wkt (p, 2,
   970    970           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   971    971       add_srs_wkt (p, 3,
   972         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   973         -    add_srs_wkt (p, 4,
   974         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   975         -    add_srs_wkt (p, 5,
   976         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   977         -    add_srs_wkt (p, 6,
   978         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   979         -    add_srs_wkt (p, 7,
   980         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   981         -    add_srs_wkt (p, 8,
   982         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   983         -    add_srs_wkt (p, 9,
   984         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",174],PAR");
   985         -    add_srs_wkt (p, 10,
   986         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   987         -    add_srs_wkt (p, 11,
   988         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   989         -    add_srs_wkt (p, 12,
   990         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   991         -    add_srs_wkt (p, 13,
   992         -        "\",EAST],AUTHORITY[\"EPSG\",\"2752\"]]");
          972  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          973  +    add_srs_wkt (p, 4,
          974  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          975  +    add_srs_wkt (p, 5,
          976  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          977  +    add_srs_wkt (p, 6,
          978  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          979  +    add_srs_wkt (p, 7,
          980  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          981  +    add_srs_wkt (p, 8,
          982  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          983  +    add_srs_wkt (p, 9,
          984  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",174],P");
          985  +    add_srs_wkt (p, 10,
          986  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          987  +    add_srs_wkt (p, 11,
          988  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          989  +    add_srs_wkt (p, 12,
          990  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          991  +    add_srs_wkt (p, 13,
          992  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2752\"]]");
   993    993       p = add_epsg_def_ex (filter, first, last, 2753, "epsg", 2753,
   994    994           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 177E", 0, 1,
   995    995           "Krassowsky 1940", "Greenwich",
   996    996           "Pulkovo_1995", "Transverse_Mercator", "metre",
   997    997           "X", "North", "Y", "East");
   998    998       add_proj4text (p, 0,
   999    999           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
  1000   1000       add_proj4text (p, 1,
  1001         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1001  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1002   1002       add_proj4text (p, 2,
  1003         -        "2 +units=m +no_defs");
         1003  +        ".22 +units=m +no_defs");
  1004   1004       add_srs_wkt (p, 0,
  1005   1005           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 177E\",");
  1006   1006       add_srs_wkt (p, 1,
  1007   1007           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1008   1008       add_srs_wkt (p, 2,
  1009   1009           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1010   1010       add_srs_wkt (p, 3,
  1011         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1012         -    add_srs_wkt (p, 4,
  1013         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1014         -    add_srs_wkt (p, 5,
  1015         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1016         -    add_srs_wkt (p, 6,
  1017         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1018         -    add_srs_wkt (p, 7,
  1019         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1020         -    add_srs_wkt (p, 8,
  1021         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1022         -    add_srs_wkt (p, 9,
  1023         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",177],PAR");
  1024         -    add_srs_wkt (p, 10,
  1025         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1026         -    add_srs_wkt (p, 11,
  1027         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1028         -    add_srs_wkt (p, 12,
  1029         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1030         -    add_srs_wkt (p, 13,
  1031         -        "\",EAST],AUTHORITY[\"EPSG\",\"2753\"]]");
         1011  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1012  +    add_srs_wkt (p, 4,
         1013  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1014  +    add_srs_wkt (p, 5,
         1015  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1016  +    add_srs_wkt (p, 6,
         1017  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1018  +    add_srs_wkt (p, 7,
         1019  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1020  +    add_srs_wkt (p, 8,
         1021  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1022  +    add_srs_wkt (p, 9,
         1023  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
         1024  +    add_srs_wkt (p, 10,
         1025  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1026  +    add_srs_wkt (p, 11,
         1027  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1028  +    add_srs_wkt (p, 12,
         1029  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1030  +    add_srs_wkt (p, 13,
         1031  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2753\"]]");
  1032   1032       p = add_epsg_def_ex (filter, first, last, 2754, "epsg", 2754,
  1033   1033           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 180E", 0, 1,
  1034   1034           "Krassowsky 1940", "Greenwich",
  1035   1035           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1036   1036           "X", "North", "Y", "East");
  1037   1037       add_proj4text (p, 0,
  1038   1038           "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=500000 +y_0=0 ");
  1039   1039       add_proj4text (p, 1,
  1040         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1040  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1041   1041       add_proj4text (p, 2,
  1042         -        "2 +units=m +no_defs");
         1042  +        ".22 +units=m +no_defs");
  1043   1043       add_srs_wkt (p, 0,
  1044   1044           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 180E\",");
  1045   1045       add_srs_wkt (p, 1,
  1046   1046           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1047   1047       add_srs_wkt (p, 2,
  1048   1048           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1049   1049       add_srs_wkt (p, 3,
  1050         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1051         -    add_srs_wkt (p, 4,
  1052         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1053         -    add_srs_wkt (p, 5,
  1054         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1055         -    add_srs_wkt (p, 6,
  1056         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1057         -    add_srs_wkt (p, 7,
  1058         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1059         -    add_srs_wkt (p, 8,
  1060         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1061         -    add_srs_wkt (p, 9,
  1062         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",180],PAR");
  1063         -    add_srs_wkt (p, 10,
  1064         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1065         -    add_srs_wkt (p, 11,
  1066         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1067         -    add_srs_wkt (p, 12,
  1068         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1069         -    add_srs_wkt (p, 13,
  1070         -        "\",EAST],AUTHORITY[\"EPSG\",\"2754\"]]");
         1050  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1051  +    add_srs_wkt (p, 4,
         1052  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1053  +    add_srs_wkt (p, 5,
         1054  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1055  +    add_srs_wkt (p, 6,
         1056  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1057  +    add_srs_wkt (p, 7,
         1058  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1059  +    add_srs_wkt (p, 8,
         1060  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1061  +    add_srs_wkt (p, 9,
         1062  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",180],P");
         1063  +    add_srs_wkt (p, 10,
         1064  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1065  +    add_srs_wkt (p, 11,
         1066  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1067  +    add_srs_wkt (p, 12,
         1068  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1069  +    add_srs_wkt (p, 13,
         1070  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"2754\"]]");
  1071   1071       p = add_epsg_def_ex (filter, first, last, 2755, "epsg", 2755,
  1072   1072           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 177W", 0, 1,
  1073   1073           "Krassowsky 1940", "Greenwich",
  1074   1074           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1075   1075           "X", "North", "Y", "East");
  1076   1076       add_proj4text (p, 0,
  1077   1077           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
  1078   1078       add_proj4text (p, 1,
  1079         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1079  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1080   1080       add_proj4text (p, 2,
  1081         -        "22 +units=m +no_defs");
         1081  +        "0.22 +units=m +no_defs");
  1082   1082       add_srs_wkt (p, 0,
  1083   1083           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 177W\",");
  1084   1084       add_srs_wkt (p, 1,
  1085   1085           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1086   1086       add_srs_wkt (p, 2,
  1087   1087           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1088   1088       add_srs_wkt (p, 3,
  1089         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1089  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1090   1090       add_srs_wkt (p, 4,
  1091         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1091  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1092   1092       add_srs_wkt (p, 5,
  1093         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1093  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1094   1094       add_srs_wkt (p, 6,
  1095         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1095  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1096   1096       add_srs_wkt (p, 7,
  1097         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1097  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1098   1098       add_srs_wkt (p, 8,
  1099         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1099  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1100   1100       add_srs_wkt (p, 9,
  1101         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-177],PA");
         1101  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
  1102   1102       add_srs_wkt (p, 10,
  1103         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1103  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1104   1104       add_srs_wkt (p, 11,
  1105         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1105  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1106   1106       add_srs_wkt (p, 12,
  1107         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1107  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1108   1108       add_srs_wkt (p, 13,
  1109   1109           "Y\",EAST],AUTHORITY[\"EPSG\",\"2755\"]]");
  1110   1110       p = add_epsg_def_ex (filter, first, last, 2756, "epsg", 2756,
  1111   1111           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 174W", 0, 1,
  1112   1112           "Krassowsky 1940", "Greenwich",
  1113   1113           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1114   1114           "X", "North", "Y", "East");
  1115   1115       add_proj4text (p, 0,
  1116   1116           "+proj=tmerc +lat_0=0 +lon_0=-174 +k=1 +x_0=500000 +y_0=0");
  1117   1117       add_proj4text (p, 1,
  1118         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1118  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1119   1119       add_proj4text (p, 2,
  1120         -        "22 +units=m +no_defs");
         1120  +        "0.22 +units=m +no_defs");
  1121   1121       add_srs_wkt (p, 0,
  1122   1122           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 174W\",");
  1123   1123       add_srs_wkt (p, 1,
  1124   1124           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1125   1125       add_srs_wkt (p, 2,
  1126   1126           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1127   1127       add_srs_wkt (p, 3,
  1128         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1128  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1129   1129       add_srs_wkt (p, 4,
  1130         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1130  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1131   1131       add_srs_wkt (p, 5,
  1132         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1132  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1133   1133       add_srs_wkt (p, 6,
  1134         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1134  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1135   1135       add_srs_wkt (p, 7,
  1136         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1136  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1137   1137       add_srs_wkt (p, 8,
  1138         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1138  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1139   1139       add_srs_wkt (p, 9,
  1140         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-174],PA");
         1140  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-174],");
  1141   1141       add_srs_wkt (p, 10,
  1142         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1142  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1143   1143       add_srs_wkt (p, 11,
  1144         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1144  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1145   1145       add_srs_wkt (p, 12,
  1146         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1146  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1147   1147       add_srs_wkt (p, 13,
  1148   1148           "Y\",EAST],AUTHORITY[\"EPSG\",\"2756\"]]");
  1149   1149       p = add_epsg_def_ex (filter, first, last, 2757, "epsg", 2757,
  1150   1150           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 171W", 0, 1,
  1151   1151           "Krassowsky 1940", "Greenwich",
  1152   1152           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1153   1153           "X", "North", "Y", "East");
  1154   1154       add_proj4text (p, 0,
  1155   1155           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
  1156   1156       add_proj4text (p, 1,
  1157         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1157  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1158   1158       add_proj4text (p, 2,
  1159         -        "22 +units=m +no_defs");
         1159  +        "0.22 +units=m +no_defs");
  1160   1160       add_srs_wkt (p, 0,
  1161   1161           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 171W\",");
  1162   1162       add_srs_wkt (p, 1,
  1163   1163           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1164   1164       add_srs_wkt (p, 2,
  1165   1165           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1166   1166       add_srs_wkt (p, 3,
  1167         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1167  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1168   1168       add_srs_wkt (p, 4,
  1169         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1169  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1170   1170       add_srs_wkt (p, 5,
  1171         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1171  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1172   1172       add_srs_wkt (p, 6,
  1173         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1173  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1174   1174       add_srs_wkt (p, 7,
  1175         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1175  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1176   1176       add_srs_wkt (p, 8,
  1177         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1177  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1178   1178       add_srs_wkt (p, 9,
  1179         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-171],PA");
         1179  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
  1180   1180       add_srs_wkt (p, 10,
  1181         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1181  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1182   1182       add_srs_wkt (p, 11,
  1183         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1183  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1184   1184       add_srs_wkt (p, 12,
  1185         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1185  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1186   1186       add_srs_wkt (p, 13,
  1187   1187           "Y\",EAST],AUTHORITY[\"EPSG\",\"2757\"]]");
  1188   1188       p = add_epsg_def_ex (filter, first, last, 2758, "epsg", 2758,
  1189   1189           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 168W", 0, 1,
  1190   1190           "Krassowsky 1940", "Greenwich",
  1191   1191           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1192   1192           "X", "North", "Y", "East");
  1193   1193       add_proj4text (p, 0,
  1194   1194           "+proj=tmerc +lat_0=0 +lon_0=-168 +k=1 +x_0=500000 +y_0=0");
  1195   1195       add_proj4text (p, 1,
  1196         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1196  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1197   1197       add_proj4text (p, 2,
  1198         -        "22 +units=m +no_defs");
         1198  +        "0.22 +units=m +no_defs");
  1199   1199       add_srs_wkt (p, 0,
  1200   1200           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 168W\",");
  1201   1201       add_srs_wkt (p, 1,
  1202   1202           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1203   1203       add_srs_wkt (p, 2,
  1204   1204           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1205   1205       add_srs_wkt (p, 3,
  1206         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1206  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1207   1207       add_srs_wkt (p, 4,
  1208         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1208  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1209   1209       add_srs_wkt (p, 5,
  1210         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1210  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1211   1211       add_srs_wkt (p, 6,
  1212         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1212  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1213   1213       add_srs_wkt (p, 7,
  1214         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1214  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1215   1215       add_srs_wkt (p, 8,
  1216         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1216  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1217   1217       add_srs_wkt (p, 9,
  1218         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-168],PA");
         1218  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-168],");
  1219   1219       add_srs_wkt (p, 10,
  1220         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1220  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1221   1221       add_srs_wkt (p, 11,
  1222         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1222  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1223   1223       add_srs_wkt (p, 12,
  1224         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1224  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1225   1225       add_srs_wkt (p, 13,
  1226   1226           "Y\",EAST],AUTHORITY[\"EPSG\",\"2758\"]]");
  1227   1227       p = add_epsg_def_ex (filter, first, last, 2759, "epsg", 2759,
  1228   1228           "NAD83(HARN) / Alabama East", 0, 0,
  1229   1229           "GRS 1980", "Greenwich",
  1230   1230           "NAD83_High_Accuracy_Reference_Network", "Transverse_Mercator", "metre",
  1231   1231           "X", "East", "Y", "North");

Changes to src/srsinit/epsg_inlined_08.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_09.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    66     66       add_proj4text (p, 2,
    67     67           "0 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Beduaram / TM 13 NE\",GEOGCS[\"Beduaram\",DATUM");
    70     70       add_srs_wkt (p, 1,
    71     71           "[\"Beduaram\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,2");
    72     72       add_srs_wkt (p, 2,
    73         -        "93.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-");
           73  +        "93.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-");
    74     74       add_srs_wkt (p, 3,
    75     75           "106,-87,188,0,0,0,0],AUTHORITY[\"EPSG\",\"6213\"]],PRIME");
    76     76       add_srs_wkt (p, 4,
    77     77           "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
    78     78       add_srs_wkt (p, 5,
    79     79           "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
    80     80       add_srs_wkt (p, 6,
................................................................................
    99     99           "Qatar_National_Datum_1995", "Transverse_Mercator", "metre",
   100    100           "Easting", "East", "Northing", "North");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=24.45 +lon_0=51.21666666666667 +k=0.9");
   103    103       add_proj4text (p, 1,
   104    104           "9999 +x_0=200000 +y_0=300000 +ellps=intl +towgs84=-119.4");
   105    105       add_proj4text (p, 2,
   106         -        "248,-303.65872,-11.00061,1.164298,0.174458,1.096259,3.65");
          106  +        "25,-303.659,-11.0006,1.1643,0.174458,1.09626,3.65706 +un");
   107    107       add_proj4text (p, 3,
   108         -        "7065 +units=m +no_defs");
          108  +        "its=m +no_defs");
   109    109       add_srs_wkt (p, 0,
   110    110           "PROJCS[\"QND95 / Qatar National Grid\",GEOGCS[\"QND95\",");
   111    111       add_srs_wkt (p, 1,
   112    112           "DATUM[\"Qatar_National_Datum_1995\",SPHEROID[\"Internati");
   113    113       add_srs_wkt (p, 2,
   114    114           "onal 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TO");
   115    115       add_srs_wkt (p, 3,
   116         -        "WGS84[-119.4248,-303.65872,-11.00061,1.164298,0.174458,1");
   117         -    add_srs_wkt (p, 4,
   118         -        ".096259,3.657065],AUTHORITY[\"EPSG\",\"6614\"]],PRIMEM[\"");
   119         -    add_srs_wkt (p, 5,
   120         -        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
   121         -    add_srs_wkt (p, 6,
   122         -        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
   123         -    add_srs_wkt (p, 7,
   124         -        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
   125         -    add_srs_wkt (p, 8,
   126         -        "[\"EPSG\",\"4614\"]],PROJECTION[\"Transverse_Mercator\"]");
   127         -    add_srs_wkt (p, 9,
   128         -        ",PARAMETER[\"latitude_of_origin\",24.45],PARAMETER[\"cen");
   129         -    add_srs_wkt (p, 10,
   130         -        "tral_meridian\",51.21666666666667],PARAMETER[\"scale_fac");
   131         -    add_srs_wkt (p, 11,
   132         -        "tor\",0.99999],PARAMETER[\"false_easting\",200000],PARAM");
   133         -    add_srs_wkt (p, 12,
   134         -        "ETER[\"false_northing\",300000],UNIT[\"metre\",1,AUTHORI");
   135         -    add_srs_wkt (p, 13,
   136         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Nor");
   137         -    add_srs_wkt (p, 14,
   138         -        "thing\",NORTH],AUTHORITY[\"EPSG\",\"2932\"]]");
          116  +        "WGS84[-119.425,-303.659,-11.0006,1.1643,0.174458,1.09626");
          117  +    add_srs_wkt (p, 4,
          118  +        ",3.65706],AUTHORITY[\"EPSG\",\"6614\"]],PRIMEM[\"Greenwi");
          119  +    add_srs_wkt (p, 5,
          120  +        "ch\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0");
          121  +    add_srs_wkt (p, 6,
          122  +        "174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lat");
          123  +    add_srs_wkt (p, 7,
          124  +        "itude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG");
          125  +    add_srs_wkt (p, 8,
          126  +        "\",\"4614\"]],PROJECTION[\"Transverse_Mercator\"],PARAME");
          127  +    add_srs_wkt (p, 9,
          128  +        "TER[\"latitude_of_origin\",24.45],PARAMETER[\"central_me");
          129  +    add_srs_wkt (p, 10,
          130  +        "ridian\",51.21666666666667],PARAMETER[\"scale_factor\",0");
          131  +    add_srs_wkt (p, 11,
          132  +        ".99999],PARAMETER[\"false_easting\",200000],PARAMETER[\"");
          133  +    add_srs_wkt (p, 12,
          134  +        "false_northing\",300000],UNIT[\"metre\",1,AUTHORITY[\"EP");
          135  +    add_srs_wkt (p, 13,
          136  +        "SG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
          137  +    add_srs_wkt (p, 14,
          138  +        ",NORTH],AUTHORITY[\"EPSG\",\"2932\"]]");
   139    139       p = add_epsg_def_ex (filter, first, last, 2933, "epsg", 2933,
   140    140           "Segara / UTM zone 50S", 0, 0,
   141    141           "Bessel 1841", "Greenwich",
   142    142           "Gunung_Segara", "Transverse_Mercator", "metre",
   143    143           "Easting", "East", "Northing", "North");
   144    144       add_proj4text (p, 0,
   145    145           "+proj=utm +zone=50 +south +ellps=bessel +towgs84=-403,68");
................................................................................
   218    218           "Pulkovo_1942", "Transverse_Mercator", "metre",
   219    219           "X", "North", "Y", "East");
   220    220       add_proj4text (p, 0,
   221    221           "+proj=tmerc +lat_0=0.1166666666666667 +lon_0=41.53333333");
   222    222       add_proj4text (p, 1,
   223    223           "333333 +k=1 +x_0=1300000 +y_0=0 +ellps=krass +towgs84=23");
   224    224       add_proj4text (p, 2,
   225         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          225  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   226    226       add_srs_wkt (p, 0,
   227    227           "PROJCS[\"Pulkovo 1942 / CS63 zone A1\",GEOGCS[\"Pulkovo ");
   228    228       add_srs_wkt (p, 1,
   229    229           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   230    230       add_srs_wkt (p, 2,
   231    231           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   232    232       add_srs_wkt (p, 3,
   233         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          233  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   234    234       add_srs_wkt (p, 4,
   235    235           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   236    236       add_srs_wkt (p, 5,
   237    237           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   238    238       add_srs_wkt (p, 6,
   239    239           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   240    240       add_srs_wkt (p, 7,
................................................................................
   257    257           "Pulkovo_1942", "Transverse_Mercator", "metre",
   258    258           "X", "North", "Y", "East");
   259    259       add_proj4text (p, 0,
   260    260           "+proj=tmerc +lat_0=0.1166666666666667 +lon_0=44.53333333");
   261    261       add_proj4text (p, 1,
   262    262           "333333 +k=1 +x_0=2300000 +y_0=0 +ellps=krass +towgs84=23");
   263    263       add_proj4text (p, 2,
   264         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          264  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   265    265       add_srs_wkt (p, 0,
   266    266           "PROJCS[\"Pulkovo 1942 / CS63 zone A2\",GEOGCS[\"Pulkovo ");
   267    267       add_srs_wkt (p, 1,
   268    268           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   269    269       add_srs_wkt (p, 2,
   270    270           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   271    271       add_srs_wkt (p, 3,
   272         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          272  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   273    273       add_srs_wkt (p, 4,
   274    274           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   275    275       add_srs_wkt (p, 5,
   276    276           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   277    277       add_srs_wkt (p, 6,
   278    278           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   279    279       add_srs_wkt (p, 7,
................................................................................
   296    296           "Pulkovo_1942", "Transverse_Mercator", "metre",
   297    297           "X", "North", "Y", "East");
   298    298       add_proj4text (p, 0,
   299    299           "+proj=tmerc +lat_0=0.1166666666666667 +lon_0=47.53333333");
   300    300       add_proj4text (p, 1,
   301    301           "333333 +k=1 +x_0=3300000 +y_0=0 +ellps=krass +towgs84=23");
   302    302       add_proj4text (p, 2,
   303         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          303  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   304    304       add_srs_wkt (p, 0,
   305    305           "PROJCS[\"Pulkovo 1942 / CS63 zone A3\",GEOGCS[\"Pulkovo ");
   306    306       add_srs_wkt (p, 1,
   307    307           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   308    308       add_srs_wkt (p, 2,
   309    309           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   310    310       add_srs_wkt (p, 3,
   311         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          311  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   312    312       add_srs_wkt (p, 4,
   313    313           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   314    314       add_srs_wkt (p, 5,
   315    315           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   316    316       add_srs_wkt (p, 6,
   317    317           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   318    318       add_srs_wkt (p, 7,
................................................................................
   335    335           "Pulkovo_1942", "Transverse_Mercator", "metre",
   336    336           "X", "North", "Y", "East");
   337    337       add_proj4text (p, 0,
   338    338           "+proj=tmerc +lat_0=0.1166666666666667 +lon_0=50.53333333");
   339    339       add_proj4text (p, 1,
   340    340           "333333 +k=1 +x_0=4300000 +y_0=0 +ellps=krass +towgs84=23");
   341    341       add_proj4text (p, 2,
   342         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          342  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   343    343       add_srs_wkt (p, 0,
   344    344           "PROJCS[\"Pulkovo 1942 / CS63 zone A4\",GEOGCS[\"Pulkovo ");
   345    345       add_srs_wkt (p, 1,
   346    346           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   347    347       add_srs_wkt (p, 2,
   348    348           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   349    349       add_srs_wkt (p, 3,
   350         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          350  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   351    351       add_srs_wkt (p, 4,
   352    352           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   353    353       add_srs_wkt (p, 5,
   354    354           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   355    355       add_srs_wkt (p, 6,
   356    356           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   357    357       add_srs_wkt (p, 7,
................................................................................
   374    374           "Pulkovo_1942", "Transverse_Mercator", "metre",
   375    375           "X", "North", "Y", "East");
   376    376       add_proj4text (p, 0,
   377    377           "+proj=tmerc +lat_0=0.1333333333333333 +lon_0=50.76666666");
   378    378       add_proj4text (p, 1,
   379    379           "666667 +k=1 +x_0=2300000 +y_0=0 +ellps=krass +towgs84=23");
   380    380       add_proj4text (p, 2,
   381         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          381  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   382    382       add_srs_wkt (p, 0,
   383    383           "PROJCS[\"Pulkovo 1942 / CS63 zone K2\",GEOGCS[\"Pulkovo ");
   384    384       add_srs_wkt (p, 1,
   385    385           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   386    386       add_srs_wkt (p, 2,
   387    387           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   388    388       add_srs_wkt (p, 3,
   389         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          389  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   390    390       add_srs_wkt (p, 4,
   391    391           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   392    392       add_srs_wkt (p, 5,
   393    393           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   394    394       add_srs_wkt (p, 6,
   395    395           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   396    396       add_srs_wkt (p, 7,
................................................................................
   413    413           "Pulkovo_1942", "Transverse_Mercator", "metre",
   414    414           "X", "North", "Y", "East");
   415    415       add_proj4text (p, 0,
   416    416           "+proj=tmerc +lat_0=0.1333333333333333 +lon_0=53.76666666");
   417    417       add_proj4text (p, 1,
   418    418           "666667 +k=1 +x_0=3300000 +y_0=0 +ellps=krass +towgs84=23");
   419    419       add_proj4text (p, 2,
   420         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          420  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   421    421       add_srs_wkt (p, 0,
   422    422           "PROJCS[\"Pulkovo 1942 / CS63 zone K3\",GEOGCS[\"Pulkovo ");
   423    423       add_srs_wkt (p, 1,
   424    424           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   425    425       add_srs_wkt (p, 2,
   426    426           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   427    427       add_srs_wkt (p, 3,
   428         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          428  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   429    429       add_srs_wkt (p, 4,
   430    430           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   431    431       add_srs_wkt (p, 5,
   432    432           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   433    433       add_srs_wkt (p, 6,
   434    434           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   435    435       add_srs_wkt (p, 7,
................................................................................
   452    452           "Pulkovo_1942", "Transverse_Mercator", "metre",
   453    453           "X", "North", "Y", "East");
   454    454       add_proj4text (p, 0,
   455    455           "+proj=tmerc +lat_0=0.1333333333333333 +lon_0=56.76666666");
   456    456       add_proj4text (p, 1,
   457    457           "666667 +k=1 +x_0=4300000 +y_0=0 +ellps=krass +towgs84=23");
   458    458       add_proj4text (p, 2,
   459         -        ".92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +no_defs");
          459  +        ".92,-141.27,-80.9,-0,0.35,0.82,-0.12 +units=m +no_defs");
   460    460       add_srs_wkt (p, 0,
   461    461           "PROJCS[\"Pulkovo 1942 / CS63 zone K4\",GEOGCS[\"Pulkovo ");
   462    462       add_srs_wkt (p, 1,
   463    463           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   464    464       add_srs_wkt (p, 2,
   465    465           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   466    466       add_srs_wkt (p, 3,
   467         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          467  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   468    468       add_srs_wkt (p, 4,
   469    469           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   470    470       add_srs_wkt (p, 5,
   471    471           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   472    472       add_srs_wkt (p, 6,
   473    473           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   474    474       add_srs_wkt (p, 7,
................................................................................
  1298   1298       add_proj4text (p, 1,
  1299   1299           "=0 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1300   1300       add_srs_wkt (p, 0,
  1301   1301           "PROJCS[\"NAD27 / Alaska Albers\",GEOGCS[\"NAD27\",DATUM[");
  1302   1302       add_srs_wkt (p, 1,
  1303   1303           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  1304   1304       add_srs_wkt (p, 2,
  1305         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         1305  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  1306   1306       add_srs_wkt (p, 3,
  1307   1307           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  1308   1308       add_srs_wkt (p, 4,
  1309   1309           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1310   1310       add_srs_wkt (p, 5,
  1311   1311           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  1312   1312       add_srs_wkt (p, 6,
................................................................................
  2072   2072       add_srs_wkt (p, 0,
  2073   2073           "PROJCS[\"Saint Pierre et Miquelon 1950 / UTM zone 21N\",");
  2074   2074       add_srs_wkt (p, 1,
  2075   2075           "GEOGCS[\"Saint Pierre et Miquelon 1950\",DATUM[\"Saint_P");
  2076   2076       add_srs_wkt (p, 2,
  2077   2077           "ierre_et_Miquelon_1950\",SPHEROID[\"Clarke 1866\",637820");
  2078   2078       add_srs_wkt (p, 3,
  2079         -        "6.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWG");
         2079  +        "6.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWG");
  2080   2080       add_srs_wkt (p, 4,
  2081   2081           "S84[30,430,368,0,0,0,0],AUTHORITY[\"EPSG\",\"6638\"]],PR");
  2082   2082       add_srs_wkt (p, 5,
  2083   2083           "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
  2084   2084       add_srs_wkt (p, 6,
  2085   2085           "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
  2086   2086       add_srs_wkt (p, 7,
................................................................................
  2456   2456           "ST71 Belep / UTM zone 58S", 0, 0,
  2457   2457           "International 1924", "Greenwich",
  2458   2458           "ST71_Belep", "Transverse_Mercator", "metre",
  2459   2459           "Easting", "East", "Northing", "North");
  2460   2460       add_proj4text (p, 0,
  2461   2461           "+proj=utm +zone=58 +south +ellps=intl +towgs84=-480.26,-");
  2462   2462       add_proj4text (p, 1,
  2463         -        "438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002 +units");
         2463  +        "438.32,-643.429,16.3119,20.1721,-4.0349,-111.7 +units=m ");
  2464   2464       add_proj4text (p, 2,
  2465         -        "=m +no_defs");
         2465  +        "+no_defs");
  2466   2466       add_srs_wkt (p, 0,
  2467   2467           "PROJCS[\"ST71 Belep / UTM zone 58S\",GEOGCS[\"ST71 Belep");
  2468   2468       add_srs_wkt (p, 1,
  2469   2469           "\",DATUM[\"ST71_Belep\",SPHEROID[\"International 1924\",");
  2470   2470       add_srs_wkt (p, 2,
  2471   2471           "6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-480.2");
  2472   2472       add_srs_wkt (p, 3,
  2473         -        "6,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002],AU");
  2474         -    add_srs_wkt (p, 4,
  2475         -        "THORITY[\"EPSG\",\"6643\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  2476         -    add_srs_wkt (p, 5,
  2477         -        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  2478         -    add_srs_wkt (p, 6,
  2479         -        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  2480         -    add_srs_wkt (p, 7,
  2481         -        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4643\"]");
  2482         -    add_srs_wkt (p, 8,
  2483         -        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  2484         -    add_srs_wkt (p, 9,
  2485         -        "de_of_origin\",0],PARAMETER[\"central_meridian\",165],PA");
  2486         -    add_srs_wkt (p, 10,
  2487         -        "RAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easti");
  2488         -    add_srs_wkt (p, 11,
  2489         -        "ng\",500000],PARAMETER[\"false_northing\",10000000],UNIT");
  2490         -    add_srs_wkt (p, 12,
  2491         -        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eastin");
  2492         -    add_srs_wkt (p, 13,
  2493         -        "g\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"");
         2473  +        "6,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7],AUTHO");
         2474  +    add_srs_wkt (p, 4,
         2475  +        "RITY[\"EPSG\",\"6643\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
         2476  +    add_srs_wkt (p, 5,
         2477  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
         2478  +    add_srs_wkt (p, 6,
         2479  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
         2480  +    add_srs_wkt (p, 7,
         2481  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4643\"]],P");
         2482  +    add_srs_wkt (p, 8,
         2483  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
         2484  +    add_srs_wkt (p, 9,
         2485  +        "of_origin\",0],PARAMETER[\"central_meridian\",165],PARAM");
         2486  +    add_srs_wkt (p, 10,
         2487  +        "ETER[\"scale_factor\",0.9996],PARAMETER[\"false_easting\"");
         2488  +    add_srs_wkt (p, 11,
         2489  +        ",500000],PARAMETER[\"false_northing\",10000000],UNIT[\"m");
         2490  +    add_srs_wkt (p, 12,
         2491  +        "etre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",");
         2492  +    add_srs_wkt (p, 13,
         2493  +        "EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"2997");
  2494   2494       add_srs_wkt (p, 14,
  2495         -        "2997\"]]");
         2495  +        "\"]]");
  2496   2496       p = add_epsg_def_ex (filter, first, last, 2998, "epsg", 2998,
  2497   2497           "NEA74 Noumea / UTM zone 58S", 0, 0,
  2498   2498           "International 1924", "Greenwich",
  2499   2499           "NEA74_Noumea", "Transverse_Mercator", "metre",
  2500   2500           "Easting", "East", "Northing", "North");
  2501   2501       add_proj4text (p, 0,
  2502   2502           "+proj=utm +zone=58 +south +ellps=intl +towgs84=-10.18,-3");

Changes to src/srsinit/epsg_inlined_10.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    56     56       struct epsg_defs *p;
    57     57       p = add_epsg_def_ex (filter, first, last, 3036, "epsg", 3036,
    58     58           "Moznet / UTM zone 36S", 0, 0,
    59     59           "WGS 84", "Greenwich",
    60     60           "Moznet_ITRF94", "Transverse_Mercator", "metre",
    61     61           "Easting", "East", "Northing", "North");
    62     62       add_proj4text (p, 0,
    63         -        "+proj=utm +zone=36 +south +ellps=WGS84 +towgs84=0,0,0,0,");
           63  +        "+proj=utm +zone=36 +south +ellps=WGS84 +towgs84=0,0,0,-0");
    64     64       add_proj4text (p, 1,
    65         -        "0,0,0 +units=m +no_defs");
           65  +        ",-0,-0,0 +units=m +no_defs");
    66     66       add_srs_wkt (p, 0,
    67     67           "PROJCS[\"Moznet / UTM zone 36S\",GEOGCS[\"Moznet\",DATUM");
    68     68       add_srs_wkt (p, 1,
    69     69           "[\"Moznet_ITRF94\",SPHEROID[\"WGS 84\",6378137,298.25722");
    70     70       add_srs_wkt (p, 2,
    71         -        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0");
    72         -    add_srs_wkt (p, 3,
    73         -        "],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",0,A");
    74         -    add_srs_wkt (p, 4,
    75         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
    76         -    add_srs_wkt (p, 5,
    77         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
    78         -    add_srs_wkt (p, 6,
    79         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"413");
    80         -    add_srs_wkt (p, 7,
    81         -        "0\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
    82         -    add_srs_wkt (p, 8,
    83         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",33]");
    84         -    add_srs_wkt (p, 9,
    85         -        ",PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_ea");
    86         -    add_srs_wkt (p, 10,
    87         -        "sting\",500000],PARAMETER[\"false_northing\",10000000],U");
    88         -    add_srs_wkt (p, 11,
    89         -        "NIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eas");
    90         -    add_srs_wkt (p, 12,
    91         -        "ting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\"");
    92         -    add_srs_wkt (p, 13,
    93         -        ",\"3036\"]]");
           71  +        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,-0,-0,-");
           72  +    add_srs_wkt (p, 3,
           73  +        "0,0],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",");
           74  +    add_srs_wkt (p, 4,
           75  +        "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
           76  +    add_srs_wkt (p, 5,
           77  +        "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
           78  +    add_srs_wkt (p, 6,
           79  +        "\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
           80  +    add_srs_wkt (p, 7,
           81  +        "4130\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"");
           82  +    add_srs_wkt (p, 8,
           83  +        "latitude_of_origin\",0],PARAMETER[\"central_meridian\",3");
           84  +    add_srs_wkt (p, 9,
           85  +        "3],PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_");
           86  +    add_srs_wkt (p, 10,
           87  +        "easting\",500000],PARAMETER[\"false_northing\",10000000]");
           88  +    add_srs_wkt (p, 11,
           89  +        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"E");
           90  +    add_srs_wkt (p, 12,
           91  +        "asting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG");
           92  +    add_srs_wkt (p, 13,
           93  +        "\",\"3036\"]]");
    94     94       p = add_epsg_def_ex (filter, first, last, 3037, "epsg", 3037,
    95     95           "Moznet / UTM zone 37S", 0, 0,
    96     96           "WGS 84", "Greenwich",
    97     97           "Moznet_ITRF94", "Transverse_Mercator", "metre",
    98     98           "Easting", "East", "Northing", "North");
    99     99       add_proj4text (p, 0,
   100         -        "+proj=utm +zone=37 +south +ellps=WGS84 +towgs84=0,0,0,0,");
          100  +        "+proj=utm +zone=37 +south +ellps=WGS84 +towgs84=0,0,0,-0");
   101    101       add_proj4text (p, 1,
   102         -        "0,0,0 +units=m +no_defs");
          102  +        ",-0,-0,0 +units=m +no_defs");
   103    103       add_srs_wkt (p, 0,
   104    104           "PROJCS[\"Moznet / UTM zone 37S\",GEOGCS[\"Moznet\",DATUM");
   105    105       add_srs_wkt (p, 1,
   106    106           "[\"Moznet_ITRF94\",SPHEROID[\"WGS 84\",6378137,298.25722");
   107    107       add_srs_wkt (p, 2,
   108         -        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0");
   109         -    add_srs_wkt (p, 3,
   110         -        "],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",0,A");
   111         -    add_srs_wkt (p, 4,
   112         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   113         -    add_srs_wkt (p, 5,
   114         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   115         -    add_srs_wkt (p, 6,
   116         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"413");
   117         -    add_srs_wkt (p, 7,
   118         -        "0\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
   119         -    add_srs_wkt (p, 8,
   120         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",39]");
   121         -    add_srs_wkt (p, 9,
   122         -        ",PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_ea");
   123         -    add_srs_wkt (p, 10,
   124         -        "sting\",500000],PARAMETER[\"false_northing\",10000000],U");
   125         -    add_srs_wkt (p, 11,
   126         -        "NIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eas");
   127         -    add_srs_wkt (p, 12,
   128         -        "ting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\"");
   129         -    add_srs_wkt (p, 13,
   130         -        ",\"3037\"]]");
          108  +        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,-0,-0,-");
          109  +    add_srs_wkt (p, 3,
          110  +        "0,0],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",");
          111  +    add_srs_wkt (p, 4,
          112  +        "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
          113  +    add_srs_wkt (p, 5,
          114  +        "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
          115  +    add_srs_wkt (p, 6,
          116  +        "\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
          117  +    add_srs_wkt (p, 7,
          118  +        "4130\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"");
          119  +    add_srs_wkt (p, 8,
          120  +        "latitude_of_origin\",0],PARAMETER[\"central_meridian\",3");
          121  +    add_srs_wkt (p, 9,
          122  +        "9],PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_");
          123  +    add_srs_wkt (p, 10,
          124  +        "easting\",500000],PARAMETER[\"false_northing\",10000000]");
          125  +    add_srs_wkt (p, 11,
          126  +        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"E");
          127  +    add_srs_wkt (p, 12,
          128  +        "asting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG");
          129  +    add_srs_wkt (p, 13,
          130  +        "\",\"3037\"]]");
   131    131       p = add_epsg_def_ex (filter, first, last, 3038, "epsg", 3038,
   132    132           "ETRS89 / TM26 (deprecated)", 0, 1,
   133    133           "GRS 1980", "Greenwich",
   134    134           "European_Terrestrial_Reference_System_1989", "Transverse_Mercator", "metre",
   135    135           "Northing", "North", "Easting", "East");
   136    136       add_proj4text (p, 0,
   137    137           "+proj=utm +zone=26 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +");
................................................................................
   800    800           "Helle 1954 / Jan Mayen Grid", 0, 1,
   801    801           "International 1924", "Greenwich",
   802    802           "Helle_1954", "Transverse_Mercator", "metre",
   803    803           "x", "North", "y", "East");
   804    804       add_proj4text (p, 0,
   805    805           "+proj=tmerc +lat_0=0 +lon_0=-8.5 +k=1 +x_0=50000 +y_0=-7");
   806    806       add_proj4text (p, 1,
   807         -        "800000 +ellps=intl +towgs84=982.6087,552.753,-540.873,6.");
          807  +        "800000 +ellps=intl +towgs84=982.609,552.753,-540.873,6.6");
   808    808       add_proj4text (p, 2,
   809         -        "68162662527694,-31.6114924086422,-19.8481610048168,16.80");
   810         -    add_proj4text (p, 3,
   811         -        "5 +units=m +no_defs");
          809  +        "8163,-31.6115,-19.8482,16.805 +units=m +no_defs");
   812    810       add_srs_wkt (p, 0,
   813    811           "PROJCS[\"Helle 1954 / Jan Mayen Grid\",GEOGCS[\"Helle 19");
   814    812       add_srs_wkt (p, 1,
   815    813           "54\",DATUM[\"Helle_1954\",SPHEROID[\"International 1924\"");
   816    814       add_srs_wkt (p, 2,
   817    815           ",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[982.6");
   818    816       add_srs_wkt (p, 3,
   819         -        "087,552.753,-540.873,6.68162662527694,-31.6114924086422,");
   820         -    add_srs_wkt (p, 4,
   821         -        "-19.8481610048168,16.805],AUTHORITY[\"EPSG\",\"6660\"]],");
   822         -    add_srs_wkt (p, 5,
   823         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   824         -    add_srs_wkt (p, 6,
   825         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   826         -    add_srs_wkt (p, 7,
   827         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
   828         -    add_srs_wkt (p, 8,
   829         -        "AUTHORITY[\"EPSG\",\"4660\"]],PROJECTION[\"Transverse_Me");
   830         -    add_srs_wkt (p, 9,
   831         -        "rcator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[");
   832         -    add_srs_wkt (p, 10,
   833         -        "\"central_meridian\",-8.5],PARAMETER[\"scale_factor\",1]");
   834         -    add_srs_wkt (p, 11,
   835         -        ",PARAMETER[\"false_easting\",50000],PARAMETER[\"false_no");
   836         -    add_srs_wkt (p, 12,
   837         -        "rthing\",-7800000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"");
   838         -    add_srs_wkt (p, 13,
   839         -        "9001\"]],AXIS[\"x\",NORTH],AXIS[\"y\",EAST],AUTHORITY[\"");
   840         -    add_srs_wkt (p, 14,
   841         -        "EPSG\",\"3058\"]]");
          817  +        "09,552.753,-540.873,6.68163,-31.6115,-19.8482,16.805],AU");
          818  +    add_srs_wkt (p, 4,
          819  +        "THORITY[\"EPSG\",\"6660\"]],PRIMEM[\"Greenwich\",0,AUTHO");
          820  +    add_srs_wkt (p, 5,
          821  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
          822  +    add_srs_wkt (p, 6,
          823  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
          824  +    add_srs_wkt (p, 7,
          825  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4660\"]");
          826  +    add_srs_wkt (p, 8,
          827  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
          828  +    add_srs_wkt (p, 9,
          829  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",-8.5],P");
          830  +    add_srs_wkt (p, 10,
          831  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          832  +    add_srs_wkt (p, 11,
          833  +        ",50000],PARAMETER[\"false_northing\",-7800000],UNIT[\"me");
          834  +    add_srs_wkt (p, 12,
          835  +        "tre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"x\",NORTH],");
          836  +    add_srs_wkt (p, 13,
          837  +        "AXIS[\"y\",EAST],AUTHORITY[\"EPSG\",\"3058\"]]");
   842    838       p = add_epsg_def_ex (filter, first, last, 3059, "epsg", 3059,
   843    839           "LKS92 / Latvia TM", 0, 1,
   844    840           "GRS 1980", "Greenwich",
   845    841           "Latvia_1992", "Transverse_Mercator", "metre",
   846    842           "X", "North", "Y", "East");
   847    843       add_proj4text (p, 0,
   848    844           "+proj=tmerc +lat_0=0 +lon_0=24 +k=0.9996 +x_0=500000 +y_");
................................................................................
  1229   1225       add_proj4text (p, 1,
  1230   1226           "_0=-4500000 +datum=NAD27 +units=m +no_defs");
  1231   1227       add_srs_wkt (p, 0,
  1232   1228           "PROJCS[\"NAD27 / Wisconsin Transverse Mercator\",GEOGCS[");
  1233   1229       add_srs_wkt (p, 1,
  1234   1230           "\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"");
  1235   1231       add_srs_wkt (p, 2,
  1236         -        "Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EP");
         1232  +        "Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EP");
  1237   1233       add_srs_wkt (p, 3,
  1238   1234           "SG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"G");
  1239   1235       add_srs_wkt (p, 4,
  1240   1236           "reenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree");
  1241   1237       add_srs_wkt (p, 5,
  1242   1238           "\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS");
  1243   1239       add_srs_wkt (p, 6,
................................................................................
  1670   1666       add_proj4text (p, 2,
  1671   1667           "0=914400 +datum=NAD27 +units=ft +no_defs");
  1672   1668       add_srs_wkt (p, 0,
  1673   1669           "PROJCS[\"NAD27 / Shackleford\",GEOGCS[\"NAD27\",DATUM[\"");
  1674   1670       add_srs_wkt (p, 1,
  1675   1671           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1676   1672       add_srs_wkt (p, 2,
  1677         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1673  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1678   1674       add_srs_wkt (p, 3,
  1679   1675           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1680   1676       add_srs_wkt (p, 4,
  1681   1677           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1682   1678       add_srs_wkt (p, 5,
  1683   1679           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1684   1680       add_srs_wkt (p, 6,
................................................................................
  2556   2552       add_proj4text (p, 3,
  2557   2553           ",0 +units=us-ft +no_defs");
  2558   2554       add_srs_wkt (p, 0,
  2559   2555           "PROJCS[\"American Samoa 1962 / American Samoa Lambert\",");
  2560   2556       add_srs_wkt (p, 1,
  2561   2557           "GEOGCS[\"American Samoa 1962\",DATUM[\"American_Samoa_19");
  2562   2558       add_srs_wkt (p, 2,
  2563         -        "62\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213898");
         2559  +        "62\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213900");
  2564   2560       add_srs_wkt (p, 3,
  2565         -        "2,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-115,118,426,0,0");
         2561  +        "6,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-115,118,426,0,0");
  2566   2562       add_srs_wkt (p, 4,
  2567   2563           ",0,0],AUTHORITY[\"EPSG\",\"6169\"]],PRIMEM[\"Greenwich\"");
  2568   2564       add_srs_wkt (p, 5,
  2569   2565           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2570   2566       add_srs_wkt (p, 6,
  2571   2567           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2572   2568       add_srs_wkt (p, 7,
................................................................................
  2694   2690           "Gulshan 303 / Bangladesh Transverse Mercator", 0, 0,
  2695   2691           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2696   2692           "Gulshan_303", "Transverse_Mercator", "metre",
  2697   2693           "Easting", "East", "Northing", "North");
  2698   2694       add_proj4text (p, 0,
  2699   2695           "+proj=tmerc +lat_0=0 +lon_0=90 +k=0.9996 +x_0=500000 +y_");
  2700   2696       add_proj4text (p, 1,
  2701         -        "0=0 +a=6377276.345 +b=6356075.413140239 +towgs84=283.7,7");
         2697  +        "0=0 +a=6377276.345 +b=6356075.41314024 +towgs84=283.7,73");
  2702   2698       add_proj4text (p, 2,
  2703         -        "35.9,261.1,0,0,0,0 +units=m +no_defs");
         2699  +        "5.9,261.1,0,0,0,0 +units=m +no_defs");
  2704   2700       add_srs_wkt (p, 0,
  2705   2701           "PROJCS[\"Gulshan 303 / Bangladesh Transverse Mercator\",");
  2706   2702       add_srs_wkt (p, 1,
  2707   2703           "GEOGCS[\"Gulshan 303\",DATUM[\"Gulshan_303\",SPHEROID[\"");
  2708   2704       add_srs_wkt (p, 2,
  2709   2705           "Everest 1830 (1937 Adjustment)\",6377276.345,300.8017,AU");
  2710   2706       add_srs_wkt (p, 3,
................................................................................
  3319   3315       add_proj4text (p, 2,
  3320   3316           "8,4.903,1.578,-1.06 +units=m +no_defs");
  3321   3317       add_srs_wkt (p, 0,
  3322   3318           "PROJCS[\"PRS92 / Philippines zone 1\",GEOGCS[\"PRS92\",D");
  3323   3319       add_srs_wkt (p, 1,
  3324   3320           "ATUM[\"Philippine_Reference_System_1992\",SPHEROID[\"Cla");
  3325   3321       add_srs_wkt (p, 2,
  3326         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3322  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3327   3323       add_srs_wkt (p, 3,
  3328   3324           ",\"7008\"]],TOWGS84[-127.62,-67.24,-47.04,-3.068,4.903,1");
  3329   3325       add_srs_wkt (p, 4,
  3330   3326           ".578,-1.06],AUTHORITY[\"EPSG\",\"6683\"]],PRIMEM[\"Green");
  3331   3327       add_srs_wkt (p, 5,
  3332   3328           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  3333   3329       add_srs_wkt (p, 6,
................................................................................
  3360   3356       add_proj4text (p, 2,
  3361   3357           "8,4.903,1.578,-1.06 +units=m +no_defs");
  3362   3358       add_srs_wkt (p, 0,
  3363   3359           "PROJCS[\"PRS92 / Philippines zone 2\",GEOGCS[\"PRS92\",D");
  3364   3360       add_srs_wkt (p, 1,
  3365   3361           "ATUM[\"Philippine_Reference_System_1992\",SPHEROID[\"Cla");
  3366   3362       add_srs_wkt (p, 2,
  3367         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3363  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3368   3364       add_srs_wkt (p, 3,
  3369   3365           ",\"7008\"]],TOWGS84[-127.62,-67.24,-47.04,-3.068,4.903,1");
  3370   3366       add_srs_wkt (p, 4,
  3371   3367           ".578,-1.06],AUTHORITY[\"EPSG\",\"6683\"]],PRIMEM[\"Green");
  3372   3368       add_srs_wkt (p, 5,
  3373   3369           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  3374   3370       add_srs_wkt (p, 6,
................................................................................
  3401   3397       add_proj4text (p, 2,
  3402   3398           "8,4.903,1.578,-1.06 +units=m +no_defs");
  3403   3399       add_srs_wkt (p, 0,
  3404   3400           "PROJCS[\"PRS92 / Philippines zone 3\",GEOGCS[\"PRS92\",D");
  3405   3401       add_srs_wkt (p, 1,
  3406   3402           "ATUM[\"Philippine_Reference_System_1992\",SPHEROID[\"Cla");
  3407   3403       add_srs_wkt (p, 2,
  3408         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3404  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3409   3405       add_srs_wkt (p, 3,
  3410   3406           ",\"7008\"]],TOWGS84[-127.62,-67.24,-47.04,-3.068,4.903,1");
  3411   3407       add_srs_wkt (p, 4,
  3412   3408           ".578,-1.06],AUTHORITY[\"EPSG\",\"6683\"]],PRIMEM[\"Green");
  3413   3409       add_srs_wkt (p, 5,
  3414   3410           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  3415   3411       add_srs_wkt (p, 6,
................................................................................
  3442   3438       add_proj4text (p, 2,
  3443   3439           "8,4.903,1.578,-1.06 +units=m +no_defs");
  3444   3440       add_srs_wkt (p, 0,
  3445   3441           "PROJCS[\"PRS92 / Philippines zone 4\",GEOGCS[\"PRS92\",D");
  3446   3442       add_srs_wkt (p, 1,
  3447   3443           "ATUM[\"Philippine_Reference_System_1992\",SPHEROID[\"Cla");
  3448   3444       add_srs_wkt (p, 2,
  3449         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3445  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3450   3446       add_srs_wkt (p, 3,
  3451   3447           ",\"7008\"]],TOWGS84[-127.62,-67.24,-47.04,-3.068,4.903,1");
  3452   3448       add_srs_wkt (p, 4,
  3453   3449           ".578,-1.06],AUTHORITY[\"EPSG\",\"6683\"]],PRIMEM[\"Green");
  3454   3450       add_srs_wkt (p, 5,
  3455   3451           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  3456   3452       add_srs_wkt (p, 6,
................................................................................
  3483   3479       add_proj4text (p, 2,
  3484   3480           "8,4.903,1.578,-1.06 +units=m +no_defs");
  3485   3481       add_srs_wkt (p, 0,
  3486   3482           "PROJCS[\"PRS92 / Philippines zone 5\",GEOGCS[\"PRS92\",D");
  3487   3483       add_srs_wkt (p, 1,
  3488   3484           "ATUM[\"Philippine_Reference_System_1992\",SPHEROID[\"Cla");
  3489   3485       add_srs_wkt (p, 2,
  3490         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3486  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3491   3487       add_srs_wkt (p, 3,
  3492   3488           ",\"7008\"]],TOWGS84[-127.62,-67.24,-47.04,-3.068,4.903,1");
  3493   3489       add_srs_wkt (p, 4,
  3494   3490           ".578,-1.06],AUTHORITY[\"EPSG\",\"6683\"]],PRIMEM[\"Green");
  3495   3491       add_srs_wkt (p, 5,
  3496   3492           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
  3497   3493       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_11.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Viti Levu 1912 / Viti Levu Grid\",GEOGCS[\"Viti");
    70     70       add_srs_wkt (p, 1,
    71     71           " Levu 1912\",DATUM[\"Viti_Levu_1912\",SPHEROID[\"Clarke ");
    72     72       add_srs_wkt (p, 2,
    73     73           "1880 (international foot)\",6378306.3696,293.46630765563");
    74     74       add_srs_wkt (p, 3,
    75         -        "55,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[51,391,-36,0,0,");
           75  +        "49,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[51,391,-36,0,0,");
    76     76       add_srs_wkt (p, 4,
    77     77           "0,0],AUTHORITY[\"EPSG\",\"6752\"]],PRIMEM[\"Greenwich\",");
    78     78       add_srs_wkt (p, 5,
    79     79           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
    80     80       add_srs_wkt (p, 6,
    81     81           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
    82     82       add_srs_wkt (p, 7,
................................................................................
   210    210           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 6 (deprecated)", 0, 1,
   211    211           "Krassowsky 1940", "Greenwich",
   212    212           "Pulkovo_1942", "Transverse_Mercator", "metre",
   213    213           "X", "North", "Y", "East");
   214    214       add_proj4text (p, 0,
   215    215           "+proj=tmerc +lat_0=0 +lon_0=18 +k=1 +x_0=6500000 +y_0=0 ");
   216    216       add_proj4text (p, 1,
   217         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          217  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   218    218       add_proj4text (p, 2,
   219         -        ".12 +units=m +no_defs");
          219  +        "0.12 +units=m +no_defs");
   220    220       add_srs_wkt (p, 0,
   221    221           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 6 (de");
   222    222       add_srs_wkt (p, 1,
   223    223           "precated)\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942");
   224    224       add_srs_wkt (p, 2,
   225    225           "\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[");
   226    226       add_srs_wkt (p, 3,
   227         -        "\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0");
   228         -    add_srs_wkt (p, 4,
   229         -        ".82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenw");
   230         -    add_srs_wkt (p, 5,
   231         -        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
   232         -    add_srs_wkt (p, 6,
   233         -        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
   234         -    add_srs_wkt (p, 7,
   235         -        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
   236         -    add_srs_wkt (p, 8,
   237         -        "G\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
   238         -    add_srs_wkt (p, 9,
   239         -        "ETER[\"latitude_of_origin\",0],PARAMETER[\"central_merid");
   240         -    add_srs_wkt (p, 10,
   241         -        "ian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fals");
   242         -    add_srs_wkt (p, 11,
   243         -        "e_easting\",6500000],PARAMETER[\"false_northing\",0],UNI");
   244         -    add_srs_wkt (p, 12,
   245         -        "T[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",N");
   246         -    add_srs_wkt (p, 13,
   247         -        "ORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3146\"]]");
          227  +        "\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,");
          228  +    add_srs_wkt (p, 4,
          229  +        "0.82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Green");
          230  +    add_srs_wkt (p, 5,
          231  +        "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
          232  +    add_srs_wkt (p, 6,
          233  +        ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
          234  +    add_srs_wkt (p, 7,
          235  +        "atitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EP");
          236  +    add_srs_wkt (p, 8,
          237  +        "SG\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PARA");
          238  +    add_srs_wkt (p, 9,
          239  +        "METER[\"latitude_of_origin\",0],PARAMETER[\"central_meri");
          240  +    add_srs_wkt (p, 10,
          241  +        "dian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fal");
          242  +    add_srs_wkt (p, 11,
          243  +        "se_easting\",6500000],PARAMETER[\"false_northing\",0],UN");
          244  +    add_srs_wkt (p, 12,
          245  +        "IT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",");
          246  +    add_srs_wkt (p, 13,
          247  +        "NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3146\"]]");
   248    248       p = add_epsg_def_ex (filter, first, last, 3147, "epsg", 3147,
   249    249           "Pulkovo 1942 / 3-degree Gauss-Kruger CM 18E (deprecated)", 0, 1,
   250    250           "Krassowsky 1940", "Greenwich",
   251    251           "Pulkovo_1942", "Transverse_Mercator", "metre",
   252    252           "X", "North", "Y", "East");
   253    253       add_proj4text (p, 0,
   254    254           "+proj=tmerc +lat_0=0 +lon_0=18 +k=1 +x_0=500000 +y_0=0 +");
   255    255       add_proj4text (p, 1,
   256         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
          256  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
   257    257       add_proj4text (p, 2,
   258         -        "12 +units=m +no_defs");
          258  +        ".12 +units=m +no_defs");
   259    259       add_srs_wkt (p, 0,
   260    260           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger CM 18E (de");
   261    261       add_srs_wkt (p, 1,
   262    262           "precated)\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942");
   263    263       add_srs_wkt (p, 2,
   264    264           "\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[");
   265    265       add_srs_wkt (p, 3,
   266         -        "\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0");
   267         -    add_srs_wkt (p, 4,
   268         -        ".82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenw");
   269         -    add_srs_wkt (p, 5,
   270         -        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
   271         -    add_srs_wkt (p, 6,
   272         -        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
   273         -    add_srs_wkt (p, 7,
   274         -        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
   275         -    add_srs_wkt (p, 8,
   276         -        "G\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
   277         -    add_srs_wkt (p, 9,
   278         -        "ETER[\"latitude_of_origin\",0],PARAMETER[\"central_merid");
   279         -    add_srs_wkt (p, 10,
   280         -        "ian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fals");
   281         -    add_srs_wkt (p, 11,
   282         -        "e_easting\",500000],PARAMETER[\"false_northing\",0],UNIT");
   283         -    add_srs_wkt (p, 12,
   284         -        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NO");
   285         -    add_srs_wkt (p, 13,
   286         -        "RTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3147\"]]");
          266  +        "\"EPSG\",\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,");
          267  +    add_srs_wkt (p, 4,
          268  +        "0.82,-0.12],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Green");
          269  +    add_srs_wkt (p, 5,
          270  +        "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
          271  +    add_srs_wkt (p, 6,
          272  +        ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
          273  +    add_srs_wkt (p, 7,
          274  +        "atitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EP");
          275  +    add_srs_wkt (p, 8,
          276  +        "SG\",\"4284\"]],PROJECTION[\"Transverse_Mercator\"],PARA");
          277  +    add_srs_wkt (p, 9,
          278  +        "METER[\"latitude_of_origin\",0],PARAMETER[\"central_meri");
          279  +    add_srs_wkt (p, 10,
          280  +        "dian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fal");
          281  +    add_srs_wkt (p, 11,
          282  +        "se_easting\",500000],PARAMETER[\"false_northing\",0],UNI");
          283  +    add_srs_wkt (p, 12,
          284  +        "T[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",N");
          285  +    add_srs_wkt (p, 13,
          286  +        "ORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3147\"]]");
   287    287       p = add_epsg_def_ex (filter, first, last, 3148, "epsg", 3148,
   288    288           "Indian 1960 / UTM zone 48N", 0, 0,
   289    289           "Everest 1830 (1937 Adjustment)", "Greenwich",
   290    290           "Indian_1960", "Transverse_Mercator", "metre",
   291    291           "Easting", "East", "Northing", "North");
   292    292       add_proj4text (p, 0,
   293         -        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.413140239 +");
          293  +        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.41314024 +t");
   294    294       add_proj4text (p, 1,
   295         -        "towgs84=198,881,317,0,0,0,0 +units=m +no_defs");
          295  +        "owgs84=198,881,317,0,0,0,0 +units=m +no_defs");
   296    296       add_srs_wkt (p, 0,
   297    297           "PROJCS[\"Indian 1960 / UTM zone 48N\",GEOGCS[\"Indian 19");
   298    298       add_srs_wkt (p, 1,
   299    299           "60\",DATUM[\"Indian_1960\",SPHEROID[\"Everest 1830 (1937");
   300    300       add_srs_wkt (p, 2,
   301    301           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
   302    302       add_srs_wkt (p, 3,
................................................................................
   323    323           "ng\",NORTH],AUTHORITY[\"EPSG\",\"3148\"]]");
   324    324       p = add_epsg_def_ex (filter, first, last, 3149, "epsg", 3149,
   325    325           "Indian 1960 / UTM zone 49N", 0, 0,
   326    326           "Everest 1830 (1937 Adjustment)", "Greenwich",
   327    327           "Indian_1960", "Transverse_Mercator", "metre",
   328    328           "Easting", "East", "Northing", "North");
   329    329       add_proj4text (p, 0,
   330         -        "+proj=utm +zone=49 +a=6377276.345 +b=6356075.413140239 +");
          330  +        "+proj=utm +zone=49 +a=6377276.345 +b=6356075.41314024 +t");
   331    331       add_proj4text (p, 1,
   332         -        "towgs84=198,881,317,0,0,0,0 +units=m +no_defs");
          332  +        "owgs84=198,881,317,0,0,0,0 +units=m +no_defs");
   333    333       add_srs_wkt (p, 0,
   334    334           "PROJCS[\"Indian 1960 / UTM zone 49N\",GEOGCS[\"Indian 19");
   335    335       add_srs_wkt (p, 1,
   336    336           "60\",DATUM[\"Indian_1960\",SPHEROID[\"Everest 1830 (1937");
   337    337       add_srs_wkt (p, 2,
   338    338           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
   339    339       add_srs_wkt (p, 3,
................................................................................
   362    362           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 6 (deprecated)", 0, 1,
   363    363           "Krassowsky 1940", "Greenwich",
   364    364           "Pulkovo_1995", "Transverse_Mercator", "metre",
   365    365           "X", "North", "Y", "East");
   366    366       add_proj4text (p, 0,
   367    367           "+proj=tmerc +lat_0=0 +lon_0=18 +k=1 +x_0=6500000 +y_0=0 ");
   368    368       add_proj4text (p, 1,
   369         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          369  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   370    370       add_proj4text (p, 2,
   371         -        "2 +units=m +no_defs");
          371  +        ".22 +units=m +no_defs");
   372    372       add_srs_wkt (p, 0,
   373    373           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 6 (de");
   374    374       add_srs_wkt (p, 1,
   375    375           "precated)\",GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995");
   376    376       add_srs_wkt (p, 2,
   377    377           "\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[");
   378    378       add_srs_wkt (p, 3,
   379         -        "\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.1");
   380         -    add_srs_wkt (p, 4,
   381         -        "3,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwic");
   382         -    add_srs_wkt (p, 5,
   383         -        "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
   384         -    add_srs_wkt (p, 6,
   385         -        "74532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lati");
   386         -    add_srs_wkt (p, 7,
   387         -        "tude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\"");
   388         -    add_srs_wkt (p, 8,
   389         -        ",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETE");
   390         -    add_srs_wkt (p, 9,
   391         -        "R[\"latitude_of_origin\",0],PARAMETER[\"central_meridian");
   392         -    add_srs_wkt (p, 10,
   393         -        "\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"false_e");
   394         -    add_srs_wkt (p, 11,
   395         -        "asting\",6500000],PARAMETER[\"false_northing\",0],UNIT[\"");
   396         -    add_srs_wkt (p, 12,
   397         -        "metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH");
   398         -    add_srs_wkt (p, 13,
   399         -        "],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3150\"]]");
          379  +        "\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0");
          380  +    add_srs_wkt (p, 4,
          381  +        ".13,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenw");
          382  +    add_srs_wkt (p, 5,
          383  +        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
          384  +    add_srs_wkt (p, 6,
          385  +        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
          386  +    add_srs_wkt (p, 7,
          387  +        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
          388  +    add_srs_wkt (p, 8,
          389  +        "G\",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
          390  +    add_srs_wkt (p, 9,
          391  +        "ETER[\"latitude_of_origin\",0],PARAMETER[\"central_merid");
          392  +    add_srs_wkt (p, 10,
          393  +        "ian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fals");
          394  +    add_srs_wkt (p, 11,
          395  +        "e_easting\",6500000],PARAMETER[\"false_northing\",0],UNI");
          396  +    add_srs_wkt (p, 12,
          397  +        "T[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",N");
          398  +    add_srs_wkt (p, 13,
          399  +        "ORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3150\"]]");
   400    400       p = add_epsg_def_ex (filter, first, last, 3151, "epsg", 3151,
   401    401           "Pulkovo 1995 / 3-degree Gauss-Kruger CM 18E (deprecated)", 0, 1,
   402    402           "Krassowsky 1940", "Greenwich",
   403    403           "Pulkovo_1995", "Transverse_Mercator", "metre",
   404    404           "X", "North", "Y", "East");
   405    405       add_proj4text (p, 0,
   406    406           "+proj=tmerc +lat_0=0 +lon_0=18 +k=1 +x_0=500000 +y_0=0 +");
   407    407       add_proj4text (p, 1,
   408         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          408  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   409    409       add_proj4text (p, 2,
   410         -        " +units=m +no_defs");
          410  +        "22 +units=m +no_defs");
   411    411       add_srs_wkt (p, 0,
   412    412           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger CM 18E (de");
   413    413       add_srs_wkt (p, 1,
   414    414           "precated)\",GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995");
   415    415       add_srs_wkt (p, 2,
   416    416           "\",SPHEROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[");
   417    417       add_srs_wkt (p, 3,
   418         -        "\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.1");
   419         -    add_srs_wkt (p, 4,
   420         -        "3,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwic");
   421         -    add_srs_wkt (p, 5,
   422         -        "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
   423         -    add_srs_wkt (p, 6,
   424         -        "74532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lati");
   425         -    add_srs_wkt (p, 7,
   426         -        "tude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\"");
   427         -    add_srs_wkt (p, 8,
   428         -        ",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETE");
   429         -    add_srs_wkt (p, 9,
   430         -        "R[\"latitude_of_origin\",0],PARAMETER[\"central_meridian");
   431         -    add_srs_wkt (p, 10,
   432         -        "\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"false_e");
   433         -    add_srs_wkt (p, 11,
   434         -        "asting\",500000],PARAMETER[\"false_northing\",0],UNIT[\"");
   435         -    add_srs_wkt (p, 12,
   436         -        "metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH");
   437         -    add_srs_wkt (p, 13,
   438         -        "],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3151\"]]");
          418  +        "\"EPSG\",\"7024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0");
          419  +    add_srs_wkt (p, 4,
          420  +        ".13,-0.22],AUTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenw");
          421  +    add_srs_wkt (p, 5,
          422  +        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
          423  +    add_srs_wkt (p, 6,
          424  +        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
          425  +    add_srs_wkt (p, 7,
          426  +        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
          427  +    add_srs_wkt (p, 8,
          428  +        "G\",\"4200\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
          429  +    add_srs_wkt (p, 9,
          430  +        "ETER[\"latitude_of_origin\",0],PARAMETER[\"central_merid");
          431  +    add_srs_wkt (p, 10,
          432  +        "ian\",18],PARAMETER[\"scale_factor\",1],PARAMETER[\"fals");
          433  +    add_srs_wkt (p, 11,
          434  +        "e_easting\",500000],PARAMETER[\"false_northing\",0],UNIT");
          435  +    add_srs_wkt (p, 12,
          436  +        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NO");
          437  +    add_srs_wkt (p, 13,
          438  +        "RTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"3151\"]]");
   439    439       p = add_epsg_def_ex (filter, first, last, 3152, "epsg", 3152,
   440    440           "ST74", 0, 1,
   441    441           "GRS 1980", "Greenwich",
   442    442           "SWEREF99", "Transverse_Mercator", "metre",
   443    443           "x", "North", "y", "East");
   444    444       add_proj4text (p, 0,
   445    445           "+proj=tmerc +lat_0=0 +lon_0=18.05779 +k=0.99999425 +x_0=");
................................................................................
  1345   1345           "Indian 1960 / TM 106 NE", 0, 0,
  1346   1346           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1347   1347           "Indian_1960", "Transverse_Mercator", "metre",
  1348   1348           "Easting", "East", "Northing", "North");
  1349   1349       add_proj4text (p, 0,
  1350   1350           "+proj=tmerc +lat_0=0 +lon_0=106 +k=0.9996 +x_0=500000 +y");
  1351   1351       add_proj4text (p, 1,
  1352         -        "_0=0 +a=6377276.345 +b=6356075.413140239 +towgs84=198,88");
         1352  +        "_0=0 +a=6377276.345 +b=6356075.41314024 +towgs84=198,881");
  1353   1353       add_proj4text (p, 2,
  1354         -        "1,317,0,0,0,0 +units=m +no_defs");
         1354  +        ",317,0,0,0,0 +units=m +no_defs");
  1355   1355       add_srs_wkt (p, 0,
  1356   1356           "PROJCS[\"Indian 1960 / TM 106 NE\",GEOGCS[\"Indian 1960\"");
  1357   1357       add_srs_wkt (p, 1,
  1358   1358           ",DATUM[\"Indian_1960\",SPHEROID[\"Everest 1830 (1937 Adj");
  1359   1359       add_srs_wkt (p, 2,
  1360   1360           "ustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"701");
  1361   1361       add_srs_wkt (p, 3,
................................................................................
  1384   1384           "LGD2006 / Libya TM", 0, 0,
  1385   1385           "International 1924", "Greenwich",
  1386   1386           "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  1387   1387           "X", "East", "Y", "North");
  1388   1388       add_proj4text (p, 0,
  1389   1389           "+proj=tmerc +lat_0=0 +lon_0=17 +k=0.9965000000000001 +x_");
  1390   1390       add_proj4text (p, 1,
  1391         -        "0=1000000 +y_0=0 +ellps=intl +towgs84=-208.4058,-109.877");
         1391  +        "0=1000000 +y_0=0 +ellps=intl +towgs84=-208.406,-109.878,");
  1392   1392       add_proj4text (p, 2,
  1393         -        "7,-2.5764,0,0,0,0 +units=m +no_defs");
         1393  +        "-2.5764,0,0,0,0 +units=m +no_defs");
  1394   1394       add_srs_wkt (p, 0,
  1395   1395           "PROJCS[\"LGD2006 / Libya TM\",GEOGCS[\"LGD2006\",DATUM[\"");
  1396   1396       add_srs_wkt (p, 1,
  1397   1397           "Libyan_Geodetic_Datum_2006\",SPHEROID[\"International 19");
  1398   1398       add_srs_wkt (p, 2,
  1399   1399           "24\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[-");
  1400   1400       add_srs_wkt (p, 3,
  1401         -        "208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\",\"");
  1402         -    add_srs_wkt (p, 4,
  1403         -        "6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
  1404         -    add_srs_wkt (p, 5,
  1405         -        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
  1406         -    add_srs_wkt (p, 6,
  1407         -        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
  1408         -    add_srs_wkt (p, 7,
  1409         -        "\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"Tran");
  1410         -    add_srs_wkt (p, 8,
  1411         -        "sverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],P");
  1412         -    add_srs_wkt (p, 9,
  1413         -        "ARAMETER[\"central_meridian\",17],PARAMETER[\"scale_fact");
  1414         -    add_srs_wkt (p, 10,
  1415         -        "or\",0.9965],PARAMETER[\"false_easting\",1000000],PARAME");
  1416         -    add_srs_wkt (p, 11,
  1417         -        "TER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"E");
  1418         -    add_srs_wkt (p, 12,
  1419         -        "PSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTH");
  1420         -    add_srs_wkt (p, 13,
  1421         -        "ORITY[\"EPSG\",\"3177\"]]");
         1401  +        "208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\",\"6");
         1402  +    add_srs_wkt (p, 4,
         1403  +        "754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901");
         1404  +    add_srs_wkt (p, 5,
         1405  +        "\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG");
         1406  +    add_srs_wkt (p, 6,
         1407  +        "\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\"");
         1408  +    add_srs_wkt (p, 7,
         1409  +        ",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"Transv");
         1410  +    add_srs_wkt (p, 8,
         1411  +        "erse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PAR");
         1412  +    add_srs_wkt (p, 9,
         1413  +        "AMETER[\"central_meridian\",17],PARAMETER[\"scale_factor");
         1414  +    add_srs_wkt (p, 10,
         1415  +        "\",0.9965],PARAMETER[\"false_easting\",1000000],PARAMETE");
         1416  +    add_srs_wkt (p, 11,
         1417  +        "R[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPS");
         1418  +    add_srs_wkt (p, 12,
         1419  +        "G\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHOR");
         1420  +    add_srs_wkt (p, 13,
         1421  +        "ITY[\"EPSG\",\"3177\"]]");
  1422   1422       p = add_epsg_def_ex (filter, first, last, 3178, "epsg", 3178,
  1423   1423           "GR96 / UTM zone 18N", 0, 0,
  1424   1424           "GRS 1980", "Greenwich",
  1425   1425           "Greenland_1996", "Transverse_Mercator", "metre",
  1426   1426           "Easting", "East", "Northing", "North");
  1427   1427       add_proj4text (p, 0,
  1428   1428           "+proj=utm +zone=18 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +");
................................................................................
  1867   1867           "LGD2006 / Libya TM zone 5", 0, 0,
  1868   1868           "International 1924", "Greenwich",
  1869   1869           "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  1870   1870           "X", "East", "Y", "North");
  1871   1871       add_proj4text (p, 0,
  1872   1872           "+proj=tmerc +lat_0=0 +lon_0=9 +k=0.99995 +x_0=200000 +y_");
  1873   1873       add_proj4text (p, 1,
  1874         -        "0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,0");
         1874  +        "0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,0");
  1875   1875       add_proj4text (p, 2,
  1876         -        ",0,0 +units=m +no_defs");
         1876  +        ",0 +units=m +no_defs");
  1877   1877       add_srs_wkt (p, 0,
  1878   1878           "PROJCS[\"LGD2006 / Libya TM zone 5\",GEOGCS[\"LGD2006\",");
  1879   1879       add_srs_wkt (p, 1,
  1880   1880           "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
  1881   1881       add_srs_wkt (p, 2,
  1882   1882           "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
  1883   1883       add_srs_wkt (p, 3,
  1884         -        "OWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  1885         -    add_srs_wkt (p, 4,
  1886         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  1887         -    add_srs_wkt (p, 5,
  1888         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  1889         -    add_srs_wkt (p, 6,
  1890         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  1891         -    add_srs_wkt (p, 7,
  1892         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  1893         -    add_srs_wkt (p, 8,
  1894         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  1895         -    add_srs_wkt (p, 9,
  1896         -        "in\",0],PARAMETER[\"central_meridian\",9],PARAMETER[\"sc");
  1897         -    add_srs_wkt (p, 10,
  1898         -        "ale_factor\",0.99995],PARAMETER[\"false_easting\",200000");
  1899         -    add_srs_wkt (p, 11,
  1900         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  1901         -    add_srs_wkt (p, 12,
  1902         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NOR");
  1903         -    add_srs_wkt (p, 13,
  1904         -        "TH],AUTHORITY[\"EPSG\",\"3190\"]]");
  1905         -    p = add_epsg_def_ex (filter, first, last, 3191, "epsg", 3191,
  1906         -        "LGD2006 / Libya TM zone 6", 0, 0,
  1907         -        "International 1924", "Greenwich",
  1908         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  1909         -        "X", "East", "Y", "North");
  1910         -    add_proj4text (p, 0,
  1911         -        "+proj=tmerc +lat_0=0 +lon_0=11 +k=0.99995 +x_0=200000 +y");
  1912         -    add_proj4text (p, 1,
  1913         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  1914         -    add_proj4text (p, 2,
  1915         -        "0,0,0 +units=m +no_defs");
  1916         -    add_srs_wkt (p, 0,
  1917         -        "PROJCS[\"LGD2006 / Libya TM zone 6\",GEOGCS[\"LGD2006\",");
  1918         -    add_srs_wkt (p, 1,
  1919         -        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
  1920         -    add_srs_wkt (p, 2,
  1921         -        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
  1922         -    add_srs_wkt (p, 3,
  1923         -        "OWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  1924         -    add_srs_wkt (p, 4,
  1925         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  1926         -    add_srs_wkt (p, 5,
  1927         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  1928         -    add_srs_wkt (p, 6,
  1929         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  1930         -    add_srs_wkt (p, 7,
  1931         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  1932         -    add_srs_wkt (p, 8,
  1933         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  1934         -    add_srs_wkt (p, 9,
  1935         -        "in\",0],PARAMETER[\"central_meridian\",11],PARAMETER[\"s");
  1936         -    add_srs_wkt (p, 10,
  1937         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  1938         -    add_srs_wkt (p, 11,
  1939         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  1940         -    add_srs_wkt (p, 12,
  1941         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  1942         -    add_srs_wkt (p, 13,
  1943         -        "RTH],AUTHORITY[\"EPSG\",\"3191\"]]");
  1944         -    p = add_epsg_def_ex (filter, first, last, 3192, "epsg", 3192,
  1945         -        "LGD2006 / Libya TM zone 7", 0, 0,
  1946         -        "International 1924", "Greenwich",
  1947         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  1948         -        "X", "East", "Y", "North");
  1949         -    add_proj4text (p, 0,
  1950         -        "+proj=tmerc +lat_0=0 +lon_0=13 +k=0.99995 +x_0=200000 +y");
  1951         -    add_proj4text (p, 1,
  1952         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  1953         -    add_proj4text (p, 2,
  1954         -        "0,0,0 +units=m +no_defs");
  1955         -    add_srs_wkt (p, 0,
  1956         -        "PROJCS[\"LGD2006 / Libya TM zone 7\",GEOGCS[\"LGD2006\",");
  1957         -    add_srs_wkt (p, 1,
  1958         -        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
  1959         -    add_srs_wkt (p, 2,
  1960         -        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
  1961         -    add_srs_wkt (p, 3,
  1962         -        "OWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  1963         -    add_srs_wkt (p, 4,
  1964         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  1965         -    add_srs_wkt (p, 5,
  1966         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  1967         -    add_srs_wkt (p, 6,
  1968         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  1969         -    add_srs_wkt (p, 7,
  1970         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  1971         -    add_srs_wkt (p, 8,
  1972         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  1973         -    add_srs_wkt (p, 9,
  1974         -        "in\",0],PARAMETER[\"central_meridian\",13],PARAMETER[\"s");
  1975         -    add_srs_wkt (p, 10,
  1976         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  1977         -    add_srs_wkt (p, 11,
  1978         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  1979         -    add_srs_wkt (p, 12,
  1980         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  1981         -    add_srs_wkt (p, 13,
  1982         -        "RTH],AUTHORITY[\"EPSG\",\"3192\"]]");
  1983         -    p = add_epsg_def_ex (filter, first, last, 3193, "epsg", 3193,
  1984         -        "LGD2006 / Libya TM zone 8", 0, 0,
  1985         -        "International 1924", "Greenwich",
  1986         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  1987         -        "X", "East", "Y", "North");
  1988         -    add_proj4text (p, 0,
  1989         -        "+proj=tmerc +lat_0=0 +lon_0=15 +k=0.99995 +x_0=200000 +y");
  1990         -    add_proj4text (p, 1,
  1991         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  1992         -    add_proj4text (p, 2,
  1993         -        "0,0,0 +units=m +no_defs");
  1994         -    add_srs_wkt (p, 0,
  1995         -        "PROJCS[\"LGD2006 / Libya TM zone 8\",GEOGCS[\"LGD2006\",");
  1996         -    add_srs_wkt (p, 1,
  1997         -        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
  1998         -    add_srs_wkt (p, 2,
  1999         -        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
  2000         -    add_srs_wkt (p, 3,
  2001         -        "OWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2002         -    add_srs_wkt (p, 4,
  2003         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2004         -    add_srs_wkt (p, 5,
  2005         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2006         -    add_srs_wkt (p, 6,
  2007         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2008         -    add_srs_wkt (p, 7,
  2009         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2010         -    add_srs_wkt (p, 8,
  2011         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2012         -    add_srs_wkt (p, 9,
  2013         -        "in\",0],PARAMETER[\"central_meridian\",15],PARAMETER[\"s");
  2014         -    add_srs_wkt (p, 10,
  2015         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2016         -    add_srs_wkt (p, 11,
  2017         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2018         -    add_srs_wkt (p, 12,
  2019         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2020         -    add_srs_wkt (p, 13,
  2021         -        "RTH],AUTHORITY[\"EPSG\",\"3193\"]]");
  2022         -    p = add_epsg_def_ex (filter, first, last, 3194, "epsg", 3194,
  2023         -        "LGD2006 / Libya TM zone 9", 0, 0,
  2024         -        "International 1924", "Greenwich",
  2025         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2026         -        "X", "East", "Y", "North");
  2027         -    add_proj4text (p, 0,
  2028         -        "+proj=tmerc +lat_0=0 +lon_0=17 +k=0.99995 +x_0=200000 +y");
  2029         -    add_proj4text (p, 1,
  2030         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  2031         -    add_proj4text (p, 2,
  2032         -        "0,0,0 +units=m +no_defs");
  2033         -    add_srs_wkt (p, 0,
  2034         -        "PROJCS[\"LGD2006 / Libya TM zone 9\",GEOGCS[\"LGD2006\",");
  2035         -    add_srs_wkt (p, 1,
  2036         -        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
  2037         -    add_srs_wkt (p, 2,
  2038         -        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
  2039         -    add_srs_wkt (p, 3,
  2040         -        "OWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2041         -    add_srs_wkt (p, 4,
  2042         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2043         -    add_srs_wkt (p, 5,
  2044         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2045         -    add_srs_wkt (p, 6,
  2046         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2047         -    add_srs_wkt (p, 7,
  2048         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2049         -    add_srs_wkt (p, 8,
  2050         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2051         -    add_srs_wkt (p, 9,
  2052         -        "in\",0],PARAMETER[\"central_meridian\",17],PARAMETER[\"s");
  2053         -    add_srs_wkt (p, 10,
  2054         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2055         -    add_srs_wkt (p, 11,
  2056         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2057         -    add_srs_wkt (p, 12,
  2058         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2059         -    add_srs_wkt (p, 13,
  2060         -        "RTH],AUTHORITY[\"EPSG\",\"3194\"]]");
  2061         -    p = add_epsg_def_ex (filter, first, last, 3195, "epsg", 3195,
  2062         -        "LGD2006 / Libya TM zone 10", 0, 0,
  2063         -        "International 1924", "Greenwich",
  2064         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2065         -        "X", "East", "Y", "North");
  2066         -    add_proj4text (p, 0,
  2067         -        "+proj=tmerc +lat_0=0 +lon_0=19 +k=0.99995 +x_0=200000 +y");
  2068         -    add_proj4text (p, 1,
  2069         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  2070         -    add_proj4text (p, 2,
  2071         -        "0,0,0 +units=m +no_defs");
  2072         -    add_srs_wkt (p, 0,
  2073         -        "PROJCS[\"LGD2006 / Libya TM zone 10\",GEOGCS[\"LGD2006\"");
  2074         -    add_srs_wkt (p, 1,
  2075         -        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
  2076         -    add_srs_wkt (p, 2,
  2077         -        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
  2078         -    add_srs_wkt (p, 3,
  2079         -        "TOWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2080         -    add_srs_wkt (p, 4,
  2081         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2082         -    add_srs_wkt (p, 5,
  2083         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2084         -    add_srs_wkt (p, 6,
  2085         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2086         -    add_srs_wkt (p, 7,
  2087         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2088         -    add_srs_wkt (p, 8,
  2089         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2090         -    add_srs_wkt (p, 9,
  2091         -        "in\",0],PARAMETER[\"central_meridian\",19],PARAMETER[\"s");
  2092         -    add_srs_wkt (p, 10,
  2093         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2094         -    add_srs_wkt (p, 11,
  2095         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2096         -    add_srs_wkt (p, 12,
  2097         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2098         -    add_srs_wkt (p, 13,
  2099         -        "RTH],AUTHORITY[\"EPSG\",\"3195\"]]");
  2100         -    p = add_epsg_def_ex (filter, first, last, 3196, "epsg", 3196,
  2101         -        "LGD2006 / Libya TM zone 11", 0, 0,
  2102         -        "International 1924", "Greenwich",
  2103         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2104         -        "X", "East", "Y", "North");
  2105         -    add_proj4text (p, 0,
  2106         -        "+proj=tmerc +lat_0=0 +lon_0=21 +k=0.99995 +x_0=200000 +y");
  2107         -    add_proj4text (p, 1,
  2108         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  2109         -    add_proj4text (p, 2,
  2110         -        "0,0,0 +units=m +no_defs");
  2111         -    add_srs_wkt (p, 0,
  2112         -        "PROJCS[\"LGD2006 / Libya TM zone 11\",GEOGCS[\"LGD2006\"");
  2113         -    add_srs_wkt (p, 1,
  2114         -        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
  2115         -    add_srs_wkt (p, 2,
  2116         -        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
  2117         -    add_srs_wkt (p, 3,
  2118         -        "TOWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2119         -    add_srs_wkt (p, 4,
  2120         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2121         -    add_srs_wkt (p, 5,
  2122         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2123         -    add_srs_wkt (p, 6,
  2124         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2125         -    add_srs_wkt (p, 7,
  2126         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2127         -    add_srs_wkt (p, 8,
  2128         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2129         -    add_srs_wkt (p, 9,
  2130         -        "in\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"s");
  2131         -    add_srs_wkt (p, 10,
  2132         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2133         -    add_srs_wkt (p, 11,
  2134         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2135         -    add_srs_wkt (p, 12,
  2136         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2137         -    add_srs_wkt (p, 13,
  2138         -        "RTH],AUTHORITY[\"EPSG\",\"3196\"]]");
  2139         -    p = add_epsg_def_ex (filter, first, last, 3197, "epsg", 3197,
  2140         -        "LGD2006 / Libya TM zone 12", 0, 0,
  2141         -        "International 1924", "Greenwich",
  2142         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2143         -        "X", "East", "Y", "North");
  2144         -    add_proj4text (p, 0,
  2145         -        "+proj=tmerc +lat_0=0 +lon_0=23 +k=0.99995 +x_0=200000 +y");
  2146         -    add_proj4text (p, 1,
  2147         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  2148         -    add_proj4text (p, 2,
  2149         -        "0,0,0 +units=m +no_defs");
  2150         -    add_srs_wkt (p, 0,
  2151         -        "PROJCS[\"LGD2006 / Libya TM zone 12\",GEOGCS[\"LGD2006\"");
  2152         -    add_srs_wkt (p, 1,
  2153         -        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
  2154         -    add_srs_wkt (p, 2,
  2155         -        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
  2156         -    add_srs_wkt (p, 3,
  2157         -        "TOWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2158         -    add_srs_wkt (p, 4,
  2159         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2160         -    add_srs_wkt (p, 5,
  2161         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2162         -    add_srs_wkt (p, 6,
  2163         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2164         -    add_srs_wkt (p, 7,
  2165         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2166         -    add_srs_wkt (p, 8,
  2167         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2168         -    add_srs_wkt (p, 9,
  2169         -        "in\",0],PARAMETER[\"central_meridian\",23],PARAMETER[\"s");
  2170         -    add_srs_wkt (p, 10,
  2171         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2172         -    add_srs_wkt (p, 11,
  2173         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2174         -    add_srs_wkt (p, 12,
  2175         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2176         -    add_srs_wkt (p, 13,
  2177         -        "RTH],AUTHORITY[\"EPSG\",\"3197\"]]");
  2178         -    p = add_epsg_def_ex (filter, first, last, 3198, "epsg", 3198,
  2179         -        "LGD2006 / Libya TM zone 13", 0, 0,
  2180         -        "International 1924", "Greenwich",
  2181         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2182         -        "X", "East", "Y", "North");
  2183         -    add_proj4text (p, 0,
  2184         -        "+proj=tmerc +lat_0=0 +lon_0=25 +k=0.99995 +x_0=200000 +y");
  2185         -    add_proj4text (p, 1,
  2186         -        "_0=0 +ellps=intl +towgs84=-208.4058,-109.8777,-2.5764,0,");
  2187         -    add_proj4text (p, 2,
  2188         -        "0,0,0 +units=m +no_defs");
  2189         -    add_srs_wkt (p, 0,
  2190         -        "PROJCS[\"LGD2006 / Libya TM zone 13\",GEOGCS[\"LGD2006\"");
  2191         -    add_srs_wkt (p, 1,
  2192         -        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
  2193         -    add_srs_wkt (p, 2,
  2194         -        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
  2195         -    add_srs_wkt (p, 3,
  2196         -        "TOWGS84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"");
  2197         -    add_srs_wkt (p, 4,
  2198         -        "EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2199         -    add_srs_wkt (p, 5,
  2200         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2201         -    add_srs_wkt (p, 6,
  2202         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2203         -    add_srs_wkt (p, 7,
  2204         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTI");
  2205         -    add_srs_wkt (p, 8,
  2206         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2207         -    add_srs_wkt (p, 9,
  2208         -        "in\",0],PARAMETER[\"central_meridian\",25],PARAMETER[\"s");
  2209         -    add_srs_wkt (p, 10,
  2210         -        "cale_factor\",0.99995],PARAMETER[\"false_easting\",20000");
  2211         -    add_srs_wkt (p, 11,
  2212         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  2213         -    add_srs_wkt (p, 12,
  2214         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NO");
  2215         -    add_srs_wkt (p, 13,
  2216         -        "RTH],AUTHORITY[\"EPSG\",\"3198\"]]");
  2217         -    p = add_epsg_def_ex (filter, first, last, 3199, "epsg", 3199,
  2218         -        "LGD2006 / UTM zone 32N", 0, 0,
  2219         -        "International 1924", "Greenwich",
  2220         -        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2221         -        "Easting", "East", "Northing", "North");
  2222         -    add_proj4text (p, 0,
  2223         -        "+proj=utm +zone=32 +ellps=intl +towgs84=-208.4058,-109.8");
  2224         -    add_proj4text (p, 1,
  2225         -        "777,-2.5764,0,0,0,0 +units=m +no_defs");
  2226         -    add_srs_wkt (p, 0,
  2227         -        "PROJCS[\"LGD2006 / UTM zone 32N\",GEOGCS[\"LGD2006\",DAT");
  2228         -    add_srs_wkt (p, 1,
  2229         -        "UM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internation");
  2230         -    add_srs_wkt (p, 2,
  2231         -        "al 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWG");
  2232         -    add_srs_wkt (p, 3,
  2233         -        "S84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"EPS");
  2234         -    add_srs_wkt (p, 4,
  2235         -        "G\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         1884  +        "OWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EP");
         1885  +    add_srs_wkt (p, 4,
         1886  +        "SG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2236   1887       add_srs_wkt (p, 5,
  2237   1888           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  2238   1889       add_srs_wkt (p, 6,
  2239   1890           "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  2240   1891       add_srs_wkt (p, 7,
  2241   1892           "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
  2242   1893       add_srs_wkt (p, 8,
  2243   1894           "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
  2244   1895       add_srs_wkt (p, 9,
  2245   1896           ",0],PARAMETER[\"central_meridian\",9],PARAMETER[\"scale_");
  2246   1897       add_srs_wkt (p, 10,
  2247         -        "factor\",0.9996],PARAMETER[\"false_easting\",500000],PAR");
  2248         -    add_srs_wkt (p, 11,
  2249         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2250         -    add_srs_wkt (p, 12,
  2251         -        "\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northi");
  2252         -    add_srs_wkt (p, 13,
  2253         -        "ng\",NORTH],AUTHORITY[\"EPSG\",\"3199\"]]");
         1898  +        "factor\",0.99995],PARAMETER[\"false_easting\",200000],PA");
         1899  +    add_srs_wkt (p, 11,
         1900  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         1901  +    add_srs_wkt (p, 12,
         1902  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],");
         1903  +    add_srs_wkt (p, 13,
         1904  +        "AUTHORITY[\"EPSG\",\"3190\"]]");
         1905  +    p = add_epsg_def_ex (filter, first, last, 3191, "epsg", 3191,
         1906  +        "LGD2006 / Libya TM zone 6", 0, 0,
         1907  +        "International 1924", "Greenwich",
         1908  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         1909  +        "X", "East", "Y", "North");
         1910  +    add_proj4text (p, 0,
         1911  +        "+proj=tmerc +lat_0=0 +lon_0=11 +k=0.99995 +x_0=200000 +y");
         1912  +    add_proj4text (p, 1,
         1913  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         1914  +    add_proj4text (p, 2,
         1915  +        "0,0 +units=m +no_defs");
         1916  +    add_srs_wkt (p, 0,
         1917  +        "PROJCS[\"LGD2006 / Libya TM zone 6\",GEOGCS[\"LGD2006\",");
         1918  +    add_srs_wkt (p, 1,
         1919  +        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
         1920  +    add_srs_wkt (p, 2,
         1921  +        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
         1922  +    add_srs_wkt (p, 3,
         1923  +        "OWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EP");
         1924  +    add_srs_wkt (p, 4,
         1925  +        "SG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         1926  +    add_srs_wkt (p, 5,
         1927  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         1928  +    add_srs_wkt (p, 6,
         1929  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         1930  +    add_srs_wkt (p, 7,
         1931  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
         1932  +    add_srs_wkt (p, 8,
         1933  +        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
         1934  +    add_srs_wkt (p, 9,
         1935  +        ",0],PARAMETER[\"central_meridian\",11],PARAMETER[\"scale");
         1936  +    add_srs_wkt (p, 10,
         1937  +        "_factor\",0.99995],PARAMETER[\"false_easting\",200000],P");
         1938  +    add_srs_wkt (p, 11,
         1939  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         1940  +    add_srs_wkt (p, 12,
         1941  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
         1942  +    add_srs_wkt (p, 13,
         1943  +        ",AUTHORITY[\"EPSG\",\"3191\"]]");
         1944  +    p = add_epsg_def_ex (filter, first, last, 3192, "epsg", 3192,
         1945  +        "LGD2006 / Libya TM zone 7", 0, 0,
         1946  +        "International 1924", "Greenwich",
         1947  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         1948  +        "X", "East", "Y", "North");
         1949  +    add_proj4text (p, 0,
         1950  +        "+proj=tmerc +lat_0=0 +lon_0=13 +k=0.99995 +x_0=200000 +y");
         1951  +    add_proj4text (p, 1,
         1952  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         1953  +    add_proj4text (p, 2,
         1954  +        "0,0 +units=m +no_defs");
         1955  +    add_srs_wkt (p, 0,
         1956  +        "PROJCS[\"LGD2006 / Libya TM zone 7\",GEOGCS[\"LGD2006\",");
         1957  +    add_srs_wkt (p, 1,
         1958  +        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
         1959  +    add_srs_wkt (p, 2,
         1960  +        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
         1961  +    add_srs_wkt (p, 3,
         1962  +        "OWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EP");
         1963  +    add_srs_wkt (p, 4,
         1964  +        "SG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         1965  +    add_srs_wkt (p, 5,
         1966  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         1967  +    add_srs_wkt (p, 6,
         1968  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         1969  +    add_srs_wkt (p, 7,
         1970  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
         1971  +    add_srs_wkt (p, 8,
         1972  +        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
         1973  +    add_srs_wkt (p, 9,
         1974  +        ",0],PARAMETER[\"central_meridian\",13],PARAMETER[\"scale");
         1975  +    add_srs_wkt (p, 10,
         1976  +        "_factor\",0.99995],PARAMETER[\"false_easting\",200000],P");
         1977  +    add_srs_wkt (p, 11,
         1978  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         1979  +    add_srs_wkt (p, 12,
         1980  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
         1981  +    add_srs_wkt (p, 13,
         1982  +        ",AUTHORITY[\"EPSG\",\"3192\"]]");
         1983  +    p = add_epsg_def_ex (filter, first, last, 3193, "epsg", 3193,
         1984  +        "LGD2006 / Libya TM zone 8", 0, 0,
         1985  +        "International 1924", "Greenwich",
         1986  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         1987  +        "X", "East", "Y", "North");
         1988  +    add_proj4text (p, 0,
         1989  +        "+proj=tmerc +lat_0=0 +lon_0=15 +k=0.99995 +x_0=200000 +y");
         1990  +    add_proj4text (p, 1,
         1991  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         1992  +    add_proj4text (p, 2,
         1993  +        "0,0 +units=m +no_defs");
         1994  +    add_srs_wkt (p, 0,
         1995  +        "PROJCS[\"LGD2006 / Libya TM zone 8\",GEOGCS[\"LGD2006\",");
         1996  +    add_srs_wkt (p, 1,
         1997  +        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
         1998  +    add_srs_wkt (p, 2,
         1999  +        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
         2000  +    add_srs_wkt (p, 3,
         2001  +        "OWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EP");
         2002  +    add_srs_wkt (p, 4,
         2003  +        "SG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         2004  +    add_srs_wkt (p, 5,
         2005  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         2006  +    add_srs_wkt (p, 6,
         2007  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         2008  +    add_srs_wkt (p, 7,
         2009  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
         2010  +    add_srs_wkt (p, 8,
         2011  +        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
         2012  +    add_srs_wkt (p, 9,
         2013  +        ",0],PARAMETER[\"central_meridian\",15],PARAMETER[\"scale");
         2014  +    add_srs_wkt (p, 10,
         2015  +        "_factor\",0.99995],PARAMETER[\"false_easting\",200000],P");
         2016  +    add_srs_wkt (p, 11,
         2017  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2018  +    add_srs_wkt (p, 12,
         2019  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
         2020  +    add_srs_wkt (p, 13,
         2021  +        ",AUTHORITY[\"EPSG\",\"3193\"]]");
         2022  +    p = add_epsg_def_ex (filter, first, last, 3194, "epsg", 3194,
         2023  +        "LGD2006 / Libya TM zone 9", 0, 0,
         2024  +        "International 1924", "Greenwich",
         2025  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2026  +        "X", "East", "Y", "North");
         2027  +    add_proj4text (p, 0,
         2028  +        "+proj=tmerc +lat_0=0 +lon_0=17 +k=0.99995 +x_0=200000 +y");
         2029  +    add_proj4text (p, 1,
         2030  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         2031  +    add_proj4text (p, 2,
         2032  +        "0,0 +units=m +no_defs");
         2033  +    add_srs_wkt (p, 0,
         2034  +        "PROJCS[\"LGD2006 / Libya TM zone 9\",GEOGCS[\"LGD2006\",");
         2035  +    add_srs_wkt (p, 1,
         2036  +        "DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internat");
         2037  +    add_srs_wkt (p, 2,
         2038  +        "ional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],T");
         2039  +    add_srs_wkt (p, 3,
         2040  +        "OWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EP");
         2041  +    add_srs_wkt (p, 4,
         2042  +        "SG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         2043  +    add_srs_wkt (p, 5,
         2044  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         2045  +    add_srs_wkt (p, 6,
         2046  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         2047  +    add_srs_wkt (p, 7,
         2048  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
         2049  +    add_srs_wkt (p, 8,
         2050  +        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
         2051  +    add_srs_wkt (p, 9,
         2052  +        ",0],PARAMETER[\"central_meridian\",17],PARAMETER[\"scale");
         2053  +    add_srs_wkt (p, 10,
         2054  +        "_factor\",0.99995],PARAMETER[\"false_easting\",200000],P");
         2055  +    add_srs_wkt (p, 11,
         2056  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2057  +    add_srs_wkt (p, 12,
         2058  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
         2059  +    add_srs_wkt (p, 13,
         2060  +        ",AUTHORITY[\"EPSG\",\"3194\"]]");
         2061  +    p = add_epsg_def_ex (filter, first, last, 3195, "epsg", 3195,
         2062  +        "LGD2006 / Libya TM zone 10", 0, 0,
         2063  +        "International 1924", "Greenwich",
         2064  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2065  +        "X", "East", "Y", "North");
         2066  +    add_proj4text (p, 0,
         2067  +        "+proj=tmerc +lat_0=0 +lon_0=19 +k=0.99995 +x_0=200000 +y");
         2068  +    add_proj4text (p, 1,
         2069  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         2070  +    add_proj4text (p, 2,
         2071  +        "0,0 +units=m +no_defs");
         2072  +    add_srs_wkt (p, 0,
         2073  +        "PROJCS[\"LGD2006 / Libya TM zone 10\",GEOGCS[\"LGD2006\"");
         2074  +    add_srs_wkt (p, 1,
         2075  +        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
         2076  +    add_srs_wkt (p, 2,
         2077  +        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
         2078  +    add_srs_wkt (p, 3,
         2079  +        "TOWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"E");
         2080  +    add_srs_wkt (p, 4,
         2081  +        "PSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
         2082  +    add_srs_wkt (p, 5,
         2083  +        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
         2084  +    add_srs_wkt (p, 6,
         2085  +        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
         2086  +    add_srs_wkt (p, 7,
         2087  +        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTIO");
         2088  +    add_srs_wkt (p, 8,
         2089  +        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
         2090  +    add_srs_wkt (p, 9,
         2091  +        "n\",0],PARAMETER[\"central_meridian\",19],PARAMETER[\"sc");
         2092  +    add_srs_wkt (p, 10,
         2093  +        "ale_factor\",0.99995],PARAMETER[\"false_easting\",200000");
         2094  +    add_srs_wkt (p, 11,
         2095  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2096  +    add_srs_wkt (p, 12,
         2097  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NOR");
         2098  +    add_srs_wkt (p, 13,
         2099  +        "TH],AUTHORITY[\"EPSG\",\"3195\"]]");
         2100  +    p = add_epsg_def_ex (filter, first, last, 3196, "epsg", 3196,
         2101  +        "LGD2006 / Libya TM zone 11", 0, 0,
         2102  +        "International 1924", "Greenwich",
         2103  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2104  +        "X", "East", "Y", "North");
         2105  +    add_proj4text (p, 0,
         2106  +        "+proj=tmerc +lat_0=0 +lon_0=21 +k=0.99995 +x_0=200000 +y");
         2107  +    add_proj4text (p, 1,
         2108  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         2109  +    add_proj4text (p, 2,
         2110  +        "0,0 +units=m +no_defs");
         2111  +    add_srs_wkt (p, 0,
         2112  +        "PROJCS[\"LGD2006 / Libya TM zone 11\",GEOGCS[\"LGD2006\"");
         2113  +    add_srs_wkt (p, 1,
         2114  +        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
         2115  +    add_srs_wkt (p, 2,
         2116  +        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
         2117  +    add_srs_wkt (p, 3,
         2118  +        "TOWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"E");
         2119  +    add_srs_wkt (p, 4,
         2120  +        "PSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
         2121  +    add_srs_wkt (p, 5,
         2122  +        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
         2123  +    add_srs_wkt (p, 6,
         2124  +        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
         2125  +    add_srs_wkt (p, 7,
         2126  +        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTIO");
         2127  +    add_srs_wkt (p, 8,
         2128  +        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
         2129  +    add_srs_wkt (p, 9,
         2130  +        "n\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"sc");
         2131  +    add_srs_wkt (p, 10,
         2132  +        "ale_factor\",0.99995],PARAMETER[\"false_easting\",200000");
         2133  +    add_srs_wkt (p, 11,
         2134  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2135  +    add_srs_wkt (p, 12,
         2136  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NOR");
         2137  +    add_srs_wkt (p, 13,
         2138  +        "TH],AUTHORITY[\"EPSG\",\"3196\"]]");
         2139  +    p = add_epsg_def_ex (filter, first, last, 3197, "epsg", 3197,
         2140  +        "LGD2006 / Libya TM zone 12", 0, 0,
         2141  +        "International 1924", "Greenwich",
         2142  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2143  +        "X", "East", "Y", "North");
         2144  +    add_proj4text (p, 0,
         2145  +        "+proj=tmerc +lat_0=0 +lon_0=23 +k=0.99995 +x_0=200000 +y");
         2146  +    add_proj4text (p, 1,
         2147  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         2148  +    add_proj4text (p, 2,
         2149  +        "0,0 +units=m +no_defs");
         2150  +    add_srs_wkt (p, 0,
         2151  +        "PROJCS[\"LGD2006 / Libya TM zone 12\",GEOGCS[\"LGD2006\"");
         2152  +    add_srs_wkt (p, 1,
         2153  +        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
         2154  +    add_srs_wkt (p, 2,
         2155  +        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
         2156  +    add_srs_wkt (p, 3,
         2157  +        "TOWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"E");
         2158  +    add_srs_wkt (p, 4,
         2159  +        "PSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
         2160  +    add_srs_wkt (p, 5,
         2161  +        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
         2162  +    add_srs_wkt (p, 6,
         2163  +        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
         2164  +    add_srs_wkt (p, 7,
         2165  +        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTIO");
         2166  +    add_srs_wkt (p, 8,
         2167  +        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
         2168  +    add_srs_wkt (p, 9,
         2169  +        "n\",0],PARAMETER[\"central_meridian\",23],PARAMETER[\"sc");
         2170  +    add_srs_wkt (p, 10,
         2171  +        "ale_factor\",0.99995],PARAMETER[\"false_easting\",200000");
         2172  +    add_srs_wkt (p, 11,
         2173  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2174  +    add_srs_wkt (p, 12,
         2175  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NOR");
         2176  +    add_srs_wkt (p, 13,
         2177  +        "TH],AUTHORITY[\"EPSG\",\"3197\"]]");
         2178  +    p = add_epsg_def_ex (filter, first, last, 3198, "epsg", 3198,
         2179  +        "LGD2006 / Libya TM zone 13", 0, 0,
         2180  +        "International 1924", "Greenwich",
         2181  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2182  +        "X", "East", "Y", "North");
         2183  +    add_proj4text (p, 0,
         2184  +        "+proj=tmerc +lat_0=0 +lon_0=25 +k=0.99995 +x_0=200000 +y");
         2185  +    add_proj4text (p, 1,
         2186  +        "_0=0 +ellps=intl +towgs84=-208.406,-109.878,-2.5764,0,0,");
         2187  +    add_proj4text (p, 2,
         2188  +        "0,0 +units=m +no_defs");
         2189  +    add_srs_wkt (p, 0,
         2190  +        "PROJCS[\"LGD2006 / Libya TM zone 13\",GEOGCS[\"LGD2006\"");
         2191  +    add_srs_wkt (p, 1,
         2192  +        ",DATUM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Interna");
         2193  +    add_srs_wkt (p, 2,
         2194  +        "tional 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],");
         2195  +    add_srs_wkt (p, 3,
         2196  +        "TOWGS84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"E");
         2197  +    add_srs_wkt (p, 4,
         2198  +        "PSG\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
         2199  +    add_srs_wkt (p, 5,
         2200  +        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
         2201  +    add_srs_wkt (p, 6,
         2202  +        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
         2203  +    add_srs_wkt (p, 7,
         2204  +        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTIO");
         2205  +    add_srs_wkt (p, 8,
         2206  +        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
         2207  +    add_srs_wkt (p, 9,
         2208  +        "n\",0],PARAMETER[\"central_meridian\",25],PARAMETER[\"sc");
         2209  +    add_srs_wkt (p, 10,
         2210  +        "ale_factor\",0.99995],PARAMETER[\"false_easting\",200000");
         2211  +    add_srs_wkt (p, 11,
         2212  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2213  +    add_srs_wkt (p, 12,
         2214  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NOR");
         2215  +    add_srs_wkt (p, 13,
         2216  +        "TH],AUTHORITY[\"EPSG\",\"3198\"]]");
         2217  +    p = add_epsg_def_ex (filter, first, last, 3199, "epsg", 3199,
         2218  +        "LGD2006 / UTM zone 32N", 0, 0,
         2219  +        "International 1924", "Greenwich",
         2220  +        "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
         2221  +        "Easting", "East", "Northing", "North");
         2222  +    add_proj4text (p, 0,
         2223  +        "+proj=utm +zone=32 +ellps=intl +towgs84=-208.406,-109.87");
         2224  +    add_proj4text (p, 1,
         2225  +        "8,-2.5764,0,0,0,0 +units=m +no_defs");
         2226  +    add_srs_wkt (p, 0,
         2227  +        "PROJCS[\"LGD2006 / UTM zone 32N\",GEOGCS[\"LGD2006\",DAT");
         2228  +    add_srs_wkt (p, 1,
         2229  +        "UM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internation");
         2230  +    add_srs_wkt (p, 2,
         2231  +        "al 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWG");
         2232  +    add_srs_wkt (p, 3,
         2233  +        "S84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\"");
         2234  +    add_srs_wkt (p, 4,
         2235  +        ",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
         2236  +    add_srs_wkt (p, 5,
         2237  +        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
         2238  +    add_srs_wkt (p, 6,
         2239  +        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
         2240  +    add_srs_wkt (p, 7,
         2241  +        "ude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"T");
         2242  +    add_srs_wkt (p, 8,
         2243  +        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
         2244  +    add_srs_wkt (p, 9,
         2245  +        "],PARAMETER[\"central_meridian\",9],PARAMETER[\"scale_fa");
         2246  +    add_srs_wkt (p, 10,
         2247  +        "ctor\",0.9996],PARAMETER[\"false_easting\",500000],PARAM");
         2248  +    add_srs_wkt (p, 11,
         2249  +        "ETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
         2250  +    add_srs_wkt (p, 12,
         2251  +        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
         2252  +    add_srs_wkt (p, 13,
         2253  +        "\",NORTH],AUTHORITY[\"EPSG\",\"3199\"]]");
  2254   2254       p = add_epsg_def_ex (filter, first, last, 3200, "epsg", 3200,
  2255   2255           "FD58 / Iraq zone", 0, 0,
  2256   2256           "Clarke 1880 (RGS)", "Greenwich",
  2257   2257           "Final_Datum_1958", "Lambert_Conformal_Conic_1SP", "metre",
  2258   2258           "Easting", "East", "Northing", "North");
  2259   2259       add_proj4text (p, 0,
  2260   2260           "+proj=lcc +lat_1=32.5 +lat_0=32.5 +lon_0=45 +k_0=0.99878");
................................................................................
  2292   2292           "\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"3200\"]]");
  2293   2293       p = add_epsg_def_ex (filter, first, last, 3201, "epsg", 3201,
  2294   2294           "LGD2006 / UTM zone 33N", 0, 0,
  2295   2295           "International 1924", "Greenwich",
  2296   2296           "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2297   2297           "Easting", "East", "Northing", "North");
  2298   2298       add_proj4text (p, 0,
  2299         -        "+proj=utm +zone=33 +ellps=intl +towgs84=-208.4058,-109.8");
         2299  +        "+proj=utm +zone=33 +ellps=intl +towgs84=-208.406,-109.87");
  2300   2300       add_proj4text (p, 1,
  2301         -        "777,-2.5764,0,0,0,0 +units=m +no_defs");
         2301  +        "8,-2.5764,0,0,0,0 +units=m +no_defs");
  2302   2302       add_srs_wkt (p, 0,
  2303   2303           "PROJCS[\"LGD2006 / UTM zone 33N\",GEOGCS[\"LGD2006\",DAT");
  2304   2304       add_srs_wkt (p, 1,
  2305   2305           "UM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internation");
  2306   2306       add_srs_wkt (p, 2,
  2307   2307           "al 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWG");
  2308   2308       add_srs_wkt (p, 3,
  2309         -        "S84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"EPS");
  2310         -    add_srs_wkt (p, 4,
  2311         -        "G\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2312         -    add_srs_wkt (p, 5,
  2313         -        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  2314         -    add_srs_wkt (p, 6,
  2315         -        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  2316         -    add_srs_wkt (p, 7,
  2317         -        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
  2318         -    add_srs_wkt (p, 8,
  2319         -        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
  2320         -    add_srs_wkt (p, 9,
  2321         -        ",0],PARAMETER[\"central_meridian\",15],PARAMETER[\"scale");
  2322         -    add_srs_wkt (p, 10,
  2323         -        "_factor\",0.9996],PARAMETER[\"false_easting\",500000],PA");
  2324         -    add_srs_wkt (p, 11,
  2325         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2326         -    add_srs_wkt (p, 12,
  2327         -        "[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"North");
  2328         -    add_srs_wkt (p, 13,
  2329         -        "ing\",NORTH],AUTHORITY[\"EPSG\",\"3201\"]]");
         2309  +        "S84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\"");
         2310  +    add_srs_wkt (p, 4,
         2311  +        ",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
         2312  +    add_srs_wkt (p, 5,
         2313  +        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
         2314  +    add_srs_wkt (p, 6,
         2315  +        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
         2316  +    add_srs_wkt (p, 7,
         2317  +        "ude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"T");
         2318  +    add_srs_wkt (p, 8,
         2319  +        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
         2320  +    add_srs_wkt (p, 9,
         2321  +        "],PARAMETER[\"central_meridian\",15],PARAMETER[\"scale_f");
         2322  +    add_srs_wkt (p, 10,
         2323  +        "actor\",0.9996],PARAMETER[\"false_easting\",500000],PARA");
         2324  +    add_srs_wkt (p, 11,
         2325  +        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
         2326  +    add_srs_wkt (p, 12,
         2327  +        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
         2328  +    add_srs_wkt (p, 13,
         2329  +        "\",NORTH],AUTHORITY[\"EPSG\",\"3201\"]]");
  2330   2330       p = add_epsg_def_ex (filter, first, last, 3202, "epsg", 3202,
  2331   2331           "LGD2006 / UTM zone 34N", 0, 0,
  2332   2332           "International 1924", "Greenwich",
  2333   2333           "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2334   2334           "Easting", "East", "Northing", "North");
  2335   2335       add_proj4text (p, 0,
  2336         -        "+proj=utm +zone=34 +ellps=intl +towgs84=-208.4058,-109.8");
         2336  +        "+proj=utm +zone=34 +ellps=intl +towgs84=-208.406,-109.87");
  2337   2337       add_proj4text (p, 1,
  2338         -        "777,-2.5764,0,0,0,0 +units=m +no_defs");
         2338  +        "8,-2.5764,0,0,0,0 +units=m +no_defs");
  2339   2339       add_srs_wkt (p, 0,
  2340   2340           "PROJCS[\"LGD2006 / UTM zone 34N\",GEOGCS[\"LGD2006\",DAT");
  2341   2341       add_srs_wkt (p, 1,
  2342   2342           "UM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internation");
  2343   2343       add_srs_wkt (p, 2,
  2344   2344           "al 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWG");
  2345   2345       add_srs_wkt (p, 3,
  2346         -        "S84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"EPS");
  2347         -    add_srs_wkt (p, 4,
  2348         -        "G\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2349         -    add_srs_wkt (p, 5,
  2350         -        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  2351         -    add_srs_wkt (p, 6,
  2352         -        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  2353         -    add_srs_wkt (p, 7,
  2354         -        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
  2355         -    add_srs_wkt (p, 8,
  2356         -        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
  2357         -    add_srs_wkt (p, 9,
  2358         -        ",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"scale");
  2359         -    add_srs_wkt (p, 10,
  2360         -        "_factor\",0.9996],PARAMETER[\"false_easting\",500000],PA");
  2361         -    add_srs_wkt (p, 11,
  2362         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2363         -    add_srs_wkt (p, 12,
  2364         -        "[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"North");
  2365         -    add_srs_wkt (p, 13,
  2366         -        "ing\",NORTH],AUTHORITY[\"EPSG\",\"3202\"]]");
         2346  +        "S84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\"");
         2347  +    add_srs_wkt (p, 4,
         2348  +        ",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
         2349  +    add_srs_wkt (p, 5,
         2350  +        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
         2351  +    add_srs_wkt (p, 6,
         2352  +        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
         2353  +    add_srs_wkt (p, 7,
         2354  +        "ude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"T");
         2355  +    add_srs_wkt (p, 8,
         2356  +        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
         2357  +    add_srs_wkt (p, 9,
         2358  +        "],PARAMETER[\"central_meridian\",21],PARAMETER[\"scale_f");
         2359  +    add_srs_wkt (p, 10,
         2360  +        "actor\",0.9996],PARAMETER[\"false_easting\",500000],PARA");
         2361  +    add_srs_wkt (p, 11,
         2362  +        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
         2363  +    add_srs_wkt (p, 12,
         2364  +        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
         2365  +    add_srs_wkt (p, 13,
         2366  +        "\",NORTH],AUTHORITY[\"EPSG\",\"3202\"]]");
  2367   2367       p = add_epsg_def_ex (filter, first, last, 3203, "epsg", 3203,
  2368   2368           "LGD2006 / UTM zone 35N", 0, 0,
  2369   2369           "International 1924", "Greenwich",
  2370   2370           "Libyan_Geodetic_Datum_2006", "Transverse_Mercator", "metre",
  2371   2371           "Easting", "East", "Northing", "North");
  2372   2372       add_proj4text (p, 0,
  2373         -        "+proj=utm +zone=35 +ellps=intl +towgs84=-208.4058,-109.8");
         2373  +        "+proj=utm +zone=35 +ellps=intl +towgs84=-208.406,-109.87");
  2374   2374       add_proj4text (p, 1,
  2375         -        "777,-2.5764,0,0,0,0 +units=m +no_defs");
         2375  +        "8,-2.5764,0,0,0,0 +units=m +no_defs");
  2376   2376       add_srs_wkt (p, 0,
  2377   2377           "PROJCS[\"LGD2006 / UTM zone 35N\",GEOGCS[\"LGD2006\",DAT");
  2378   2378       add_srs_wkt (p, 1,
  2379   2379           "UM[\"Libyan_Geodetic_Datum_2006\",SPHEROID[\"Internation");
  2380   2380       add_srs_wkt (p, 2,
  2381   2381           "al 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWG");
  2382   2382       add_srs_wkt (p, 3,
  2383         -        "S84[-208.4058,-109.8777,-2.5764,0,0,0,0],AUTHORITY[\"EPS");
  2384         -    add_srs_wkt (p, 4,
  2385         -        "G\",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2386         -    add_srs_wkt (p, 5,
  2387         -        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  2388         -    add_srs_wkt (p, 6,
  2389         -        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  2390         -    add_srs_wkt (p, 7,
  2391         -        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[");
  2392         -    add_srs_wkt (p, 8,
  2393         -        "\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\"");
  2394         -    add_srs_wkt (p, 9,
  2395         -        ",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"scale");
  2396         -    add_srs_wkt (p, 10,
  2397         -        "_factor\",0.9996],PARAMETER[\"false_easting\",500000],PA");
  2398         -    add_srs_wkt (p, 11,
  2399         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2400         -    add_srs_wkt (p, 12,
  2401         -        "[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"North");
  2402         -    add_srs_wkt (p, 13,
  2403         -        "ing\",NORTH],AUTHORITY[\"EPSG\",\"3203\"]]");
         2383  +        "S84[-208.406,-109.878,-2.5764,0,0,0,0],AUTHORITY[\"EPSG\"");
         2384  +    add_srs_wkt (p, 4,
         2385  +        ",\"6754\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
         2386  +    add_srs_wkt (p, 5,
         2387  +        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
         2388  +    add_srs_wkt (p, 6,
         2389  +        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
         2390  +    add_srs_wkt (p, 7,
         2391  +        "ude\",EAST],AUTHORITY[\"EPSG\",\"4754\"]],PROJECTION[\"T");
         2392  +    add_srs_wkt (p, 8,
         2393  +        "ransverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0");
         2394  +    add_srs_wkt (p, 9,
         2395  +        "],PARAMETER[\"central_meridian\",27],PARAMETER[\"scale_f");
         2396  +    add_srs_wkt (p, 10,
         2397  +        "actor\",0.9996],PARAMETER[\"false_easting\",500000],PARA");
         2398  +    add_srs_wkt (p, 11,
         2399  +        "METER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"");
         2400  +    add_srs_wkt (p, 12,
         2401  +        "EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing");
         2402  +    add_srs_wkt (p, 13,
         2403  +        "\",NORTH],AUTHORITY[\"EPSG\",\"3203\"]]");
  2404   2404       p = add_epsg_def_ex (filter, first, last, 3204, "epsg", 3204,
  2405   2405           "WGS 84 / SCAR IMW SP19-20", 0, 0,
  2406   2406           "WGS 84", "Greenwich",
  2407   2407           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
  2408   2408           "Easting", "East", "Northing", "North");
  2409   2409       add_proj4text (p, 0,
  2410   2410           "+proj=lcc +lat_1=-60.66666666666666 +lat_2=-63.333333333");

Changes to src/srsinit/epsg_inlined_12.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  2322   2322           "Fatu Iva 72 / UTM zone 7S", 0, 0,
  2323   2323           "International 1924", "Greenwich",
  2324   2324           "Fatu_Iva_72", "Transverse_Mercator", "metre",
  2325   2325           "Easting", "East", "Northing", "North");
  2326   2326       add_proj4text (p, 0,
  2327   2327           "+proj=utm +zone=7 +south +ellps=intl +towgs84=347.103,10");
  2328   2328       add_proj4text (p, 1,
  2329         -        "78.125,2623.922,-33.8875,70.6773,-9.3943,186.074 +units=");
         2329  +        "78.12,2623.92,-33.8875,70.6773,-9.3943,186.074 +units=m ");
  2330   2330       add_proj4text (p, 2,
  2331         -        "m +no_defs");
         2331  +        "+no_defs");
  2332   2332       add_srs_wkt (p, 0,
  2333   2333           "PROJCS[\"Fatu Iva 72 / UTM zone 7S\",GEOGCS[\"Fatu Iva 7");
  2334   2334       add_srs_wkt (p, 1,
  2335   2335           "2\",DATUM[\"Fatu_Iva_72\",SPHEROID[\"International 1924\"");
  2336   2336       add_srs_wkt (p, 2,
  2337   2337           ",6378388,297,AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[347.1");
  2338   2338       add_srs_wkt (p, 3,
  2339         -        "03,1078.125,2623.922,-33.8875,70.6773,-9.3943,186.074],A");
  2340         -    add_srs_wkt (p, 4,
  2341         -        "UTHORITY[\"EPSG\",\"6688\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2342         -    add_srs_wkt (p, 5,
  2343         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2344         -    add_srs_wkt (p, 6,
  2345         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2346         -    add_srs_wkt (p, 7,
  2347         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4688\"");
  2348         -    add_srs_wkt (p, 8,
  2349         -        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  2350         -    add_srs_wkt (p, 9,
  2351         -        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-141],");
  2352         -    add_srs_wkt (p, 10,
  2353         -        "PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_eas");
  2354         -    add_srs_wkt (p, 11,
  2355         -        "ting\",500000],PARAMETER[\"false_northing\",10000000],UN");
  2356         -    add_srs_wkt (p, 12,
  2357         -        "IT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"East");
  2358         -    add_srs_wkt (p, 13,
  2359         -        "ing\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",");
  2360         -    add_srs_wkt (p, 14,
  2361         -        "\"3303\"]]");
         2339  +        "03,1078.12,2623.92,-33.8875,70.6773,-9.3943,186.074],AUT");
         2340  +    add_srs_wkt (p, 4,
         2341  +        "HORITY[\"EPSG\",\"6688\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         2342  +    add_srs_wkt (p, 5,
         2343  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         2344  +    add_srs_wkt (p, 6,
         2345  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         2346  +    add_srs_wkt (p, 7,
         2347  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4688\"]]");
         2348  +    add_srs_wkt (p, 8,
         2349  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         2350  +    add_srs_wkt (p, 9,
         2351  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",-141],PA");
         2352  +    add_srs_wkt (p, 10,
         2353  +        "RAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easti");
         2354  +    add_srs_wkt (p, 11,
         2355  +        "ng\",500000],PARAMETER[\"false_northing\",10000000],UNIT");
         2356  +    add_srs_wkt (p, 12,
         2357  +        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eastin");
         2358  +    add_srs_wkt (p, 13,
         2359  +        "g\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"");
         2360  +    add_srs_wkt (p, 14,
         2361  +        "3303\"]]");
  2362   2362       p = add_epsg_def_ex (filter, first, last, 3304, "epsg", 3304,
  2363   2363           "Tahiti 79 / UTM zone 6S", 0, 0,
  2364   2364           "International 1924", "Greenwich",
  2365   2365           "Tahiti_79", "Transverse_Mercator", "metre",
  2366   2366           "Easting", "East", "Northing", "North");
  2367   2367       add_proj4text (p, 0,
  2368   2368           "+proj=utm +zone=6 +south +ellps=intl +towgs84=221.525,15");
................................................................................
  2566   2566       add_proj4text (p, 1,
  2567   2567           "0=0 +y_0=-4000000 +datum=NAD27 +units=m +no_defs");
  2568   2568       add_srs_wkt (p, 0,
  2569   2569           "PROJCS[\"NAD27 / California Albers\",GEOGCS[\"NAD27\",DA");
  2570   2570       add_srs_wkt (p, 1,
  2571   2571           "TUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866");
  2572   2572       add_srs_wkt (p, 2,
  2573         -        "\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008");
         2573  +        "\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008");
  2574   2574       add_srs_wkt (p, 3,
  2575   2575           "\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",");
  2576   2576       add_srs_wkt (p, 4,
  2577   2577           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
  2578   2578       add_srs_wkt (p, 5,
  2579   2579           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
  2580   2580       add_srs_wkt (p, 6,
................................................................................
  2761   2761       add_proj4text (p, 2,
  2762   2762           "95,0,0,0,0 +units=m +no_defs");
  2763   2763       add_srs_wkt (p, 0,
  2764   2764           "PROJCS[\"Katanga 1955 / Katanga Lambert (deprecated)\",G");
  2765   2765       add_srs_wkt (p, 1,
  2766   2766           "EOGCS[\"Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"");
  2767   2767       add_srs_wkt (p, 2,
  2768         -        "Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EP");
         2768  +        "Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EP");
  2769   2769       add_srs_wkt (p, 3,
  2770   2770           "SG\",\"7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0]");
  2771   2771       add_srs_wkt (p, 4,
  2772   2772           ",AUTHORITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AU");
  2773   2773       add_srs_wkt (p, 5,
  2774   2774           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2775   2775       add_srs_wkt (p, 6,
................................................................................
  2802   2802       add_proj4text (p, 2,
  2803   2803           "units=m +no_defs");
  2804   2804       add_srs_wkt (p, 0,
  2805   2805           "PROJCS[\"Katanga 1955 / Katanga TM (deprecated)\",GEOGCS");
  2806   2806       add_srs_wkt (p, 1,
  2807   2807           "[\"Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clar");
  2808   2808       add_srs_wkt (p, 2,
  2809         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         2809  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  2810   2810       add_srs_wkt (p, 3,
  2811   2811           ",\"7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUT");
  2812   2812       add_srs_wkt (p, 4,
  2813   2813           "HORITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  2814   2814       add_srs_wkt (p, 5,
  2815   2815           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  2816   2816       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_13.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   212    212           "Pulkovo 1942 / CS63 zone C0", 0, 1,
   213    213           "Krassowsky 1940", "Greenwich",
   214    214           "Pulkovo_1942", "Transverse_Mercator", "metre",
   215    215           "X", "North", "Y", "East");
   216    216       add_proj4text (p, 0,
   217    217           "+proj=tmerc +lat_0=0.1 +lon_0=21.95 +k=1 +x_0=250000 +y_");
   218    218       add_proj4text (p, 1,
   219         -        "0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.8");
          219  +        "0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.");
   220    220       add_proj4text (p, 2,
   221         -        "2,-0.12 +units=m +no_defs");
          221  +        "82,-0.12 +units=m +no_defs");
   222    222       add_srs_wkt (p, 0,
   223    223           "PROJCS[\"Pulkovo 1942 / CS63 zone C0\",GEOGCS[\"Pulkovo ");
   224    224       add_srs_wkt (p, 1,
   225    225           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   226    226       add_srs_wkt (p, 2,
   227    227           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   228    228       add_srs_wkt (p, 3,
   229         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          229  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   230    230       add_srs_wkt (p, 4,
   231    231           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   232    232       add_srs_wkt (p, 5,
   233    233           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   234    234       add_srs_wkt (p, 6,
   235    235           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   236    236       add_srs_wkt (p, 7,
................................................................................
   251    251           "Pulkovo 1942 / CS63 zone C1", 0, 1,
   252    252           "Krassowsky 1940", "Greenwich",
   253    253           "Pulkovo_1942", "Transverse_Mercator", "metre",
   254    254           "X", "North", "Y", "East");
   255    255       add_proj4text (p, 0,
   256    256           "+proj=tmerc +lat_0=0.1 +lon_0=24.95 +k=1 +x_0=1250000 +y");
   257    257       add_proj4text (p, 1,
   258         -        "_0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.");
          258  +        "_0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0");
   259    259       add_proj4text (p, 2,
   260         -        "82,-0.12 +units=m +no_defs");
          260  +        ".82,-0.12 +units=m +no_defs");
   261    261       add_srs_wkt (p, 0,
   262    262           "PROJCS[\"Pulkovo 1942 / CS63 zone C1\",GEOGCS[\"Pulkovo ");
   263    263       add_srs_wkt (p, 1,
   264    264           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   265    265       add_srs_wkt (p, 2,
   266    266           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   267    267       add_srs_wkt (p, 3,
   268         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          268  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   269    269       add_srs_wkt (p, 4,
   270    270           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   271    271       add_srs_wkt (p, 5,
   272    272           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   273    273       add_srs_wkt (p, 6,
   274    274           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   275    275       add_srs_wkt (p, 7,
................................................................................
   290    290           "Pulkovo 1942 / CS63 zone C2", 0, 1,
   291    291           "Krassowsky 1940", "Greenwich",
   292    292           "Pulkovo_1942", "Transverse_Mercator", "metre",
   293    293           "X", "North", "Y", "East");
   294    294       add_proj4text (p, 0,
   295    295           "+proj=tmerc +lat_0=0.1 +lon_0=27.95 +k=1 +x_0=2250000 +y");
   296    296       add_proj4text (p, 1,
   297         -        "_0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.");
          297  +        "_0=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0");
   298    298       add_proj4text (p, 2,
   299         -        "82,-0.12 +units=m +no_defs");
          299  +        ".82,-0.12 +units=m +no_defs");
   300    300       add_srs_wkt (p, 0,
   301    301           "PROJCS[\"Pulkovo 1942 / CS63 zone C2\",GEOGCS[\"Pulkovo ");
   302    302       add_srs_wkt (p, 1,
   303    303           "1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassowsky 1940");
   304    304       add_srs_wkt (p, 2,
   305    305           "\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[2");
   306    306       add_srs_wkt (p, 3,
   307         -        "3.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
          307  +        "3.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[\"EPSG\"");
   308    308       add_srs_wkt (p, 4,
   309    309           ",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   310    310       add_srs_wkt (p, 5,
   311    311           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   312    312       add_srs_wkt (p, 6,
   313    313           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   314    314       add_srs_wkt (p, 7,
................................................................................
   446    446       add_proj4text (p, 1,
   447    447           "79,-27.584,-7.862,8.163,6.042,-13.925 +units=m +no_defs");
   448    448       add_srs_wkt (p, 0,
   449    449           "PROJCS[\"Grand Cayman 1959 / UTM zone 17N (deprecated)\"");
   450    450       add_srs_wkt (p, 1,
   451    451           ",GEOGCS[\"GCGD59\",DATUM[\"Grand_Cayman_Geodetic_Datum_1");
   452    452       add_srs_wkt (p, 2,
   453         -        "959\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821389");
          453  +        "959\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821390");
   454    454       add_srs_wkt (p, 3,
   455         -        "82,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-179.483,-69.37");
          455  +        "06,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-179.483,-69.37");
   456    456       add_srs_wkt (p, 4,
   457    457           "9,-27.584,-7.862,8.163,6.042,-13.925],AUTHORITY[\"EPSG\"");
   458    458       add_srs_wkt (p, 5,
   459    459           ",\"6723\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   460    460       add_srs_wkt (p, 6,
   461    461           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   462    462       add_srs_wkt (p, 7,
................................................................................
   487    487       add_srs_wkt (p, 0,
   488    488           "PROJCS[\"Little Cayman 1961 / UTM zone 17N (deprecated)\"");
   489    489       add_srs_wkt (p, 1,
   490    490           ",GEOGCS[\"SIGD61\",DATUM[\"Sister_Islands_Geodetic_Datum");
   491    491       add_srs_wkt (p, 2,
   492    492           "_1961\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213");
   493    493       add_srs_wkt (p, 3,
   494         -        "8982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[8.853,-52.644");
          494  +        "9006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[8.853,-52.644");
   495    495       add_srs_wkt (p, 4,
   496    496           ",180.304,-0.393,-2.323,2.96,-24.081],AUTHORITY[\"EPSG\",");
   497    497       add_srs_wkt (p, 5,
   498    498           "\"6726\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
   499    499       add_srs_wkt (p, 6,
   500    500           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
   501    501       add_srs_wkt (p, 7,
................................................................................
   872    872       add_proj4text (p, 2,
   873    873           "78293.645208759 +b=6356617.987679838 +units=m +no_defs");
   874    874       add_srs_wkt (p, 0,
   875    875           "PROJCS[\"Hong Kong 1963 Grid System (deprecated)\",GEOGC");
   876    876       add_srs_wkt (p, 1,
   877    877           "S[\"Hong Kong 1963\",DATUM[\"Hong_Kong_1963\",SPHEROID[\"");
   878    878       add_srs_wkt (p, 2,
   879         -        "Clarke 1858\",6378293.645208759,294.2606763692606,AUTHOR");
          879  +        "Clarke 1858\",6378293.645208759,294.2606763692569,AUTHOR");
   880    880       add_srs_wkt (p, 3,
   881    881           "ITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"6738\"]],PR");
   882    882       add_srs_wkt (p, 4,
   883    883           "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
   884    884       add_srs_wkt (p, 5,
   885    885           "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
   886    886       add_srs_wkt (p, 6,
................................................................................
  1012   1012       add_proj4text (p, 0,
  1013   1013           "+proj=utm +zone=59 +datum=NAD27 +units=m +no_defs");
  1014   1014       add_srs_wkt (p, 0,
  1015   1015           "PROJCS[\"NAD27 / UTM zone 59N\",GEOGCS[\"NAD27\",DATUM[\"");
  1016   1016       add_srs_wkt (p, 1,
  1017   1017           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1018   1018       add_srs_wkt (p, 2,
  1019         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1019  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1020   1020       add_srs_wkt (p, 3,
  1021   1021           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1022   1022       add_srs_wkt (p, 4,
  1023   1023           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1024   1024       add_srs_wkt (p, 5,
  1025   1025           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1026   1026       add_srs_wkt (p, 6,
................................................................................
  1047   1047       add_proj4text (p, 0,
  1048   1048           "+proj=utm +zone=60 +datum=NAD27 +units=m +no_defs");
  1049   1049       add_srs_wkt (p, 0,
  1050   1050           "PROJCS[\"NAD27 / UTM zone 60N\",GEOGCS[\"NAD27\",DATUM[\"");
  1051   1051       add_srs_wkt (p, 1,
  1052   1052           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1053   1053       add_srs_wkt (p, 2,
  1054         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1054  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1055   1055       add_srs_wkt (p, 3,
  1056   1056           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1057   1057       add_srs_wkt (p, 4,
  1058   1058           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1059   1059       add_srs_wkt (p, 5,
  1060   1060           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1061   1061       add_srs_wkt (p, 6,
................................................................................
  1684   1684           "Pulkovo 1942 / Caspian Sea Mercator", 0, 1,
  1685   1685           "Krassowsky 1940", "Greenwich",
  1686   1686           "Pulkovo_1942", "Mercator_2SP", "metre",
  1687   1687           "none", "North", "none", "East");
  1688   1688       add_proj4text (p, 0,
  1689   1689           "+proj=merc +lon_0=51 +lat_ts=42 +x_0=0 +y_0=0 +ellps=kra");
  1690   1690       add_proj4text (p, 1,
  1691         -        "ss +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units");
         1691  +        "ss +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0.12 +unit");
  1692   1692       add_proj4text (p, 2,
  1693         -        "=m +no_defs");
         1693  +        "s=m +no_defs");
  1694   1694       add_srs_wkt (p, 0,
  1695   1695           "PROJCS[\"Pulkovo 1942 / Caspian Sea Mercator\",GEOGCS[\"");
  1696   1696       add_srs_wkt (p, 1,
  1697   1697           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  1698   1698       add_srs_wkt (p, 2,
  1699   1699           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  1700   1700       add_srs_wkt (p, 3,
  1701         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         1701  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
  1702   1702       add_srs_wkt (p, 4,
  1703         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         1703  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  1704   1704       add_srs_wkt (p, 5,
  1705         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         1705  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  1706   1706       add_srs_wkt (p, 6,
  1707         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         1707  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  1708   1708       add_srs_wkt (p, 7,
  1709         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         1709  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
  1710   1710       add_srs_wkt (p, 8,
  1711         -        "TION[\"Mercator_2SP\"],PARAMETER[\"standard_parallel_1\"");
         1711  +        "CTION[\"Mercator_2SP\"],PARAMETER[\"standard_parallel_1\"");
  1712   1712       add_srs_wkt (p, 9,
  1713   1713           ",42],PARAMETER[\"central_meridian\",51],PARAMETER[\"fals");
  1714   1714       add_srs_wkt (p, 10,
  1715   1715           "e_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"me");
  1716   1716       add_srs_wkt (p, 11,
  1717   1717           "tre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"none\",NORT");
  1718   1718       add_srs_wkt (p, 12,
................................................................................
  1721   1721           "Pulkovo 1942 / 3-degree Gauss-Kruger zone 60", 0, 1,
  1722   1722           "Krassowsky 1940", "Greenwich",
  1723   1723           "Pulkovo_1942", "Transverse_Mercator", "metre",
  1724   1724           "X", "North", "Y", "East");
  1725   1725       add_proj4text (p, 0,
  1726   1726           "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=60500000 +y_0=");
  1727   1727       add_proj4text (p, 1,
  1728         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         1728  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  1729   1729       add_proj4text (p, 2,
  1730         -        "-0.12 +units=m +no_defs");
         1730  +        ",-0.12 +units=m +no_defs");
  1731   1731       add_srs_wkt (p, 0,
  1732   1732           "PROJCS[\"Pulkovo 1942 / 3-degree Gauss-Kruger zone 60\",");
  1733   1733       add_srs_wkt (p, 1,
  1734   1734           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1735   1735       add_srs_wkt (p, 2,
  1736   1736           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1737   1737       add_srs_wkt (p, 3,
  1738         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1738  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1739   1739       add_srs_wkt (p, 4,
  1740         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1740  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1741   1741       add_srs_wkt (p, 5,
  1742         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1742  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1743   1743       add_srs_wkt (p, 6,
  1744         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1744  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1745   1745       add_srs_wkt (p, 7,
  1746         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1746  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1747   1747       add_srs_wkt (p, 8,
  1748   1748           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1749   1749       add_srs_wkt (p, 9,
  1750   1750           "ude_of_origin\",0],PARAMETER[\"central_meridian\",180],P");
  1751   1751       add_srs_wkt (p, 10,
  1752   1752           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1753   1753       add_srs_wkt (p, 11,
................................................................................
  1760   1760           "Pulkovo 1995 / 3-degree Gauss-Kruger zone 60", 0, 1,
  1761   1761           "Krassowsky 1940", "Greenwich",
  1762   1762           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1763   1763           "X", "North", "Y", "East");
  1764   1764       add_proj4text (p, 0,
  1765   1765           "+proj=tmerc +lat_0=0 +lon_0=180 +k=1 +x_0=60500000 +y_0=");
  1766   1766       add_proj4text (p, 1,
  1767         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         1767  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  1768   1768       add_proj4text (p, 2,
  1769         -        ".22 +units=m +no_defs");
         1769  +        "-0.22 +units=m +no_defs");
  1770   1770       add_srs_wkt (p, 0,
  1771   1771           "PROJCS[\"Pulkovo 1995 / 3-degree Gauss-Kruger zone 60\",");
  1772   1772       add_srs_wkt (p, 1,
  1773   1773           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1774   1774       add_srs_wkt (p, 2,
  1775   1775           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1776   1776       add_srs_wkt (p, 3,
  1777         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1778         -    add_srs_wkt (p, 4,
  1779         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1780         -    add_srs_wkt (p, 5,
  1781         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1782         -    add_srs_wkt (p, 6,
  1783         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1784         -    add_srs_wkt (p, 7,
  1785         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1786         -    add_srs_wkt (p, 8,
  1787         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1788         -    add_srs_wkt (p, 9,
  1789         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",180],PAR");
  1790         -    add_srs_wkt (p, 10,
  1791         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",6");
  1792         -    add_srs_wkt (p, 11,
  1793         -        "0500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1794         -    add_srs_wkt (p, 12,
  1795         -        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1796         -    add_srs_wkt (p, 13,
  1797         -        "Y\",EAST],AUTHORITY[\"EPSG\",\"3390\"]]");
         1777  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1778  +    add_srs_wkt (p, 4,
         1779  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1780  +    add_srs_wkt (p, 5,
         1781  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1782  +    add_srs_wkt (p, 6,
         1783  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1784  +    add_srs_wkt (p, 7,
         1785  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1786  +    add_srs_wkt (p, 8,
         1787  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1788  +    add_srs_wkt (p, 9,
         1789  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",180],P");
         1790  +    add_srs_wkt (p, 10,
         1791  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1792  +    add_srs_wkt (p, 11,
         1793  +        ",60500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
         1794  +    add_srs_wkt (p, 12,
         1795  +        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
         1796  +    add_srs_wkt (p, 13,
         1797  +        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"3390\"]]");
  1798   1798       p = add_epsg_def_ex (filter, first, last, 3391, "epsg", 3391,
  1799   1799           "Karbala 1979 / UTM zone 37N", 0, 0,
  1800   1800           "Clarke 1880 (RGS)", "Greenwich",
  1801   1801           "Karbala_1979", "Transverse_Mercator", "metre",
  1802   1802           "Easting", "East", "Northing", "North");
  1803   1803       add_proj4text (p, 0,
  1804   1804           "+proj=utm +zone=37 +ellps=clrk80 +towgs84=70.995,-335.91");
................................................................................
  2407   2407       add_proj4text (p, 3,
  2408   2408           "654 +no_defs");
  2409   2409       add_srs_wkt (p, 0,
  2410   2410           "PROJCS[\"Hong Kong 1963 Grid System\",GEOGCS[\"Hong Kong");
  2411   2411       add_srs_wkt (p, 1,
  2412   2412           " 1963\",DATUM[\"Hong_Kong_1963\",SPHEROID[\"Clarke 1858\"");
  2413   2413       add_srs_wkt (p, 2,
  2414         -        ",6378293.645208759,294.2606763692606,AUTHORITY[\"EPSG\",");
         2414  +        ",6378293.645208759,294.2606763692569,AUTHORITY[\"EPSG\",");
  2415   2415       add_srs_wkt (p, 3,
  2416   2416           "\"7007\"]],AUTHORITY[\"EPSG\",\"6738\"]],PRIMEM[\"Greenw");
  2417   2417       add_srs_wkt (p, 4,
  2418   2418           "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
  2419   2419       add_srs_wkt (p, 5,
  2420   2420           "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
  2421   2421       add_srs_wkt (p, 6,
................................................................................
  2561   2561       add_srs_wkt (p, 0,
  2562   2562           "PROJCS[\"NSIDC Sea Ice Polar Stereographic North\",GEOGC");
  2563   2563       add_srs_wkt (p, 1,
  2564   2564           "S[\"Unspecified datum based upon the Hughes 1980 ellipso");
  2565   2565       add_srs_wkt (p, 2,
  2566   2566           "id\",DATUM[\"Not_specified_based_on_Hughes_1980_ellipsoi");
  2567   2567       add_srs_wkt (p, 3,
  2568         -        "d\",SPHEROID[\"Hughes 1980\",6378273,298.279411123064,AU");
         2568  +        "d\",SPHEROID[\"Hughes 1980\",6378273,298.279411123061,AU");
  2569   2569       add_srs_wkt (p, 4,
  2570   2570           "THORITY[\"EPSG\",\"7058\"]],AUTHORITY[\"EPSG\",\"6054\"]");
  2571   2571       add_srs_wkt (p, 5,
  2572   2572           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2573   2573       add_srs_wkt (p, 6,
  2574   2574           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2575   2575       add_srs_wkt (p, 7,
................................................................................
  2600   2600       add_srs_wkt (p, 0,
  2601   2601           "PROJCS[\"NSIDC Sea Ice Polar Stereographic South\",GEOGC");
  2602   2602       add_srs_wkt (p, 1,
  2603   2603           "S[\"Unspecified datum based upon the Hughes 1980 ellipso");
  2604   2604       add_srs_wkt (p, 2,
  2605   2605           "id\",DATUM[\"Not_specified_based_on_Hughes_1980_ellipsoi");
  2606   2606       add_srs_wkt (p, 3,
  2607         -        "d\",SPHEROID[\"Hughes 1980\",6378273,298.279411123064,AU");
         2607  +        "d\",SPHEROID[\"Hughes 1980\",6378273,298.279411123061,AU");
  2608   2608       add_srs_wkt (p, 4,
  2609   2609           "THORITY[\"EPSG\",\"7058\"]],AUTHORITY[\"EPSG\",\"6054\"]");
  2610   2610       add_srs_wkt (p, 5,
  2611   2611           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2612   2612       add_srs_wkt (p, 6,
  2613   2613           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2614   2614       add_srs_wkt (p, 7,
................................................................................
  3727   3727           "PSD93 / UTM zone 39N", 0, 0,
  3728   3728           "Clarke 1880 (RGS)", "Greenwich",
  3729   3729           "PDO_Survey_Datum_1993", "Transverse_Mercator", "metre",
  3730   3730           "Easting", "East", "Northing", "North");
  3731   3731       add_proj4text (p, 0,
  3732   3732           "+proj=utm +zone=39 +ellps=clrk80 +towgs84=-180.624,-225.");
  3733   3733       add_proj4text (p, 1,
  3734         -        "516,173.919,-0.81,-1.898,8.336,16.71006 +units=m +no_def");
  3735         -    add_proj4text (p, 2,
  3736         -        "s");
         3734  +        "516,173.919,-0.81,-1.898,8.336,16.7101 +units=m +no_defs");
  3737   3735       add_srs_wkt (p, 0,
  3738   3736           "PROJCS[\"PSD93 / UTM zone 39N\",GEOGCS[\"PSD93\",DATUM[\"");
  3739   3737       add_srs_wkt (p, 1,
  3740   3738           "PDO_Survey_Datum_1993\",SPHEROID[\"Clarke 1880 (RGS)\",6");
  3741   3739       add_srs_wkt (p, 2,
  3742   3740           "378249.145,293.465,AUTHORITY[\"EPSG\",\"7012\"]],TOWGS84");
  3743   3741       add_srs_wkt (p, 3,
  3744         -        "[-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006],");
         3742  +        "[-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.7101],A");
  3745   3743       add_srs_wkt (p, 4,
  3746         -        "AUTHORITY[\"EPSG\",\"6134\"]],PRIMEM[\"Greenwich\",0,AUT");
         3744  +        "UTHORITY[\"EPSG\",\"6134\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3747   3745       add_srs_wkt (p, 5,
  3748         -        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
         3746  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3749   3747       add_srs_wkt (p, 6,
  3750         -        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
         3748  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3751   3749       add_srs_wkt (p, 7,
  3752         -        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4134\"");
         3750  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4134\"");
  3753   3751       add_srs_wkt (p, 8,
  3754   3752           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3755   3753       add_srs_wkt (p, 9,
  3756   3754           "ude_of_origin\",0],PARAMETER[\"central_meridian\",51],PA");
  3757   3755       add_srs_wkt (p, 10,
  3758   3756           "RAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easti");
  3759   3757       add_srs_wkt (p, 11,
................................................................................
  3768   3766           "PSD93 / UTM zone 40N", 0, 0,
  3769   3767           "Clarke 1880 (RGS)", "Greenwich",
  3770   3768           "PDO_Survey_Datum_1993", "Transverse_Mercator", "metre",
  3771   3769           "Easting", "East", "Northing", "North");
  3772   3770       add_proj4text (p, 0,
  3773   3771           "+proj=utm +zone=40 +ellps=clrk80 +towgs84=-180.624,-225.");
  3774   3772       add_proj4text (p, 1,
  3775         -        "516,173.919,-0.81,-1.898,8.336,16.71006 +units=m +no_def");
  3776         -    add_proj4text (p, 2,
  3777         -        "s");
         3773  +        "516,173.919,-0.81,-1.898,8.336,16.7101 +units=m +no_defs");
  3778   3774       add_srs_wkt (p, 0,
  3779   3775           "PROJCS[\"PSD93 / UTM zone 40N\",GEOGCS[\"PSD93\",DATUM[\"");
  3780   3776       add_srs_wkt (p, 1,
  3781   3777           "PDO_Survey_Datum_1993\",SPHEROID[\"Clarke 1880 (RGS)\",6");
  3782   3778       add_srs_wkt (p, 2,
  3783   3779           "378249.145,293.465,AUTHORITY[\"EPSG\",\"7012\"]],TOWGS84");
  3784   3780       add_srs_wkt (p, 3,
  3785         -        "[-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006],");
         3781  +        "[-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.7101],A");
  3786   3782       add_srs_wkt (p, 4,
  3787         -        "AUTHORITY[\"EPSG\",\"6134\"]],PRIMEM[\"Greenwich\",0,AUT");
         3783  +        "UTHORITY[\"EPSG\",\"6134\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3788   3784       add_srs_wkt (p, 5,
  3789         -        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
         3785  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3790   3786       add_srs_wkt (p, 6,
  3791         -        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
         3787  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3792   3788       add_srs_wkt (p, 7,
  3793         -        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4134\"");
         3789  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4134\"");
  3794   3790       add_srs_wkt (p, 8,
  3795   3791           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3796   3792       add_srs_wkt (p, 9,
  3797   3793           "ude_of_origin\",0],PARAMETER[\"central_meridian\",57],PA");
  3798   3794       add_srs_wkt (p, 10,
  3799   3795           "RAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easti");
  3800   3796       add_srs_wkt (p, 11,

Changes to src/srsinit/epsg_inlined_14.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   662    662       add_proj4text (p, 1,
   663    663           "37,124,0,0,0,0 +units=m +no_defs");
   664    664       add_srs_wkt (p, 0,
   665    665           "PROJCS[\"Dabola 1981 / UTM zone 28N\",GEOGCS[\"Dabola 19");
   666    666       add_srs_wkt (p, 1,
   667    667           "81\",DATUM[\"Dabola_1981\",SPHEROID[\"Clarke 1880 (IGN)\"");
   668    668       add_srs_wkt (p, 2,
   669         -        ",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"");
          669  +        ",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"");
   670    670       add_srs_wkt (p, 3,
   671    671           "]],TOWGS84[-83,37,124,0,0,0,0],AUTHORITY[\"EPSG\",\"6155");
   672    672       add_srs_wkt (p, 4,
   673    673           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
   674    674       add_srs_wkt (p, 5,
   675    675           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
   676    676       add_srs_wkt (p, 6,
................................................................................
   699    699       add_proj4text (p, 1,
   700    700           "37,124,0,0,0,0 +units=m +no_defs");
   701    701       add_srs_wkt (p, 0,
   702    702           "PROJCS[\"Dabola 1981 / UTM zone 29N\",GEOGCS[\"Dabola 19");
   703    703       add_srs_wkt (p, 1,
   704    704           "81\",DATUM[\"Dabola_1981\",SPHEROID[\"Clarke 1880 (IGN)\"");
   705    705       add_srs_wkt (p, 2,
   706         -        ",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"");
          706  +        ",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"");
   707    707       add_srs_wkt (p, 3,
   708    708           "]],TOWGS84[-83,37,124,0,0,0,0],AUTHORITY[\"EPSG\",\"6155");
   709    709       add_srs_wkt (p, 4,
   710    710           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
   711    711       add_srs_wkt (p, 5,
   712    712           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
   713    713       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_15.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   625    625       add_proj4text (p, 2,
   626    626           "owgs84=61,-285,-181,0,0,0,0 +units=us-ft +no_defs");
   627    627       add_srs_wkt (p, 0,
   628    628           "PROJCS[\"Old Hawaiian / Hawaii zone 1\",GEOGCS[\"Old Haw");
   629    629       add_srs_wkt (p, 1,
   630    630           "aiian\",DATUM[\"Old_Hawaiian\",SPHEROID[\"Clarke 1866\",");
   631    631       add_srs_wkt (p, 2,
   632         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          632  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   633    633       add_srs_wkt (p, 3,
   634    634           "],TOWGS84[61,-285,-181,0,0,0,0],AUTHORITY[\"EPSG\",\"613");
   635    635       add_srs_wkt (p, 4,
   636    636           "5\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   637    637       add_srs_wkt (p, 5,
   638    638           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   639    639       add_srs_wkt (p, 6,
................................................................................
   668    668       add_proj4text (p, 3,
   669    669           "_defs");
   670    670       add_srs_wkt (p, 0,
   671    671           "PROJCS[\"Old Hawaiian / Hawaii zone 2\",GEOGCS[\"Old Haw");
   672    672       add_srs_wkt (p, 1,
   673    673           "aiian\",DATUM[\"Old_Hawaiian\",SPHEROID[\"Clarke 1866\",");
   674    674       add_srs_wkt (p, 2,
   675         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          675  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   676    676       add_srs_wkt (p, 3,
   677    677           "],TOWGS84[61,-285,-181,0,0,0,0],AUTHORITY[\"EPSG\",\"613");
   678    678       add_srs_wkt (p, 4,
   679    679           "5\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   680    680       add_srs_wkt (p, 5,
   681    681           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   682    682       add_srs_wkt (p, 6,
................................................................................
   709    709       add_proj4text (p, 2,
   710    710           "=61,-285,-181,0,0,0,0 +units=us-ft +no_defs");
   711    711       add_srs_wkt (p, 0,
   712    712           "PROJCS[\"Old Hawaiian / Hawaii zone 3\",GEOGCS[\"Old Haw");
   713    713       add_srs_wkt (p, 1,
   714    714           "aiian\",DATUM[\"Old_Hawaiian\",SPHEROID[\"Clarke 1866\",");
   715    715       add_srs_wkt (p, 2,
   716         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          716  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   717    717       add_srs_wkt (p, 3,
   718    718           "],TOWGS84[61,-285,-181,0,0,0,0],AUTHORITY[\"EPSG\",\"613");
   719    719       add_srs_wkt (p, 4,
   720    720           "5\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   721    721       add_srs_wkt (p, 5,
   722    722           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   723    723       add_srs_wkt (p, 6,
................................................................................
   750    750       add_proj4text (p, 2,
   751    751           "84=61,-285,-181,0,0,0,0 +units=us-ft +no_defs");
   752    752       add_srs_wkt (p, 0,
   753    753           "PROJCS[\"Old Hawaiian / Hawaii zone 4\",GEOGCS[\"Old Haw");
   754    754       add_srs_wkt (p, 1,
   755    755           "aiian\",DATUM[\"Old_Hawaiian\",SPHEROID[\"Clarke 1866\",");
   756    756       add_srs_wkt (p, 2,
   757         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          757  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   758    758       add_srs_wkt (p, 3,
   759    759           "],TOWGS84[61,-285,-181,0,0,0,0],AUTHORITY[\"EPSG\",\"613");
   760    760       add_srs_wkt (p, 4,
   761    761           "5\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   762    762       add_srs_wkt (p, 5,
   763    763           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   764    764       add_srs_wkt (p, 6,
................................................................................
   791    791       add_proj4text (p, 2,
   792    792           "+towgs84=61,-285,-181,0,0,0,0 +units=us-ft +no_defs");
   793    793       add_srs_wkt (p, 0,
   794    794           "PROJCS[\"Old Hawaiian / Hawaii zone 5\",GEOGCS[\"Old Haw");
   795    795       add_srs_wkt (p, 1,
   796    796           "aiian\",DATUM[\"Old_Hawaiian\",SPHEROID[\"Clarke 1866\",");
   797    797       add_srs_wkt (p, 2,
   798         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          798  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   799    799       add_srs_wkt (p, 3,
   800    800           "],TOWGS84[61,-285,-181,0,0,0,0],AUTHORITY[\"EPSG\",\"613");
   801    801       add_srs_wkt (p, 4,
   802    802           "5\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   803    803       add_srs_wkt (p, 5,
   804    804           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   805    805       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_16.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_17.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   811    811       add_proj4text (p, 1,
   812    812           "0,0,0 +units=m +no_defs");
   813    813       add_srs_wkt (p, 0,
   814    814           "PROJCS[\"Bermuda 1957 / UTM zone 20N\",GEOGCS[\"Bermuda ");
   815    815       add_srs_wkt (p, 1,
   816    816           "1957\",DATUM[\"Bermuda_1957\",SPHEROID[\"Clarke 1866\",6");
   817    817       add_srs_wkt (p, 2,
   818         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          818  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   819    819       add_srs_wkt (p, 3,
   820    820           ",TOWGS84[-73,213,296,0,0,0,0],AUTHORITY[\"EPSG\",\"6216\"");
   821    821       add_srs_wkt (p, 4,
   822    822           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
   823    823       add_srs_wkt (p, 5,
   824    824           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
   825    825       add_srs_wkt (p, 6,
................................................................................
   887    887       add_proj4text (p, 1,
   888    888           " +datum=NAD27 +units=m +no_defs");
   889    889       add_srs_wkt (p, 0,
   890    890           "PROJCS[\"NAD27 / Alberta 3TM ref merid 111 W\",GEOGCS[\"");
   891    891       add_srs_wkt (p, 1,
   892    892           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
   893    893       add_srs_wkt (p, 2,
   894         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
          894  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
   895    895       add_srs_wkt (p, 3,
   896    896           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
   897    897       add_srs_wkt (p, 4,
   898    898           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
   899    899       add_srs_wkt (p, 5,
   900    900           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
   901    901       add_srs_wkt (p, 6,
................................................................................
   924    924       add_proj4text (p, 1,
   925    925           " +datum=NAD27 +units=m +no_defs");
   926    926       add_srs_wkt (p, 0,
   927    927           "PROJCS[\"NAD27 / Alberta 3TM ref merid 114 W\",GEOGCS[\"");
   928    928       add_srs_wkt (p, 1,
   929    929           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
   930    930       add_srs_wkt (p, 2,
   931         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
          931  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
   932    932       add_srs_wkt (p, 3,
   933    933           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
   934    934       add_srs_wkt (p, 4,
   935    935           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
   936    936       add_srs_wkt (p, 5,
   937    937           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
   938    938       add_srs_wkt (p, 6,
................................................................................
   961    961       add_proj4text (p, 1,
   962    962           " +datum=NAD27 +units=m +no_defs");
   963    963       add_srs_wkt (p, 0,
   964    964           "PROJCS[\"NAD27 / Alberta 3TM ref merid 117 W\",GEOGCS[\"");
   965    965       add_srs_wkt (p, 1,
   966    966           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
   967    967       add_srs_wkt (p, 2,
   968         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
          968  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
   969    969       add_srs_wkt (p, 3,
   970    970           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
   971    971       add_srs_wkt (p, 4,
   972    972           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
   973    973       add_srs_wkt (p, 5,
   974    974           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
   975    975       add_srs_wkt (p, 6,
................................................................................
   998    998       add_proj4text (p, 1,
   999    999           " +datum=NAD27 +units=m +no_defs");
  1000   1000       add_srs_wkt (p, 0,
  1001   1001           "PROJCS[\"NAD27 / Alberta 3TM ref merid 120 W (deprecated");
  1002   1002       add_srs_wkt (p, 1,
  1003   1003           ")\",GEOGCS[\"NAD27\",DATUM[\"North_American_Datum_1927\"");
  1004   1004       add_srs_wkt (p, 2,
  1005         -        ",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982,AU");
         1005  +        ",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139006,AU");
  1006   1006       add_srs_wkt (p, 3,
  1007   1007           "THORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]");
  1008   1008       add_srs_wkt (p, 4,
  1009   1009           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  1010   1010       add_srs_wkt (p, 5,
  1011   1011           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  1012   1012       add_srs_wkt (p, 6,
................................................................................
  1766   1766       add_proj4text (p, 2,
  1767   1767           "fs");
  1768   1768       add_srs_wkt (p, 0,
  1769   1769           "PROJCS[\"NAD27 / Cuba Norte\",GEOGCS[\"NAD27\",DATUM[\"N");
  1770   1770       add_srs_wkt (p, 1,
  1771   1771           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  1772   1772       add_srs_wkt (p, 2,
  1773         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         1773  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  1774   1774       add_srs_wkt (p, 3,
  1775   1775           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  1776   1776       add_srs_wkt (p, 4,
  1777   1777           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  1778   1778       add_srs_wkt (p, 5,
  1779   1779           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  1780   1780       add_srs_wkt (p, 6,
................................................................................
  1805   1805       add_proj4text (p, 2,
  1806   1806           "_0=229126.939 +datum=NAD27 +units=m +no_defs");
  1807   1807       add_srs_wkt (p, 0,
  1808   1808           "PROJCS[\"NAD27 / Cuba Sur\",GEOGCS[\"NAD27\",DATUM[\"Nor");
  1809   1809       add_srs_wkt (p, 1,
  1810   1810           "th_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637820");
  1811   1811       add_srs_wkt (p, 2,
  1812         -        "6.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
         1812  +        "6.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
  1813   1813       add_srs_wkt (p, 3,
  1814   1814           "ORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
  1815   1815       add_srs_wkt (p, 4,
  1816   1816           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
  1817   1817       add_srs_wkt (p, 5,
  1818   1818           "3,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH]");
  1819   1819       add_srs_wkt (p, 6,
................................................................................
  1844   1844       add_proj4text (p, 1,
  1845   1845           "800000 +y_0=0 +datum=NAD27 +units=m +no_defs");
  1846   1846       add_srs_wkt (p, 0,
  1847   1847           "PROJCS[\"NAD27 / MTQ Lambert\",GEOGCS[\"NAD27\",DATUM[\"");
  1848   1848       add_srs_wkt (p, 1,
  1849   1849           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1850   1850       add_srs_wkt (p, 2,
  1851         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1851  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1852   1852       add_srs_wkt (p, 3,
  1853   1853           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1854   1854       add_srs_wkt (p, 4,
  1855   1855           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1856   1856       add_srs_wkt (p, 5,
  1857   1857           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1858   1858       add_srs_wkt (p, 6,
................................................................................
  1961   1961       add_proj4text (p, 1,
  1962   1962           " +datum=NAD27 +units=m +no_defs");
  1963   1963       add_srs_wkt (p, 0,
  1964   1964           "PROJCS[\"NAD27 / Alberta 3TM ref merid 120 W\",GEOGCS[\"");
  1965   1965       add_srs_wkt (p, 1,
  1966   1966           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  1967   1967       add_srs_wkt (p, 2,
  1968         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         1968  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  1969   1969       add_srs_wkt (p, 3,
  1970   1970           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  1971   1971       add_srs_wkt (p, 4,
  1972   1972           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  1973   1973       add_srs_wkt (p, 5,
  1974   1974           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  1975   1975       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_18.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   616    616       add_proj4text (p, 1,
   617    617           ",0,0 +units=m +no_defs");
   618    618       add_srs_wkt (p, 0,
   619    619           "PROJCS[\"Puerto Rico / UTM zone 20N\",GEOGCS[\"Puerto Ri");
   620    620       add_srs_wkt (p, 1,
   621    621           "co\",DATUM[\"Puerto_Rico\",SPHEROID[\"Clarke 1866\",6378");
   622    622       add_srs_wkt (p, 2,
   623         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TO");
          623  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TO");
   624    624       add_srs_wkt (p, 3,
   625    625           "WGS84[11,72,-101,0,0,0,0],AUTHORITY[\"EPSG\",\"6139\"]],");
   626    626       add_srs_wkt (p, 4,
   627    627           "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   628    628       add_srs_wkt (p, 5,
   629    629           "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   630    630       add_srs_wkt (p, 6,
................................................................................
  1361   1361       add_proj4text (p, 2,
  1362   1362           ".614,-255.95,0,0,0,0 +units=m +no_defs");
  1363   1363       add_srs_wkt (p, 0,
  1364   1364           "PROJCS[\"Katanga 1955 / Katanga Lambert (deprecated)\",G");
  1365   1365       add_srs_wkt (p, 1,
  1366   1366           "EOGCS[\"Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"");
  1367   1367       add_srs_wkt (p, 2,
  1368         -        "Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EP");
         1368  +        "Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EP");
  1369   1369       add_srs_wkt (p, 3,
  1370   1370           "SG\",\"7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0]");
  1371   1371       add_srs_wkt (p, 4,
  1372   1372           ",AUTHORITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AU");
  1373   1373       add_srs_wkt (p, 5,
  1374   1374           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1375   1375       add_srs_wkt (p, 6,
................................................................................
  1402   1402       add_proj4text (p, 2,
  1403   1403           "0,0 +units=m +no_defs");
  1404   1404       add_srs_wkt (p, 0,
  1405   1405           "PROJCS[\"Katanga 1955 / Katanga Gauss zone A\",GEOGCS[\"");
  1406   1406       add_srs_wkt (p, 1,
  1407   1407           "Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clarke ");
  1408   1408       add_srs_wkt (p, 2,
  1409         -        "1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
         1409  +        "1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
  1410   1410       add_srs_wkt (p, 3,
  1411   1411           "7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUTHOR");
  1412   1412       add_srs_wkt (p, 4,
  1413   1413           "ITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1414   1414       add_srs_wkt (p, 5,
  1415   1415           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1416   1416       add_srs_wkt (p, 6,
................................................................................
  1441   1441       add_proj4text (p, 2,
  1442   1442           "0,0 +units=m +no_defs");
  1443   1443       add_srs_wkt (p, 0,
  1444   1444           "PROJCS[\"Katanga 1955 / Katanga Gauss zone B\",GEOGCS[\"");
  1445   1445       add_srs_wkt (p, 1,
  1446   1446           "Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clarke ");
  1447   1447       add_srs_wkt (p, 2,
  1448         -        "1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
         1448  +        "1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
  1449   1449       add_srs_wkt (p, 3,
  1450   1450           "7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUTHOR");
  1451   1451       add_srs_wkt (p, 4,
  1452   1452           "ITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1453   1453       add_srs_wkt (p, 5,
  1454   1454           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1455   1455       add_srs_wkt (p, 6,
................................................................................
  1480   1480       add_proj4text (p, 2,
  1481   1481           "0,0 +units=m +no_defs");
  1482   1482       add_srs_wkt (p, 0,
  1483   1483           "PROJCS[\"Katanga 1955 / Katanga Gauss zone C\",GEOGCS[\"");
  1484   1484       add_srs_wkt (p, 1,
  1485   1485           "Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clarke ");
  1486   1486       add_srs_wkt (p, 2,
  1487         -        "1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
         1487  +        "1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
  1488   1488       add_srs_wkt (p, 3,
  1489   1489           "7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUTHOR");
  1490   1490       add_srs_wkt (p, 4,
  1491   1491           "ITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1492   1492       add_srs_wkt (p, 5,
  1493   1493           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1494   1494       add_srs_wkt (p, 6,
................................................................................
  1519   1519       add_proj4text (p, 2,
  1520   1520           "0,0 +units=m +no_defs");
  1521   1521       add_srs_wkt (p, 0,
  1522   1522           "PROJCS[\"Katanga 1955 / Katanga Gauss zone D\",GEOGCS[\"");
  1523   1523       add_srs_wkt (p, 1,
  1524   1524           "Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clarke ");
  1525   1525       add_srs_wkt (p, 2,
  1526         -        "1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
         1526  +        "1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
  1527   1527       add_srs_wkt (p, 3,
  1528   1528           "7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUTHOR");
  1529   1529       add_srs_wkt (p, 4,
  1530   1530           "ITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1531   1531       add_srs_wkt (p, 5,
  1532   1532           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1533   1533       add_srs_wkt (p, 6,
................................................................................
  1560   1560       add_proj4text (p, 3,
  1561   1561           "2,-101,0,0,0,0 +units=us-ft +no_defs");
  1562   1562       add_srs_wkt (p, 0,
  1563   1563           "PROJCS[\"Puerto Rico State Plane CS of 1927\",GEOGCS[\"P");
  1564   1564       add_srs_wkt (p, 1,
  1565   1565           "uerto Rico\",DATUM[\"Puerto_Rico\",SPHEROID[\"Clarke 186");
  1566   1566       add_srs_wkt (p, 2,
  1567         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1567  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1568   1568       add_srs_wkt (p, 3,
  1569   1569           "8\"]],TOWGS84[11,72,-101,0,0,0,0],AUTHORITY[\"EPSG\",\"6");
  1570   1570       add_srs_wkt (p, 4,
  1571   1571           "139\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901");
  1572   1572       add_srs_wkt (p, 5,
  1573   1573           "\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG");
  1574   1574       add_srs_wkt (p, 6,
................................................................................
  1605   1605       add_proj4text (p, 3,
  1606   1606           "66 +towgs84=11,72,-101,0,0,0,0 +units=us-ft +no_defs");
  1607   1607       add_srs_wkt (p, 0,
  1608   1608           "PROJCS[\"Puerto Rico / St. Croix\",GEOGCS[\"Puerto Rico\"");
  1609   1609       add_srs_wkt (p, 1,
  1610   1610           ",DATUM[\"Puerto_Rico\",SPHEROID[\"Clarke 1866\",6378206.");
  1611   1611       add_srs_wkt (p, 2,
  1612         -        "4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS8");
         1612  +        "4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS8");
  1613   1613       add_srs_wkt (p, 3,
  1614   1614           "4[11,72,-101,0,0,0,0],AUTHORITY[\"EPSG\",\"6139\"]],PRIM");
  1615   1615       add_srs_wkt (p, 4,
  1616   1616           "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1617   1617       add_srs_wkt (p, 5,
  1618   1618           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1619   1619       add_srs_wkt (p, 6,
................................................................................
  1926   1926       add_srs_wkt (p, 0,
  1927   1927           "GEOGCS[\"Unknown datum based upon the Clarke 1858 ellips");
  1928   1928       add_srs_wkt (p, 1,
  1929   1929           "oid\",DATUM[\"Not_specified_based_on_Clarke_1858_ellipso");
  1930   1930       add_srs_wkt (p, 2,
  1931   1931           "id\",SPHEROID[\"Clarke 1858\",6378293.645208759,294.2606");
  1932   1932       add_srs_wkt (p, 3,
  1933         -        "763692606,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG");
         1933  +        "763692569,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG");
  1934   1934       add_srs_wkt (p, 4,
  1935   1935           "\",\"6007\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  1936   1936       add_srs_wkt (p, 5,
  1937   1937           "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  1938   1938       add_srs_wkt (p, 6,
  1939   1939           "\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Long");
  1940   1940       add_srs_wkt (p, 7,
................................................................................
  1947   1947       add_proj4text (p, 0,
  1948   1948           "+proj=longlat +ellps=clrk66 +no_defs");
  1949   1949       add_srs_wkt (p, 0,
  1950   1950           "GEOGCS[\"Unknown datum based upon the Clarke 1866 ellips");
  1951   1951       add_srs_wkt (p, 1,
  1952   1952           "oid\",DATUM[\"Not_specified_based_on_Clarke_1866_ellipso");
  1953   1953       add_srs_wkt (p, 2,
  1954         -        "id\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213898");
         1954  +        "id\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213900");
  1955   1955       add_srs_wkt (p, 3,
  1956         -        "2,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"600");
         1956  +        "6,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"600");
  1957   1957       add_srs_wkt (p, 4,
  1958   1958           "8\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
  1959   1959       add_srs_wkt (p, 5,
  1960   1960           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
  1961   1961       add_srs_wkt (p, 6,
  1962   1962           ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
  1963   1963       add_srs_wkt (p, 7,
................................................................................
  1974   1974       add_srs_wkt (p, 0,
  1975   1975           "GEOGCS[\"Unknown datum based upon the Clarke 1866 Michig");
  1976   1976       add_srs_wkt (p, 1,
  1977   1977           "an ellipsoid\",DATUM[\"Not_specified_based_on_Clarke_186");
  1978   1978       add_srs_wkt (p, 2,
  1979   1979           "6_Michigan_ellipsoid\",SPHEROID[\"Clarke 1866 Michigan\"");
  1980   1980       add_srs_wkt (p, 3,
  1981         -        ",6378450.047548896,294.9786971646772,AUTHORITY[\"EPSG\",");
         1981  +        ",6378450.047548896,294.9786971646739,AUTHORITY[\"EPSG\",");
  1982   1982       add_srs_wkt (p, 4,
  1983   1983           "\"7009\"]],AUTHORITY[\"EPSG\",\"6009\"]],PRIMEM[\"Greenw");
  1984   1984       add_srs_wkt (p, 5,
  1985   1985           "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
  1986   1986       add_srs_wkt (p, 6,
  1987   1987           "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
  1988   1988       add_srs_wkt (p, 7,
................................................................................
  1999   1999       add_srs_wkt (p, 0,
  2000   2000           "GEOGCS[\"Unknown datum based upon the Clarke 1880 (Benoi");
  2001   2001       add_srs_wkt (p, 1,
  2002   2002           "t) ellipsoid\",DATUM[\"Not_specified_based_on_Clarke_188");
  2003   2003       add_srs_wkt (p, 2,
  2004   2004           "0_Benoit_ellipsoid\",SPHEROID[\"Clarke 1880 (Benoit)\",6");
  2005   2005       add_srs_wkt (p, 3,
  2006         -        "378300.789,293.4663155389811,AUTHORITY[\"EPSG\",\"7010\"");
         2006  +        "378300.789,293.4663155389802,AUTHORITY[\"EPSG\",\"7010\"");
  2007   2007       add_srs_wkt (p, 4,
  2008   2008           "]],AUTHORITY[\"EPSG\",\"6010\"]],PRIMEM[\"Greenwich\",0,");
  2009   2009       add_srs_wkt (p, 5,
  2010   2010           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2011   2011       add_srs_wkt (p, 6,
  2012   2012           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2013   2013       add_srs_wkt (p, 7,
................................................................................
  2024   2024       add_srs_wkt (p, 0,
  2025   2025           "GEOGCS[\"Unknown datum based upon the Clarke 1880 (IGN) ");
  2026   2026       add_srs_wkt (p, 1,
  2027   2027           "ellipsoid\",DATUM[\"Not_specified_based_on_Clarke_1880_I");
  2028   2028       add_srs_wkt (p, 2,
  2029   2029           "GN_ellipsoid\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,");
  2030   2030       add_srs_wkt (p, 3,
  2031         -        "293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORIT");
         2031  +        "293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORIT");
  2032   2032       add_srs_wkt (p, 4,
  2033   2033           "Y[\"EPSG\",\"6011\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  2034   2034       add_srs_wkt (p, 5,
  2035   2035           "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  2036   2036       add_srs_wkt (p, 6,
  2037   2037           "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  2038   2038       add_srs_wkt (p, 7,
................................................................................
  2112   2112           "]]");
  2113   2113       p = add_epsg_def_ex (filter, first, last, 4015, "epsg", 4015,
  2114   2114           "Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid", 1, 1,
  2115   2115           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2116   2116           "Not_specified_based_on_Everest_1830_1937_Adjustment_ellipsoid", "none", "degree",
  2117   2117           "Latitude", "North", "Longitude", "East");
  2118   2118       add_proj4text (p, 0,
  2119         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +no_de");
         2119  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +no_def");
  2120   2120       add_proj4text (p, 1,
  2121         -        "fs");
         2121  +        "s");
  2122   2122       add_srs_wkt (p, 0,
  2123   2123           "GEOGCS[\"Unknown datum based upon the Everest 1830 (1937");
  2124   2124       add_srs_wkt (p, 1,
  2125   2125           " Adjustment) ellipsoid\",DATUM[\"Not_specified_based_on_");
  2126   2126       add_srs_wkt (p, 2,
  2127   2127           "Everest_1830_1937_Adjustment_ellipsoid\",SPHEROID[\"Ever");
  2128   2128       add_srs_wkt (p, 3,
................................................................................
  2414   2414           "ORITY[\"EPSG\",\"4027\"]]");
  2415   2415       p = add_epsg_def_ex (filter, first, last, 4028, "epsg", 4028,
  2416   2416           "Unknown datum based upon the Struve 1860 ellipsoid", 1, 1,
  2417   2417           "Struve 1860", "Greenwich",
  2418   2418           "Not_specified_based_on_Struve_1860_ellipsoid", "none", "degree",
  2419   2419           "Latitude", "North", "Longitude", "East");
  2420   2420       add_proj4text (p, 0,
  2421         -        "+proj=longlat +a=6378298.3 +b=6356657.142669562 +no_defs");
         2421  +        "+proj=longlat +a=6378298.3 +b=6356657.142669561 +no_defs");
  2422   2422       add_srs_wkt (p, 0,
  2423   2423           "GEOGCS[\"Unknown datum based upon the Struve 1860 ellips");
  2424   2424       add_srs_wkt (p, 1,
  2425   2425           "oid\",DATUM[\"Not_specified_based_on_Struve_1860_ellipso");
  2426   2426       add_srs_wkt (p, 2,
  2427   2427           "id\",SPHEROID[\"Struve 1860\",6378298.3,294.73,AUTHORITY");
  2428   2428       add_srs_wkt (p, 3,
................................................................................
  2562   2562       add_srs_wkt (p, 0,
  2563   2563           "GEOGCS[\"Unknown datum based upon the Clarke 1880 ellips");
  2564   2564       add_srs_wkt (p, 1,
  2565   2565           "oid\",DATUM[\"Not_specified_based_on_Clarke_1880_ellipso");
  2566   2566       add_srs_wkt (p, 2,
  2567   2567           "id\",SPHEROID[\"Clarke 1880\",6378249.144808011,293.4663");
  2568   2568       add_srs_wkt (p, 3,
  2569         -        "076556365,AUTHORITY[\"EPSG\",\"7034\"]],AUTHORITY[\"EPSG");
         2569  +        "076556349,AUTHORITY[\"EPSG\",\"7034\"]],AUTHORITY[\"EPSG");
  2570   2570       add_srs_wkt (p, 4,
  2571   2571           "\",\"6034\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  2572   2572       add_srs_wkt (p, 5,
  2573   2573           "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  2574   2574       add_srs_wkt (p, 6,
  2575   2575           "\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Long");
  2576   2576       add_srs_wkt (p, 7,
................................................................................
  2722   2722       add_srs_wkt (p, 0,
  2723   2723           "GEOGCS[\"Unknown datum based upon the Everest (1830 Defi");
  2724   2724       add_srs_wkt (p, 1,
  2725   2725           "nition) ellipsoid\",DATUM[\"Not_specified_based_on_Evere");
  2726   2726       add_srs_wkt (p, 2,
  2727   2727           "st_1830_Definition_ellipsoid\",SPHEROID[\"Everest (1830 ");
  2728   2728       add_srs_wkt (p, 3,
  2729         -        "Definition)\",6377299.36559538,300.8017255433549,AUTHORI");
         2729  +        "Definition)\",6377299.36559538,300.8017255433552,AUTHORI");
  2730   2730       add_srs_wkt (p, 4,
  2731   2731           "TY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6042\"]],PRI");
  2732   2732       add_srs_wkt (p, 5,
  2733   2733           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  2734   2734       add_srs_wkt (p, 6,
  2735   2735           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  2736   2736       add_srs_wkt (p, 7,
................................................................................
  2762   2762           "43\"]]");
  2763   2763       p = add_epsg_def_ex (filter, first, last, 4044, "epsg", 4044,
  2764   2764           "Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid", 1, 1,
  2765   2765           "Everest 1830 (1962 Definition)", "Greenwich",
  2766   2766           "Not_specified_based_on_Everest_1830_1962_Definition_ellipsoid", "none", "degree",
  2767   2767           "Latitude", "North", "Longitude", "East");
  2768   2768       add_proj4text (p, 0,
  2769         -        "+proj=longlat +a=6377301.243 +b=6356100.230165385 +no_de");
         2769  +        "+proj=longlat +a=6377301.243 +b=6356100.230165384 +no_de");
  2770   2770       add_proj4text (p, 1,
  2771   2771           "fs");
  2772   2772       add_srs_wkt (p, 0,
  2773   2773           "GEOGCS[\"Unknown datum based upon the Everest 1830 (1962");
  2774   2774       add_srs_wkt (p, 1,
  2775   2775           " Definition) ellipsoid\",DATUM[\"Not_specified_based_on_");
  2776   2776       add_srs_wkt (p, 2,
................................................................................
  3074   3074       add_srs_wkt (p, 0,
  3075   3075           "GEOGCS[\"Unspecified datum based upon the Hughes 1980 el");
  3076   3076       add_srs_wkt (p, 1,
  3077   3077           "lipsoid\",DATUM[\"Not_specified_based_on_Hughes_1980_ell");
  3078   3078       add_srs_wkt (p, 2,
  3079   3079           "ipsoid\",SPHEROID[\"Hughes 1980\",6378273,298.2794111230");
  3080   3080       add_srs_wkt (p, 3,
  3081         -        "64,AUTHORITY[\"EPSG\",\"7058\"]],AUTHORITY[\"EPSG\",\"60");
         3081  +        "61,AUTHORITY[\"EPSG\",\"7058\"]],AUTHORITY[\"EPSG\",\"60");
  3082   3082       add_srs_wkt (p, 4,
  3083   3083           "54\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
  3084   3084       add_srs_wkt (p, 5,
  3085   3085           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
  3086   3086       add_srs_wkt (p, 6,
  3087   3087           ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
  3088   3088       add_srs_wkt (p, 7,

Changes to src/srsinit/epsg_inlined_19.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   913    913       add_proj4text (p, 0,
   914    914           "+proj=longlat +ellps=clrk66 +towgs84=-73.472,-51.66,-112");
   915    915       add_proj4text (p, 1,
   916    916           ".482,0.953,4.6,-2.368,0.586 +no_defs");
   917    917       add_srs_wkt (p, 0,
   918    918           "GEOGCS[\"Tete\",DATUM[\"Tete\",SPHEROID[\"Clarke 1866\",");
   919    919       add_srs_wkt (p, 1,
   920         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          920  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   921    921       add_srs_wkt (p, 2,
   922    922           "],TOWGS84[-73.472,-51.66,-112.482,0.953,4.6,-2.368,0.586");
   923    923       add_srs_wkt (p, 3,
   924    924           "],AUTHORITY[\"EPSG\",\"6127\"]],PRIMEM[\"Greenwich\",0,A");
   925    925       add_srs_wkt (p, 4,
   926    926           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   927    927       add_srs_wkt (p, 5,
................................................................................
   936    936           "Madzansua", "none", "degree",
   937    937           "Latitude", "North", "Longitude", "East");
   938    938       add_proj4text (p, 0,
   939    939           "+proj=longlat +ellps=clrk66 +no_defs");
   940    940       add_srs_wkt (p, 0,
   941    941           "GEOGCS[\"Madzansua\",DATUM[\"Madzansua\",SPHEROID[\"Clar");
   942    942       add_srs_wkt (p, 1,
   943         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          943  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   944    944       add_srs_wkt (p, 2,
   945    945           ",\"7008\"]],AUTHORITY[\"EPSG\",\"6128\"]],PRIMEM[\"Green");
   946    946       add_srs_wkt (p, 3,
   947    947           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   948    948       add_srs_wkt (p, 4,
   949    949           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   950    950       add_srs_wkt (p, 5,
................................................................................
   957    957           "Observatario", "none", "degree",
   958    958           "Latitude", "North", "Longitude", "East");
   959    959       add_proj4text (p, 0,
   960    960           "+proj=longlat +ellps=clrk66 +no_defs");
   961    961       add_srs_wkt (p, 0,
   962    962           "GEOGCS[\"Observatario\",DATUM[\"Observatario\",SPHEROID[");
   963    963       add_srs_wkt (p, 1,
   964         -        "\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
          964  +        "\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
   965    965       add_srs_wkt (p, 2,
   966    966           "EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6129\"]],PRIMEM[\"");
   967    967       add_srs_wkt (p, 3,
   968    968           "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
   969    969       add_srs_wkt (p, 4,
   970    970           "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
   971    971       add_srs_wkt (p, 5,
................................................................................
   974    974           "[\"EPSG\",\"4129\"]]");
   975    975       p = add_epsg_def_ex (filter, first, last, 4130, "epsg", 4130,
   976    976           "Moznet", 1, 1,
   977    977           "WGS 84", "Greenwich",
   978    978           "Moznet_ITRF94", "none", "degree",
   979    979           "Latitude", "North", "Longitude", "East");
   980    980       add_proj4text (p, 0,
   981         -        "+proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_de");
          981  +        "+proj=longlat +ellps=WGS84 +towgs84=0,0,0,-0,-0,-0,0 +no");
   982    982       add_proj4text (p, 1,
   983         -        "fs");
          983  +        "_defs");
   984    984       add_srs_wkt (p, 0,
   985    985           "GEOGCS[\"Moznet\",DATUM[\"Moznet_ITRF94\",SPHEROID[\"WGS");
   986    986       add_srs_wkt (p, 1,
   987    987           " 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]");
   988    988       add_srs_wkt (p, 2,
   989         -        "],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6130\"]],P");
          989  +        "],TOWGS84[0,0,0,-0,-0,-0,0],AUTHORITY[\"EPSG\",\"6130\"]");
   990    990       add_srs_wkt (p, 3,
   991         -        "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
          991  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
   992    992       add_srs_wkt (p, 4,
   993         -        "[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122");
          993  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
   994    994       add_srs_wkt (p, 5,
   995         -        "\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],A");
          995  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
   996    996       add_srs_wkt (p, 6,
   997         -        "UTHORITY[\"EPSG\",\"4130\"]]");
          997  +        "],AUTHORITY[\"EPSG\",\"4130\"]]");
   998    998       p = add_epsg_def_ex (filter, first, last, 4131, "epsg", 4131,
   999    999           "Indian 1960", 1, 1,
  1000   1000           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1001   1001           "Indian_1960", "none", "degree",
  1002   1002           "Latitude", "North", "Longitude", "East");
  1003   1003       add_proj4text (p, 0,
  1004         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
         1004  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
  1005   1005       add_proj4text (p, 1,
  1006         -        "84=198,881,317,0,0,0,0 +no_defs");
         1006  +        "4=198,881,317,0,0,0,0 +no_defs");
  1007   1007       add_srs_wkt (p, 0,
  1008   1008           "GEOGCS[\"Indian 1960\",DATUM[\"Indian_1960\",SPHEROID[\"");
  1009   1009       add_srs_wkt (p, 1,
  1010   1010           "Everest 1830 (1937 Adjustment)\",6377276.345,300.8017,AU");
  1011   1011       add_srs_wkt (p, 2,
  1012   1012           "THORITY[\"EPSG\",\"7015\"]],TOWGS84[198,881,317,0,0,0,0]");
  1013   1013       add_srs_wkt (p, 3,
................................................................................
  1072   1072           "PSD93", 1, 1,
  1073   1073           "Clarke 1880 (RGS)", "Greenwich",
  1074   1074           "PDO_Survey_Datum_1993", "none", "degree",
  1075   1075           "Latitude", "North", "Longitude", "East");
  1076   1076       add_proj4text (p, 0,
  1077   1077           "+proj=longlat +ellps=clrk80 +towgs84=-180.624,-225.516,1");
  1078   1078       add_proj4text (p, 1,
  1079         -        "73.919,-0.81,-1.898,8.336,16.71006 +no_defs");
         1079  +        "73.919,-0.81,-1.898,8.336,16.7101 +no_defs");
  1080   1080       add_srs_wkt (p, 0,
  1081   1081           "GEOGCS[\"PSD93\",DATUM[\"PDO_Survey_Datum_1993\",SPHEROI");
  1082   1082       add_srs_wkt (p, 1,
  1083   1083           "D[\"Clarke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"");
  1084   1084       add_srs_wkt (p, 2,
  1085   1085           "EPSG\",\"7012\"]],TOWGS84[-180.624,-225.516,173.919,-0.8");
  1086   1086       add_srs_wkt (p, 3,
  1087         -        "1,-1.898,8.336,16.71006],AUTHORITY[\"EPSG\",\"6134\"]],P");
         1087  +        "1,-1.898,8.336,16.7101],AUTHORITY[\"EPSG\",\"6134\"]],PR");
  1088   1088       add_srs_wkt (p, 4,
  1089         -        "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
         1089  +        "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
  1090   1090       add_srs_wkt (p, 5,
  1091         -        "[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122");
         1091  +        "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
  1092   1092       add_srs_wkt (p, 6,
  1093         -        "\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],A");
         1093  +        "]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUT");
  1094   1094       add_srs_wkt (p, 7,
  1095         -        "UTHORITY[\"EPSG\",\"4134\"]]");
         1095  +        "HORITY[\"EPSG\",\"4134\"]]");
  1096   1096       p = add_epsg_def_ex (filter, first, last, 4135, "epsg", 4135,
  1097   1097           "Old Hawaiian", 1, 1,
  1098   1098           "Clarke 1866", "Greenwich",
  1099   1099           "Old_Hawaiian", "none", "degree",
  1100   1100           "Latitude", "North", "Longitude", "East");
  1101   1101       add_proj4text (p, 0,
  1102   1102           "+proj=longlat +ellps=clrk66 +towgs84=61,-285,-181,0,0,0,");
  1103   1103       add_proj4text (p, 1,
  1104   1104           "0 +no_defs");
  1105   1105       add_srs_wkt (p, 0,
  1106   1106           "GEOGCS[\"Old Hawaiian\",DATUM[\"Old_Hawaiian\",SPHEROID[");
  1107   1107       add_srs_wkt (p, 1,
  1108         -        "\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         1108  +        "\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  1109   1109       add_srs_wkt (p, 2,
  1110   1110           "EPSG\",\"7008\"]],TOWGS84[61,-285,-181,0,0,0,0],AUTHORIT");
  1111   1111       add_srs_wkt (p, 3,
  1112   1112           "Y[\"EPSG\",\"6135\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  1113   1113       add_srs_wkt (p, 4,
  1114   1114           "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  1115   1115       add_srs_wkt (p, 5,
................................................................................
  1122   1122           "St_Lawrence_Island", "none", "degree",
  1123   1123           "Latitude", "North", "Longitude", "East");
  1124   1124       add_proj4text (p, 0,
  1125   1125           "+proj=longlat +ellps=clrk66 +no_defs");
  1126   1126       add_srs_wkt (p, 0,
  1127   1127           "GEOGCS[\"St. Lawrence Island\",DATUM[\"St_Lawrence_Islan");
  1128   1128       add_srs_wkt (p, 1,
  1129         -        "d\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982");
         1129  +        "d\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139006");
  1130   1130       add_srs_wkt (p, 2,
  1131   1131           ",AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6136");
  1132   1132       add_srs_wkt (p, 3,
  1133   1133           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
  1134   1134       add_srs_wkt (p, 4,
  1135   1135           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
  1136   1136       add_srs_wkt (p, 5,
................................................................................
  1143   1143           "St_Paul_Island", "none", "degree",
  1144   1144           "Latitude", "North", "Longitude", "East");
  1145   1145       add_proj4text (p, 0,
  1146   1146           "+proj=longlat +ellps=clrk66 +no_defs");
  1147   1147       add_srs_wkt (p, 0,
  1148   1148           "GEOGCS[\"St. Paul Island\",DATUM[\"St_Paul_Island\",SPHE");
  1149   1149       add_srs_wkt (p, 1,
  1150         -        "ROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORI");
         1150  +        "ROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORI");
  1151   1151       add_srs_wkt (p, 2,
  1152   1152           "TY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6137\"]],PRI");
  1153   1153       add_srs_wkt (p, 3,
  1154   1154           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1155   1155       add_srs_wkt (p, 4,
  1156   1156           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1157   1157       add_srs_wkt (p, 5,
................................................................................
  1164   1164           "St_George_Island", "none", "degree",
  1165   1165           "Latitude", "North", "Longitude", "East");
  1166   1166       add_proj4text (p, 0,
  1167   1167           "+proj=longlat +ellps=clrk66 +no_defs");
  1168   1168       add_srs_wkt (p, 0,
  1169   1169           "GEOGCS[\"St. George Island\",DATUM[\"St_George_Island\",");
  1170   1170       add_srs_wkt (p, 1,
  1171         -        "SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUT");
         1171  +        "SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUT");
  1172   1172       add_srs_wkt (p, 2,
  1173   1173           "HORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6138\"]]");
  1174   1174       add_srs_wkt (p, 3,
  1175   1175           ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
  1176   1176       add_srs_wkt (p, 4,
  1177   1177           "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
  1178   1178       add_srs_wkt (p, 5,
................................................................................
  1187   1187       add_proj4text (p, 0,
  1188   1188           "+proj=longlat +ellps=clrk66 +towgs84=11,72,-101,0,0,0,0 ");
  1189   1189       add_proj4text (p, 1,
  1190   1190           "+no_defs");
  1191   1191       add_srs_wkt (p, 0,
  1192   1192           "GEOGCS[\"Puerto Rico\",DATUM[\"Puerto_Rico\",SPHEROID[\"");
  1193   1193       add_srs_wkt (p, 1,
  1194         -        "Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EP");
         1194  +        "Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EP");
  1195   1195       add_srs_wkt (p, 2,
  1196   1196           "SG\",\"7008\"]],TOWGS84[11,72,-101,0,0,0,0],AUTHORITY[\"");
  1197   1197       add_srs_wkt (p, 3,
  1198   1198           "EPSG\",\"6139\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  1199   1199       add_srs_wkt (p, 4,
  1200   1200           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  1201   1201       add_srs_wkt (p, 5,
................................................................................
  1298   1298           "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4143\"]]");
  1299   1299       p = add_epsg_def_ex (filter, first, last, 4144, "epsg", 4144,
  1300   1300           "Kalianpur 1937", 1, 1,
  1301   1301           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1302   1302           "Kalianpur_1937", "none", "degree",
  1303   1303           "Latitude", "North", "Longitude", "East");
  1304   1304       add_proj4text (p, 0,
  1305         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
         1305  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
  1306   1306       add_proj4text (p, 1,
  1307         -        "84=214,804,268,0,0,0,0 +no_defs");
         1307  +        "4=214,804,268,0,0,0,0 +no_defs");
  1308   1308       add_srs_wkt (p, 0,
  1309   1309           "GEOGCS[\"Kalianpur 1937\",DATUM[\"Kalianpur_1937\",SPHER");
  1310   1310       add_srs_wkt (p, 1,
  1311   1311           "OID[\"Everest 1830 (1937 Adjustment)\",6377276.345,300.8");
  1312   1312       add_srs_wkt (p, 2,
  1313   1313           "017,AUTHORITY[\"EPSG\",\"7015\"]],TOWGS84[214,804,268,0,");
  1314   1314       add_srs_wkt (p, 3,
................................................................................
  1323   1323           "4144\"]]");
  1324   1324       p = add_epsg_def_ex (filter, first, last, 4145, "epsg", 4145,
  1325   1325           "Kalianpur 1962", 1, 1,
  1326   1326           "Everest 1830 (1962 Definition)", "Greenwich",
  1327   1327           "Kalianpur_1962", "none", "degree",
  1328   1328           "Latitude", "North", "Longitude", "East");
  1329   1329       add_proj4text (p, 0,
  1330         -        "+proj=longlat +a=6377301.243 +b=6356100.230165385 +towgs");
         1330  +        "+proj=longlat +a=6377301.243 +b=6356100.230165384 +towgs");
  1331   1331       add_proj4text (p, 1,
  1332   1332           "84=283,682,231,0,0,0,0 +no_defs");
  1333   1333       add_srs_wkt (p, 0,
  1334   1334           "GEOGCS[\"Kalianpur 1962\",DATUM[\"Kalianpur_1962\",SPHER");
  1335   1335       add_srs_wkt (p, 1,
  1336   1336           "OID[\"Everest 1830 (1962 Definition)\",6377301.243,300.8");
  1337   1337       add_srs_wkt (p, 2,
................................................................................
  1565   1565       add_proj4text (p, 0,
  1566   1566           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-83,37,12");
  1567   1567       add_proj4text (p, 1,
  1568   1568           "4,0,0,0,0 +no_defs");
  1569   1569       add_srs_wkt (p, 0,
  1570   1570           "GEOGCS[\"Dabola 1981\",DATUM[\"Dabola_1981\",SPHEROID[\"");
  1571   1571       add_srs_wkt (p, 1,
  1572         -        "Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORIT");
         1572  +        "Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORIT");
  1573   1573       add_srs_wkt (p, 2,
  1574   1574           "Y[\"EPSG\",\"7011\"]],TOWGS84[-83,37,124,0,0,0,0],AUTHOR");
  1575   1575       add_srs_wkt (p, 3,
  1576   1576           "ITY[\"EPSG\",\"6155\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1577   1577       add_srs_wkt (p, 4,
  1578   1578           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1579   1579       add_srs_wkt (p, 5,
................................................................................
  1613   1613       add_proj4text (p, 0,
  1614   1614           "+proj=longlat +a=6378293.645208759 +b=6356617.987679838 ");
  1615   1615       add_proj4text (p, 1,
  1616   1616           "+no_defs");
  1617   1617       add_srs_wkt (p, 0,
  1618   1618           "GEOGCS[\"Mount Dillon\",DATUM[\"Mount_Dillon\",SPHEROID[");
  1619   1619       add_srs_wkt (p, 1,
  1620         -        "\"Clarke 1858\",6378293.645208759,294.2606763692606,AUTH");
         1620  +        "\"Clarke 1858\",6378293.645208759,294.2606763692569,AUTH");
  1621   1621       add_srs_wkt (p, 2,
  1622   1622           "ORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"6157\"]],");
  1623   1623       add_srs_wkt (p, 3,
  1624   1624           "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
  1625   1625       add_srs_wkt (p, 4,
  1626   1626           "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
  1627   1627       add_srs_wkt (p, 5,
................................................................................
  1653   1653           "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4158\"]]");
  1654   1654       p = add_epsg_def_ex (filter, first, last, 4159, "epsg", 4159,
  1655   1655           "ELD79", 1, 1,
  1656   1656           "International 1924", "Greenwich",
  1657   1657           "European_Libyan_Datum_1979", "none", "degree",
  1658   1658           "Latitude", "North", "Longitude", "East");
  1659   1659       add_proj4text (p, 0,
  1660         -        "+proj=longlat +ellps=intl +towgs84=-115.8543,-99.0583,-1");
         1660  +        "+proj=longlat +ellps=intl +towgs84=-115.854,-99.0583,-15");
  1661   1661       add_proj4text (p, 1,
  1662         -        "52.4616,0,0,0,0 +no_defs");
         1662  +        "2.462,0,0,0,0 +no_defs");
  1663   1663       add_srs_wkt (p, 0,
  1664   1664           "GEOGCS[\"ELD79\",DATUM[\"European_Libyan_Datum_1979\",SP");
  1665   1665       add_srs_wkt (p, 1,
  1666   1666           "HEROID[\"International 1924\",6378388,297,AUTHORITY[\"EP");
  1667   1667       add_srs_wkt (p, 2,
  1668         -        "SG\",\"7022\"]],TOWGS84[-115.8543,-99.0583,-152.4616,0,0");
         1668  +        "SG\",\"7022\"]],TOWGS84[-115.854,-99.0583,-152.462,0,0,0");
  1669   1669       add_srs_wkt (p, 3,
  1670         -        ",0,0],AUTHORITY[\"EPSG\",\"6159\"]],PRIMEM[\"Greenwich\"");
         1670  +        ",0],AUTHORITY[\"EPSG\",\"6159\"]],PRIMEM[\"Greenwich\",0");
  1671   1671       add_srs_wkt (p, 4,
  1672         -        ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
         1672  +        ",AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532");
  1673   1673       add_srs_wkt (p, 5,
  1674         -        "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
         1674  +        "925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  1675   1675       add_srs_wkt (p, 6,
  1676         -        "e\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
         1676  +        ",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"41");
  1677   1677       add_srs_wkt (p, 7,
  1678         -        "4159\"]]");
         1678  +        "59\"]]");
  1679   1679       p = add_epsg_def_ex (filter, first, last, 4160, "epsg", 4160,
  1680   1680           "Chos Malal 1914", 1, 1,
  1681   1681           "International 1924", "Greenwich",
  1682   1682           "Chos_Malal_1914", "none", "degree",
  1683   1683           "Latitude", "North", "Longitude", "East");
  1684   1684       add_proj4text (p, 0,
  1685   1685           "+proj=longlat +ellps=intl +no_defs");
................................................................................
  1887   1887       add_proj4text (p, 0,
  1888   1888           "+proj=longlat +ellps=clrk66 +towgs84=-115,118,426,0,0,0,");
  1889   1889       add_proj4text (p, 1,
  1890   1890           "0 +no_defs");
  1891   1891       add_srs_wkt (p, 0,
  1892   1892           "GEOGCS[\"American Samoa 1962\",DATUM[\"American_Samoa_19");
  1893   1893       add_srs_wkt (p, 1,
  1894         -        "62\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213898");
         1894  +        "62\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213900");
  1895   1895       add_srs_wkt (p, 2,
  1896         -        "2,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-115,118,426,0,0");
         1896  +        "6,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-115,118,426,0,0");
  1897   1897       add_srs_wkt (p, 3,
  1898   1898           ",0,0],AUTHORITY[\"EPSG\",\"6169\"]],PRIMEM[\"Greenwich\"");
  1899   1899       add_srs_wkt (p, 4,
  1900   1900           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1901   1901       add_srs_wkt (p, 5,
  1902   1902           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1903   1903       add_srs_wkt (p, 6,
................................................................................
  2140   2140           "UTHORITY[\"EPSG\",\"4180\"]]");
  2141   2141       p = add_epsg_def_ex (filter, first, last, 4181, "epsg", 4181,
  2142   2142           "Luxembourg 1930", 1, 1,
  2143   2143           "International 1924", "Greenwich",
  2144   2144           "Luxembourg_1930", "none", "degree",
  2145   2145           "Latitude", "North", "Longitude", "East");
  2146   2146       add_proj4text (p, 0,
  2147         -        "+proj=longlat +ellps=intl +towgs84=-189.6806,18.3463,-42");
         2147  +        "+proj=longlat +ellps=intl +towgs84=-189.681,18.3463,-42.");
  2148   2148       add_proj4text (p, 1,
  2149         -        ".7695,-0.33746,-3.09264,2.53861,0.4598 +no_defs");
         2149  +        "7695,-0.33746,-3.09264,2.53861,0.4598 +no_defs");
  2150   2150       add_srs_wkt (p, 0,
  2151   2151           "GEOGCS[\"Luxembourg 1930\",DATUM[\"Luxembourg_1930\",SPH");
  2152   2152       add_srs_wkt (p, 1,
  2153   2153           "EROID[\"International 1924\",6378388,297,AUTHORITY[\"EPS");
  2154   2154       add_srs_wkt (p, 2,
  2155         -        "G\",\"7022\"]],TOWGS84[-189.6806,18.3463,-42.7695,-0.337");
         2155  +        "G\",\"7022\"]],TOWGS84[-189.681,18.3463,-42.7695,-0.3374");
  2156   2156       add_srs_wkt (p, 3,
  2157         -        "46,-3.09264,2.53861,0.4598],AUTHORITY[\"EPSG\",\"6181\"]");
         2157  +        "6,-3.09264,2.53861,0.4598],AUTHORITY[\"EPSG\",\"6181\"]]");
  2158   2158       add_srs_wkt (p, 4,
  2159         -        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
         2159  +        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
  2160   2160       add_srs_wkt (p, 5,
  2161         -        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
         2161  +        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
  2162   2162       add_srs_wkt (p, 6,
  2163         -        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
         2163  +        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
  2164   2164       add_srs_wkt (p, 7,
  2165         -        "],AUTHORITY[\"EPSG\",\"4181\"]]");
         2165  +        ",AUTHORITY[\"EPSG\",\"4181\"]]");
  2166   2166       p = add_epsg_def_ex (filter, first, last, 4182, "epsg", 4182,
  2167   2167           "Azores Occidental 1939", 1, 1,
  2168   2168           "International 1924", "Greenwich",
  2169   2169           "Azores_Occidental_Islands_1939", "none", "degree",
  2170   2170           "Latitude", "North", "Longitude", "East");
  2171   2171       add_proj4text (p, 0,
  2172   2172           "+proj=longlat +ellps=intl +towgs84=-425,-169,81,0,0,0,0 ");
................................................................................
  2384   2384       add_proj4text (p, 0,
  2385   2385           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-70.9,-15");
  2386   2386       add_proj4text (p, 1,
  2387   2387           "1.8,-41.4,0,0,0,0 +no_defs");
  2388   2388       add_srs_wkt (p, 0,
  2389   2389           "GEOGCS[\"Manoca 1962\",DATUM[\"Manoca_1962\",SPHEROID[\"");
  2390   2390       add_srs_wkt (p, 1,
  2391         -        "Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORIT");
         2391  +        "Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORIT");
  2392   2392       add_srs_wkt (p, 2,
  2393   2393           "Y[\"EPSG\",\"7011\"]],TOWGS84[-70.9,-151.8,-41.4,0,0,0,0");
  2394   2394       add_srs_wkt (p, 3,
  2395   2395           "],AUTHORITY[\"EPSG\",\"6193\"]],PRIMEM[\"Greenwich\",0,A");
  2396   2396       add_srs_wkt (p, 4,
  2397   2397           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2398   2398       add_srs_wkt (p, 5,
................................................................................
  2539   2539           "Pulkovo 1995", 1, 1,
  2540   2540           "Krassowsky 1940", "Greenwich",
  2541   2541           "Pulkovo_1995", "none", "degree",
  2542   2542           "Latitude", "North", "Longitude", "East");
  2543   2543       add_proj4text (p, 0,
  2544   2544           "+proj=longlat +ellps=krass +towgs84=24.47,-130.89,-81.56");
  2545   2545       add_proj4text (p, 1,
  2546         -        ",0,0,0.13,-0.22 +no_defs");
         2546  +        ",-0,-0,0.13,-0.22 +no_defs");
  2547   2547       add_srs_wkt (p, 0,
  2548   2548           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  2549   2549       add_srs_wkt (p, 1,
  2550   2550           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  2551   2551       add_srs_wkt (p, 2,
  2552         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         2552  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  2553   2553       add_srs_wkt (p, 3,
  2554         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         2554  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2555   2555       add_srs_wkt (p, 4,
  2556         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         2556  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2557   2557       add_srs_wkt (p, 5,
  2558         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         2558  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2559   2559       add_srs_wkt (p, 6,
  2560         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         2560  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         2561  +    add_srs_wkt (p, 7,
         2562  +        "]]");
  2561   2563       p = add_epsg_def_ex (filter, first, last, 4201, "epsg", 4201,
  2562   2564           "Adindan", 1, 1,
  2563   2565           "Clarke 1880 (RGS)", "Greenwich",
  2564   2566           "Adindan", "none", "degree",
  2565   2567           "Latitude", "North", "Longitude", "East");
  2566   2568       add_proj4text (p, 0,
  2567   2569           "+proj=longlat +ellps=clrk80 +towgs84=-166,-15,204,0,0,0,");

Changes to src/srsinit/epsg_inlined_20.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    60     60           "Agadez", "none", "degree",
    61     61           "Latitude", "North", "Longitude", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
    64     64       add_srs_wkt (p, 0,
    65     65           "GEOGCS[\"Agadez\",DATUM[\"Agadez\",SPHEROID[\"Clarke 188");
    66     66       add_srs_wkt (p, 1,
    67         -        "0 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
           67  +        "0 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
    68     68       add_srs_wkt (p, 2,
    69     69           ",\"7011\"]],AUTHORITY[\"EPSG\",\"6206\"]],PRIMEM[\"Green");
    70     70       add_srs_wkt (p, 3,
    71     71           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
    72     72       add_srs_wkt (p, 4,
    73     73           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
    74     74       add_srs_wkt (p, 5,
................................................................................
   223    223       add_proj4text (p, 0,
   224    224           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-106,-87,");
   225    225       add_proj4text (p, 1,
   226    226           "188,0,0,0,0 +no_defs");
   227    227       add_srs_wkt (p, 0,
   228    228           "GEOGCS[\"Beduaram\",DATUM[\"Beduaram\",SPHEROID[\"Clarke");
   229    229       add_srs_wkt (p, 1,
   230         -        " 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EP");
          230  +        " 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EP");
   231    231       add_srs_wkt (p, 2,
   232    232           "SG\",\"7011\"]],TOWGS84[-106,-87,188,0,0,0,0],AUTHORITY[");
   233    233       add_srs_wkt (p, 3,
   234    234           "\"EPSG\",\"6213\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
   235    235       add_srs_wkt (p, 4,
   236    236           "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
   237    237       add_srs_wkt (p, 5,
................................................................................
   290    290       add_proj4text (p, 0,
   291    291           "+proj=longlat +ellps=clrk66 +towgs84=-73,213,296,0,0,0,0");
   292    292       add_proj4text (p, 1,
   293    293           " +no_defs");
   294    294       add_srs_wkt (p, 0,
   295    295           "GEOGCS[\"Bermuda 1957\",DATUM[\"Bermuda_1957\",SPHEROID[");
   296    296       add_srs_wkt (p, 1,
   297         -        "\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
          297  +        "\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
   298    298       add_srs_wkt (p, 2,
   299    299           "EPSG\",\"7008\"]],TOWGS84[-73,213,296,0,0,0,0],AUTHORITY");
   300    300       add_srs_wkt (p, 3,
   301    301           "[\"EPSG\",\"6216\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
   302    302       add_srs_wkt (p, 4,
   303    303           "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
   304    304       add_srs_wkt (p, 5,
................................................................................
   467    467       add_proj4text (p, 0,
   468    468           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-263,6,43");
   469    469       add_proj4text (p, 1,
   470    470           "1,0,0,0,0 +no_defs");
   471    471       add_srs_wkt (p, 0,
   472    472           "GEOGCS[\"Carthage\",DATUM[\"Carthage\",SPHEROID[\"Clarke");
   473    473       add_srs_wkt (p, 1,
   474         -        " 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EP");
          474  +        " 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EP");
   475    475       add_srs_wkt (p, 2,
   476    476           "SG\",\"7011\"]],TOWGS84[-263,6,431,0,0,0,0],AUTHORITY[\"");
   477    477       add_srs_wkt (p, 3,
   478    478           "EPSG\",\"6223\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
   479    479       add_srs_wkt (p, 4,
   480    480           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
   481    481       add_srs_wkt (p, 5,
................................................................................
   536    536           "Cote_d_Ivoire", "none", "degree",
   537    537           "Latitude", "North", "Longitude", "East");
   538    538       add_proj4text (p, 0,
   539    539           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
   540    540       add_srs_wkt (p, 0,
   541    541           "GEOGCS[\"Cote d'Ivoire\",DATUM[\"Cote_d_Ivoire\",SPHEROI");
   542    542       add_srs_wkt (p, 1,
   543         -        "D[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTH");
          543  +        "D[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTH");
   544    544       add_srs_wkt (p, 2,
   545    545           "ORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\",\"6226\"]],");
   546    546       add_srs_wkt (p, 3,
   547    547           "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   548    548       add_srs_wkt (p, 4,
   549    549           "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"910");
   550    550       add_srs_wkt (p, 5,
................................................................................
   559    559       add_proj4text (p, 0,
   560    560           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-190.421,");
   561    561       add_proj4text (p, 1,
   562    562           "8.532,238.69,0,0,0,0 +no_defs");
   563    563       add_srs_wkt (p, 0,
   564    564           "GEOGCS[\"Deir ez Zor\",DATUM[\"Deir_ez_Zor\",SPHEROID[\"");
   565    565       add_srs_wkt (p, 1,
   566         -        "Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORIT");
          566  +        "Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORIT");
   567    567       add_srs_wkt (p, 2,
   568    568           "Y[\"EPSG\",\"7011\"]],TOWGS84[-190.421,8.532,238.69,0,0,");
   569    569       add_srs_wkt (p, 3,
   570    570           "0,0],AUTHORITY[\"EPSG\",\"6227\"]],PRIMEM[\"Greenwich\",");
   571    571       add_srs_wkt (p, 4,
   572    572           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
   573    573       add_srs_wkt (p, 5,
................................................................................
   582    582           "Douala", "none", "degree",
   583    583           "Latitude", "North", "Longitude", "East");
   584    584       add_proj4text (p, 0,
   585    585           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
   586    586       add_srs_wkt (p, 0,
   587    587           "GEOGCS[\"Douala\",DATUM[\"Douala\",SPHEROID[\"Clarke 188");
   588    588       add_srs_wkt (p, 1,
   589         -        "0 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
          589  +        "0 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
   590    590       add_srs_wkt (p, 2,
   591    591           ",\"7011\"]],AUTHORITY[\"EPSG\",\"6228\"]],PRIMEM[\"Green");
   592    592       add_srs_wkt (p, 3,
   593    593           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   594    594       add_srs_wkt (p, 4,
   595    595           ".0174532925199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"L");
   596    596       add_srs_wkt (p, 5,
................................................................................
   647    647           "ED87", 1, 1,
   648    648           "International 1924", "Greenwich",
   649    649           "European_Datum_1987", "none", "degree",
   650    650           "Latitude", "North", "Longitude", "East");
   651    651       add_proj4text (p, 0,
   652    652           "+proj=longlat +ellps=intl +towgs84=-83.11,-97.38,-117.22");
   653    653       add_proj4text (p, 1,
   654         -        ",0.00569290865241986,-0.0446975835137458,0.0442850539012");
   655         -    add_proj4text (p, 2,
   656         -        "516,0.1218 +no_defs");
          654  +        ",0.00569291,-0.0446976,0.0442851,0.1218 +no_defs");
   657    655       add_srs_wkt (p, 0,
   658    656           "GEOGCS[\"ED87\",DATUM[\"European_Datum_1987\",SPHEROID[\"");
   659    657       add_srs_wkt (p, 1,
   660    658           "International 1924\",6378388,297,AUTHORITY[\"EPSG\",\"70");
   661    659       add_srs_wkt (p, 2,
   662         -        "22\"]],TOWGS84[-83.11,-97.38,-117.22,0.00569290865241986");
          660  +        "22\"]],TOWGS84[-83.11,-97.38,-117.22,0.00569291,-0.04469");
   663    661       add_srs_wkt (p, 3,
   664         -        ",-0.0446975835137458,0.0442850539012516,0.1218],AUTHORIT");
          662  +        "76,0.0442851,0.1218],AUTHORITY[\"EPSG\",\"6231\"]],PRIME");
   665    663       add_srs_wkt (p, 4,
   666         -        "Y[\"EPSG\",\"6231\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
          664  +        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   667    665       add_srs_wkt (p, 5,
   668         -        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
          666  +        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   669    667       add_srs_wkt (p, 6,
   670         -        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
          668  +        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   671    669       add_srs_wkt (p, 7,
   672         -        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4231\"]]");
          670  +        "RITY[\"EPSG\",\"4231\"]]");
   673    671       p = add_epsg_def_ex (filter, first, last, 4232, "epsg", 4232,
   674    672           "Fahud", 1, 1,
   675    673           "Clarke 1880 (RGS)", "Greenwich",
   676    674           "Fahud", "none", "degree",
   677    675           "Latitude", "North", "Longitude", "East");
   678    676       add_proj4text (p, 0,
   679    677           "+proj=longlat +ellps=clrk80 +towgs84=-346,-1,224,0,0,0,0");
................................................................................
   722    720           "Garoua", "none", "degree",
   723    721           "Latitude", "North", "Longitude", "East");
   724    722       add_proj4text (p, 0,
   725    723           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
   726    724       add_srs_wkt (p, 0,
   727    725           "GEOGCS[\"Garoua\",DATUM[\"Garoua\",SPHEROID[\"Clarke 188");
   728    726       add_srs_wkt (p, 1,
   729         -        "0 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
          727  +        "0 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
   730    728       add_srs_wkt (p, 2,
   731    729           ",\"7011\"]],AUTHORITY[\"EPSG\",\"6234\"]],PRIMEM[\"Green");
   732    730       add_srs_wkt (p, 3,
   733    731           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   734    732       add_srs_wkt (p, 4,
   735    733           ".0174532925199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"L");
   736    734       add_srs_wkt (p, 5,
................................................................................
   829    827           "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4238\"]]");
   830    828       p = add_epsg_def_ex (filter, first, last, 4239, "epsg", 4239,
   831    829           "Indian 1954", 1, 1,
   832    830           "Everest 1830 (1937 Adjustment)", "Greenwich",
   833    831           "Indian_1954", "none", "degree",
   834    832           "Latitude", "North", "Longitude", "East");
   835    833       add_proj4text (p, 0,
   836         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
          834  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
   837    835       add_proj4text (p, 1,
   838         -        "84=217,823,299,0,0,0,0 +no_defs");
          836  +        "4=217,823,299,0,0,0,0 +no_defs");
   839    837       add_srs_wkt (p, 0,
   840    838           "GEOGCS[\"Indian 1954\",DATUM[\"Indian_1954\",SPHEROID[\"");
   841    839       add_srs_wkt (p, 1,
   842    840           "Everest 1830 (1937 Adjustment)\",6377276.345,300.8017,AU");
   843    841       add_srs_wkt (p, 2,
   844    842           "THORITY[\"EPSG\",\"7015\"]],TOWGS84[217,823,299,0,0,0,0]");
   845    843       add_srs_wkt (p, 3,
................................................................................
   854    852           "\"]]");
   855    853       p = add_epsg_def_ex (filter, first, last, 4240, "epsg", 4240,
   856    854           "Indian 1975", 1, 1,
   857    855           "Everest 1830 (1937 Adjustment)", "Greenwich",
   858    856           "Indian_1975", "none", "degree",
   859    857           "Latitude", "North", "Longitude", "East");
   860    858       add_proj4text (p, 0,
   861         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
          859  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
   862    860       add_proj4text (p, 1,
   863         -        "84=210,814,289,0,0,0,0 +no_defs");
          861  +        "4=210,814,289,0,0,0,0 +no_defs");
   864    862       add_srs_wkt (p, 0,
   865    863           "GEOGCS[\"Indian 1975\",DATUM[\"Indian_1975\",SPHEROID[\"");
   866    864       add_srs_wkt (p, 1,
   867    865           "Everest 1830 (1937 Adjustment)\",6377276.345,300.8017,AU");
   868    866       add_srs_wkt (p, 2,
   869    867           "THORITY[\"EPSG\",\"7015\"]],TOWGS84[210,814,289,0,0,0,0]");
   870    868       add_srs_wkt (p, 3,
................................................................................
   885    883       add_proj4text (p, 0,
   886    884           "+proj=longlat +a=6378249.144808011 +b=6356514.966204134 ");
   887    885       add_proj4text (p, 1,
   888    886           "+no_defs");
   889    887       add_srs_wkt (p, 0,
   890    888           "GEOGCS[\"Jamaica 1875\",DATUM[\"Jamaica_1875\",SPHEROID[");
   891    889       add_srs_wkt (p, 1,
   892         -        "\"Clarke 1880\",6378249.144808011,293.4663076556365,AUTH");
          890  +        "\"Clarke 1880\",6378249.144808011,293.4663076556349,AUTH");
   893    891       add_srs_wkt (p, 2,
   894    892           "ORITY[\"EPSG\",\"7034\"]],AUTHORITY[\"EPSG\",\"6241\"]],");
   895    893       add_srs_wkt (p, 3,
   896    894           "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   897    895       add_srs_wkt (p, 4,
   898    896           "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   899    897       add_srs_wkt (p, 5,
................................................................................
   908    906       add_proj4text (p, 0,
   909    907           "+proj=longlat +ellps=clrk66 +towgs84=70,207,389.5,0,0,0,");
   910    908       add_proj4text (p, 1,
   911    909           "0 +no_defs");
   912    910       add_srs_wkt (p, 0,
   913    911           "GEOGCS[\"JAD69\",DATUM[\"Jamaica_1969\",SPHEROID[\"Clark");
   914    912       add_srs_wkt (p, 1,
   915         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
          913  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
   916    914       add_srs_wkt (p, 2,
   917    915           "\"7008\"]],TOWGS84[70,207,389.5,0,0,0,0],AUTHORITY[\"EPS");
   918    916       add_srs_wkt (p, 3,
   919    917           "G\",\"6242\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
   920    918       add_srs_wkt (p, 4,
   921    919           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
   922    920       add_srs_wkt (p, 5,
................................................................................
   933    931       add_proj4text (p, 1,
   934    932           "no_defs");
   935    933       add_srs_wkt (p, 0,
   936    934           "GEOGCS[\"Kalianpur 1880\",DATUM[\"Kalianpur_1880\",SPHER");
   937    935       add_srs_wkt (p, 1,
   938    936           "OID[\"Everest (1830 Definition)\",6377299.36559538,300.8");
   939    937       add_srs_wkt (p, 2,
   940         -        "017255433549,AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"E");
          938  +        "017255433552,AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"E");
   941    939       add_srs_wkt (p, 3,
   942    940           "PSG\",\"6243\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
   943    941       add_srs_wkt (p, 4,
   944    942           "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
   945    943       add_srs_wkt (p, 5,
   946    944           "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
   947    945       add_srs_wkt (p, 6,
................................................................................
   948    946           "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4243\"]]");
   949    947       p = add_epsg_def_ex (filter, first, last, 4244, "epsg", 4244,
   950    948           "Kandawala", 1, 1,
   951    949           "Everest 1830 (1937 Adjustment)", "Greenwich",
   952    950           "Kandawala", "none", "degree",
   953    951           "Latitude", "North", "Longitude", "East");
   954    952       add_proj4text (p, 0,
   955         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
          953  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
   956    954       add_proj4text (p, 1,
   957         -        "84=-97,787,86,0,0,0,0 +no_defs");
          955  +        "4=-97,787,86,0,0,0,0 +no_defs");
   958    956       add_srs_wkt (p, 0,
   959    957           "GEOGCS[\"Kandawala\",DATUM[\"Kandawala\",SPHEROID[\"Ever");
   960    958       add_srs_wkt (p, 1,
   961    959           "est 1830 (1937 Adjustment)\",6377276.345,300.8017,AUTHOR");
   962    960       add_srs_wkt (p, 2,
   963    961           "ITY[\"EPSG\",\"7015\"]],TOWGS84[-97,787,86,0,0,0,0],AUTH");
   964    962       add_srs_wkt (p, 3,
................................................................................
  1134   1132           "Lome", "none", "degree",
  1135   1133           "Latitude", "North", "Longitude", "East");
  1136   1134       add_proj4text (p, 0,
  1137   1135           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
  1138   1136       add_srs_wkt (p, 0,
  1139   1137           "GEOGCS[\"Lome\",DATUM[\"Lome\",SPHEROID[\"Clarke 1880 (I");
  1140   1138       add_srs_wkt (p, 1,
  1141         -        "GN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7");
         1139  +        "GN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7");
  1142   1140       add_srs_wkt (p, 2,
  1143   1141           "011\"]],AUTHORITY[\"EPSG\",\"6252\"]],PRIMEM[\"Greenwich");
  1144   1142       add_srs_wkt (p, 3,
  1145   1143           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1146   1144       add_srs_wkt (p, 4,
  1147   1145           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1148   1146       add_srs_wkt (p, 5,
................................................................................
  1157   1155       add_proj4text (p, 0,
  1158   1156           "+proj=longlat +ellps=clrk66 +towgs84=-133,-77,-51,0,0,0,");
  1159   1157       add_proj4text (p, 1,
  1160   1158           "0 +no_defs");
  1161   1159       add_srs_wkt (p, 0,
  1162   1160           "GEOGCS[\"Luzon 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Cl");
  1163   1161       add_srs_wkt (p, 1,
  1164         -        "arke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG");
         1162  +        "arke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG");
  1165   1163       add_srs_wkt (p, 2,
  1166   1164           "\",\"7008\"]],TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"");
  1167   1165       add_srs_wkt (p, 3,
  1168   1166           "EPSG\",\"6253\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  1169   1167       add_srs_wkt (p, 4,
  1170   1168           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  1171   1169       add_srs_wkt (p, 5,
................................................................................
  1343   1341       add_proj4text (p, 0,
  1344   1342           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=31,146,47");
  1345   1343       add_proj4text (p, 1,
  1346   1344           ",0,0,0,0 +no_defs");
  1347   1345       add_srs_wkt (p, 0,
  1348   1346           "GEOGCS[\"Merchich\",DATUM[\"Merchich\",SPHEROID[\"Clarke");
  1349   1347       add_srs_wkt (p, 1,
  1350         -        " 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EP");
         1348  +        " 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EP");
  1351   1349       add_srs_wkt (p, 2,
  1352   1350           "SG\",\"7011\"]],TOWGS84[31,146,47,0,0,0,0],AUTHORITY[\"E");
  1353   1351       add_srs_wkt (p, 3,
  1354   1352           "PSG\",\"6261\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1355   1353       add_srs_wkt (p, 4,
  1356   1354           "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1357   1355       add_srs_wkt (p, 5,
................................................................................
  1460   1458       add_proj4text (p, 0,
  1461   1459           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-74,-130,");
  1462   1460       add_proj4text (p, 1,
  1463   1461           "42,0,0,0,0 +no_defs");
  1464   1462       add_srs_wkt (p, 0,
  1465   1463           "GEOGCS[\"M'poraloko\",DATUM[\"M_poraloko\",SPHEROID[\"Cl");
  1466   1464       add_srs_wkt (p, 1,
  1467         -        "arke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[");
         1465  +        "arke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[");
  1468   1466       add_srs_wkt (p, 2,
  1469   1467           "\"EPSG\",\"7011\"]],TOWGS84[-74,-130,42,0,0,0,0],AUTHORI");
  1470   1468       add_srs_wkt (p, 3,
  1471   1469           "TY[\"EPSG\",\"6266\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[");
  1472   1470       add_srs_wkt (p, 4,
  1473   1471           "\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,A");
  1474   1472       add_srs_wkt (p, 5,
................................................................................
  1481   1479           "North_American_Datum_1927", "none", "degree",
  1482   1480           "Latitude", "North", "Longitude", "East");
  1483   1481       add_proj4text (p, 0,
  1484   1482           "+proj=longlat +datum=NAD27 +no_defs");
  1485   1483       add_srs_wkt (p, 0,
  1486   1484           "GEOGCS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPH");
  1487   1485       add_srs_wkt (p, 1,
  1488         -        "EROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHOR");
         1486  +        "EROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHOR");
  1489   1487       add_srs_wkt (p, 2,
  1490   1488           "ITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PR");
  1491   1489       add_srs_wkt (p, 3,
  1492   1490           "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
  1493   1491       add_srs_wkt (p, 4,
  1494   1492           "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
  1495   1493       add_srs_wkt (p, 5,
................................................................................
  1506   1504       add_proj4text (p, 1,
  1507   1505           "+no_defs");
  1508   1506       add_srs_wkt (p, 0,
  1509   1507           "GEOGCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHER");
  1510   1508       add_srs_wkt (p, 1,
  1511   1509           "OID[\"Clarke 1866 Michigan\",6378450.047548896,294.97869");
  1512   1510       add_srs_wkt (p, 2,
  1513         -        "71646772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\"");
         1511  +        "71646739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\"");
  1514   1512       add_srs_wkt (p, 3,
  1515   1513           ",\"6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  1516   1514       add_srs_wkt (p, 4,
  1517   1515           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  1518   1516       add_srs_wkt (p, 5,
  1519   1517           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  1520   1518       add_srs_wkt (p, 6,
................................................................................
  1671   1669       add_proj4text (p, 1,
  1672   1670           "320,0,0,0,0 +no_defs");
  1673   1671       add_srs_wkt (p, 0,
  1674   1672           "GEOGCS[\"NTF\",DATUM[\"Nouvelle_Triangulation_Francaise\"");
  1675   1673       add_srs_wkt (p, 1,
  1676   1674           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1677   1675       add_srs_wkt (p, 2,
  1678         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         1676  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  1679   1677       add_srs_wkt (p, 3,
  1680   1678           ",0,0,0],AUTHORITY[\"EPSG\",\"6275\"]],PRIMEM[\"Greenwich");
  1681   1679       add_srs_wkt (p, 4,
  1682   1680           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1683   1681       add_srs_wkt (p, 5,
  1684   1682           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1685   1683       add_srs_wkt (p, 6,
................................................................................
  1797   1795           "Palestine 1923", 1, 1,
  1798   1796           "Clarke 1880 (Benoit)", "Greenwich",
  1799   1797           "Palestine_1923", "none", "degree",
  1800   1798           "Latitude", "North", "Longitude", "East");
  1801   1799       add_proj4text (p, 0,
  1802   1800           "+proj=longlat +a=6378300.789 +b=6356566.435 +towgs84=-27");
  1803   1801       add_proj4text (p, 1,
  1804         -        "5.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1 +no_defs");
         1802  +        "5.722,94.7824,340.894,-8.001,-4.42,-11.821,1 +no_defs");
  1805   1803       add_srs_wkt (p, 0,
  1806   1804           "GEOGCS[\"Palestine 1923\",DATUM[\"Palestine_1923\",SPHER");
  1807   1805       add_srs_wkt (p, 1,
  1808   1806           "OID[\"Clarke 1880 (Benoit)\",6378300.789,293.46631553898");
  1809   1807       add_srs_wkt (p, 2,
  1810         -        "11,AUTHORITY[\"EPSG\",\"7010\"]],TOWGS84[-275.7224,94.78");
         1808  +        "02,AUTHORITY[\"EPSG\",\"7010\"]],TOWGS84[-275.722,94.782");
  1811   1809       add_srs_wkt (p, 3,
  1812         -        "24,340.8944,-8.001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"");
         1810  +        "4,340.894,-8.001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6");
  1813   1811       add_srs_wkt (p, 4,
  1814         -        "6281\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         1812  +        "281\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901");
  1815   1813       add_srs_wkt (p, 5,
  1816         -        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         1814  +        "\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG");
  1817   1815       add_srs_wkt (p, 6,
  1818         -        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         1816  +        "\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\"");
  1819   1817       add_srs_wkt (p, 7,
  1820         -        "\",EAST],AUTHORITY[\"EPSG\",\"4281\"]]");
         1818  +        ",EAST],AUTHORITY[\"EPSG\",\"4281\"]]");
  1821   1819       p = add_epsg_def_ex (filter, first, last, 4282, "epsg", 4282,
  1822   1820           "Pointe Noire", 1, 1,
  1823   1821           "Clarke 1880 (IGN)", "Greenwich",
  1824   1822           "Congo_1960_Pointe_Noire", "none", "degree",
  1825   1823           "Latitude", "North", "Longitude", "East");
  1826   1824       add_proj4text (p, 0,
  1827   1825           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-148,51,-");
................................................................................
  1828   1826       add_proj4text (p, 1,
  1829   1827           "291,0,0,0,0 +no_defs");
  1830   1828       add_srs_wkt (p, 0,
  1831   1829           "GEOGCS[\"Pointe Noire\",DATUM[\"Congo_1960_Pointe_Noire\"");
  1832   1830       add_srs_wkt (p, 1,
  1833   1831           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1834   1832       add_srs_wkt (p, 2,
  1835         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-148,51,-291,0");
         1833  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-148,51,-291,0");
  1836   1834       add_srs_wkt (p, 3,
  1837   1835           ",0,0,0],AUTHORITY[\"EPSG\",\"6282\"]],PRIMEM[\"Greenwich");
  1838   1836       add_srs_wkt (p, 4,
  1839   1837           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1840   1838       add_srs_wkt (p, 5,
  1841   1839           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1842   1840       add_srs_wkt (p, 6,
................................................................................
  1870   1868           "Pulkovo 1942", 1, 1,
  1871   1869           "Krassowsky 1940", "Greenwich",
  1872   1870           "Pulkovo_1942", "none", "degree",
  1873   1871           "Latitude", "North", "Longitude", "East");
  1874   1872       add_proj4text (p, 0,
  1875   1873           "+proj=longlat +ellps=krass +towgs84=23.92,-141.27,-80.9,");
  1876   1874       add_proj4text (p, 1,
  1877         -        "0,0.35,0.82,-0.12 +no_defs");
         1875  +        "-0,0.35,0.82,-0.12 +no_defs");
  1878   1876       add_srs_wkt (p, 0,
  1879   1877           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  1880   1878       add_srs_wkt (p, 1,
  1881   1879           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1882   1880       add_srs_wkt (p, 2,
  1883         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         1881  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  1884   1882       add_srs_wkt (p, 3,
  1885         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1883  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  1886   1884       add_srs_wkt (p, 4,
  1887         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1885  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  1888   1886       add_srs_wkt (p, 5,
  1889         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1887  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  1890   1888       add_srs_wkt (p, 6,
  1891         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         1889  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  1892   1890       add_srs_wkt (p, 7,
  1893   1891           "]]");
  1894   1892       p = add_epsg_def_ex (filter, first, last, 4285, "epsg", 4285,
  1895   1893           "Qatar 1974", 1, 1,
  1896   1894           "International 1924", "Greenwich",
  1897   1895           "Qatar_1974", "none", "degree",
  1898   1896           "Latitude", "North", "Longitude", "East");
................................................................................
  1981   1979           "G\",\"4288\"]]");
  1982   1980       p = add_epsg_def_ex (filter, first, last, 4289, "epsg", 4289,
  1983   1981           "Amersfoort", 1, 1,
  1984   1982           "Bessel 1841", "Greenwich",
  1985   1983           "Amersfoort", "none", "degree",
  1986   1984           "Latitude", "North", "Longitude", "East");
  1987   1985       add_proj4text (p, 0,
  1988         -        "+proj=longlat +ellps=bessel +towgs84=565.4171,50.3319,46");
         1986  +        "+proj=longlat +ellps=bessel +towgs84=565.417,50.3319,465");
  1989   1987       add_proj4text (p, 1,
  1990         -        "5.5524,-0.398957388243134,0.343987817378283,-1.877401639");
  1991         -    add_proj4text (p, 2,
  1992         -        "98045,4.0725 +no_defs");
         1988  +        ".552,-0.398957,0.343988,-1.8774,4.0725 +no_defs");
  1993   1989       add_srs_wkt (p, 0,
  1994   1990           "GEOGCS[\"Amersfoort\",DATUM[\"Amersfoort\",SPHEROID[\"Be");
  1995   1991       add_srs_wkt (p, 1,
  1996   1992           "ssel 1841\",6377397.155,299.1528128,AUTHORITY[\"EPSG\",\"");
  1997   1993       add_srs_wkt (p, 2,
  1998         -        "7004\"]],TOWGS84[565.4171,50.3319,465.5524,-0.3989573882");
         1994  +        "7004\"]],TOWGS84[565.417,50.3319,465.552,-0.398957,0.343");
  1999   1995       add_srs_wkt (p, 3,
  2000         -        "43134,0.343987817378283,-1.87740163998045,4.0725],AUTHOR");
         1996  +        "988,-1.8774,4.0725],AUTHORITY[\"EPSG\",\"6289\"]],PRIMEM");
  2001   1997       add_srs_wkt (p, 4,
  2002         -        "ITY[\"EPSG\",\"6289\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
         1998  +        "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  2003   1999       add_srs_wkt (p, 5,
  2004         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
         2000  +        "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  2005   2001       add_srs_wkt (p, 6,
  2006         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
         2002  +        "AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHOR");
  2007   2003       add_srs_wkt (p, 7,
  2008         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4289\"]]");
         2004  +        "ITY[\"EPSG\",\"4289\"]]");
  2009   2005       p = add_epsg_def_ex (filter, first, last, 4291, "epsg", 4291,
  2010   2006           "SAD69", 1, 1,
  2011   2007           "GRS 1967", "Greenwich",
  2012   2008           "South_American_Datum_1969", "none", "degree",
  2013   2009           "Latitude", "North", "Longitude", "East");
  2014   2010       add_proj4text (p, 0,
  2015   2011           "+proj=longlat +ellps=GRS67 +towgs84=-57,1,-41,0,0,0,0 +n");
................................................................................
  2127   2123           "Sudan", "none", "degree",
  2128   2124           "Latitude", "North", "Longitude", "East");
  2129   2125       add_proj4text (p, 0,
  2130   2126           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
  2131   2127       add_srs_wkt (p, 0,
  2132   2128           "GEOGCS[\"Sudan\",DATUM[\"Sudan\",SPHEROID[\"Clarke 1880 ");
  2133   2129       add_srs_wkt (p, 1,
  2134         -        "(IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"");
         2130  +        "(IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"");
  2135   2131       add_srs_wkt (p, 2,
  2136   2132           "7011\"]],AUTHORITY[\"EPSG\",\"6296\"]],PRIMEM[\"Greenwic");
  2137   2133       add_srs_wkt (p, 3,
  2138   2134           "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
  2139   2135       add_srs_wkt (p, 4,
  2140   2136           "74532925199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Lati");
  2141   2137       add_srs_wkt (p, 5,
................................................................................
  2271   2267       add_proj4text (p, 0,
  2272   2268           "+proj=longlat +a=6378293.645208759 +b=6356617.987679838 ");
  2273   2269       add_proj4text (p, 1,
  2274   2270           "+towgs84=-61.702,284.488,472.052,0,0,0,0 +no_defs");
  2275   2271       add_srs_wkt (p, 0,
  2276   2272           "GEOGCS[\"Trinidad 1903\",DATUM[\"Trinidad_1903\",SPHEROI");
  2277   2273       add_srs_wkt (p, 1,
  2278         -        "D[\"Clarke 1858\",6378293.645208759,294.2606763692606,AU");
         2274  +        "D[\"Clarke 1858\",6378293.645208759,294.2606763692569,AU");
  2279   2275       add_srs_wkt (p, 2,
  2280   2276           "THORITY[\"EPSG\",\"7007\"]],TOWGS84[-61.702,284.488,472.");
  2281   2277       add_srs_wkt (p, 3,
  2282   2278           "052,0,0,0,0],AUTHORITY[\"EPSG\",\"6302\"]],PRIMEM[\"Gree");
  2283   2279       add_srs_wkt (p, 4,
  2284   2280           "nwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",");
  2285   2281       add_srs_wkt (p, 5,
................................................................................
  2317   2313       add_proj4text (p, 0,
  2318   2314           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-73,-247,");
  2319   2315       add_proj4text (p, 1,
  2320   2316           "227,0,0,0,0 +no_defs");
  2321   2317       add_srs_wkt (p, 0,
  2322   2318           "GEOGCS[\"Voirol 1875\",DATUM[\"Voirol_1875\",SPHEROID[\"");
  2323   2319       add_srs_wkt (p, 1,
  2324         -        "Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORIT");
         2320  +        "Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORIT");
  2325   2321       add_srs_wkt (p, 2,
  2326   2322           "Y[\"EPSG\",\"7011\"]],TOWGS84[-73,-247,227,0,0,0,0],AUTH");
  2327   2323       add_srs_wkt (p, 3,
  2328   2324           "ORITY[\"EPSG\",\"6304\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
  2329   2325       add_srs_wkt (p, 4,
  2330   2326           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
  2331   2327       add_srs_wkt (p, 5,
................................................................................
  2355   2351           ",\"4306\"]]");
  2356   2352       p = add_epsg_def_ex (filter, first, last, 4307, "epsg", 4307,
  2357   2353           "Nord Sahara 1959", 1, 1,
  2358   2354           "Clarke 1880 (RGS)", "Greenwich",
  2359   2355           "Nord_Sahara_1959", "none", "degree",
  2360   2356           "Latitude", "North", "Longitude", "East");
  2361   2357       add_proj4text (p, 0,
  2362         -        "+proj=longlat +ellps=clrk80 +towgs84=-209.3622,-87.8162,");
         2358  +        "+proj=longlat +ellps=clrk80 +towgs84=-209.362,-87.8162,4");
  2363   2359       add_proj4text (p, 1,
  2364         -        "404.6198,0.0046,3.4784,0.5805,-1.4547 +no_defs");
         2360  +        "04.62,0.0046,3.4784,0.5805,-1.4547 +no_defs");
  2365   2361       add_srs_wkt (p, 0,
  2366   2362           "GEOGCS[\"Nord Sahara 1959\",DATUM[\"Nord_Sahara_1959\",S");
  2367   2363       add_srs_wkt (p, 1,
  2368   2364           "PHEROID[\"Clarke 1880 (RGS)\",6378249.145,293.465,AUTHOR");
  2369   2365       add_srs_wkt (p, 2,
  2370         -        "ITY[\"EPSG\",\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6");
         2366  +        "ITY[\"EPSG\",\"7012\"]],TOWGS84[-209.362,-87.8162,404.62");
  2371   2367       add_srs_wkt (p, 3,
  2372         -        "198,0.0046,3.4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6");
         2368  +        ",0.0046,3.4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307");
  2373   2369       add_srs_wkt (p, 4,
  2374         -        "307\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901");
         2370  +        "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
  2375   2371       add_srs_wkt (p, 5,
  2376         -        "\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG");
         2372  +        "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
  2377   2373       add_srs_wkt (p, 6,
  2378         -        "\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\"");
         2374  +        "\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",E");
  2379   2375       add_srs_wkt (p, 7,
  2380         -        ",EAST],AUTHORITY[\"EPSG\",\"4307\"]]");
         2376  +        "AST],AUTHORITY[\"EPSG\",\"4307\"]]");
  2381   2377       p = add_epsg_def_ex (filter, first, last, 4308, "epsg", 4308,
  2382   2378           "RT38", 1, 1,
  2383   2379           "Bessel 1841", "Greenwich",
  2384   2380           "Stockholm_1938", "none", "degree",
  2385   2381           "Latitude", "North", "Longitude", "East");
  2386   2382       add_proj4text (p, 0,
  2387   2383           "+proj=longlat +ellps=bessel +no_defs");

Changes to src/srsinit/epsg_inlined_21.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    83     83           "Yoff", "none", "degree",
    84     84           "Latitude", "North", "Longitude", "East");
    85     85       add_proj4text (p, 0,
    86     86           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
    87     87       add_srs_wkt (p, 0,
    88     88           "GEOGCS[\"Yoff\",DATUM[\"Yoff\",SPHEROID[\"Clarke 1880 (I");
    89     89       add_srs_wkt (p, 1,
    90         -        "GN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7");
           90  +        "GN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7");
    91     91       add_srs_wkt (p, 2,
    92     92           "011\"]],AUTHORITY[\"EPSG\",\"6310\"]],PRIMEM[\"Greenwich");
    93     93       add_srs_wkt (p, 3,
    94     94           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
    95     95       add_srs_wkt (p, 4,
    96     96           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
    97     97       add_srs_wkt (p, 5,
................................................................................
   148    148           "UTHORITY[\"EPSG\",\"4312\"]]");
   149    149       p = add_epsg_def_ex (filter, first, last, 4313, "epsg", 4313,
   150    150           "Belge 1972", 1, 1,
   151    151           "International 1924", "Greenwich",
   152    152           "Reseau_National_Belge_1972", "none", "degree",
   153    153           "Latitude", "North", "Longitude", "East");
   154    154       add_proj4text (p, 0,
   155         -        "+proj=longlat +ellps=intl +towgs84=-106.8686,52.2978,-10");
          155  +        "+proj=longlat +ellps=intl +towgs84=-106.869,52.2978,-103");
   156    156       add_proj4text (p, 1,
   157         -        "3.7239,0.3366,-0.457,1.8422,-1.2747 +no_defs");
          157  +        ".724,0.3366,-0.457,1.8422,-1.2747 +no_defs");
   158    158       add_srs_wkt (p, 0,
   159    159           "GEOGCS[\"Belge 1972\",DATUM[\"Reseau_National_Belge_1972");
   160    160       add_srs_wkt (p, 1,
   161    161           "\",SPHEROID[\"International 1924\",6378388,297,AUTHORITY");
   162    162       add_srs_wkt (p, 2,
   163         -        "[\"EPSG\",\"7022\"]],TOWGS84[-106.8686,52.2978,-103.7239");
          163  +        "[\"EPSG\",\"7022\"]],TOWGS84[-106.869,52.2978,-103.724,0");
   164    164       add_srs_wkt (p, 3,
   165         -        ",0.3366,-0.457,1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313");
          165  +        ".3366,-0.457,1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"");
   166    166       add_srs_wkt (p, 4,
   167         -        "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
          167  +        "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
   168    168       add_srs_wkt (p, 5,
   169         -        "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
          169  +        "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
   170    170       add_srs_wkt (p, 6,
   171         -        "\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",E");
          171  +        "9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAS");
   172    172       add_srs_wkt (p, 7,
   173         -        "AST],AUTHORITY[\"EPSG\",\"4313\"]]");
          173  +        "T],AUTHORITY[\"EPSG\",\"4313\"]]");
   174    174       p = add_epsg_def_ex (filter, first, last, 4314, "epsg", 4314,
   175    175           "DHDN", 1, 1,
   176    176           "Bessel 1841", "Greenwich",
   177    177           "Deutsches_Hauptdreiecksnetz", "none", "degree",
   178    178           "Latitude", "North", "Longitude", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=longlat +ellps=bessel +towgs84=598.1,73.7,418.2,0.");
................................................................................
   204    204       add_proj4text (p, 0,
   205    205           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-23,259,-");
   206    206       add_proj4text (p, 1,
   207    207           "9,0,0,0,0 +no_defs");
   208    208       add_srs_wkt (p, 0,
   209    209           "GEOGCS[\"Conakry 1905\",DATUM[\"Conakry_1905\",SPHEROID[");
   210    210       add_srs_wkt (p, 1,
   211         -        "\"Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHOR");
          211  +        "\"Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHOR");
   212    212       add_srs_wkt (p, 2,
   213    213           "ITY[\"EPSG\",\"7011\"]],TOWGS84[-23,259,-9,0,0,0,0],AUTH");
   214    214       add_srs_wkt (p, 3,
   215    215           "ORITY[\"EPSG\",\"6315\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
   216    216       add_srs_wkt (p, 4,
   217    217           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
   218    218       add_srs_wkt (p, 5,
................................................................................
   369    369       add_proj4text (p, 1,
   370    370           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   371    371       add_srs_wkt (p, 0,
   372    372           "PROJCS[\"NAD27 / BLM 59N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   373    373       add_srs_wkt (p, 1,
   374    374           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   375    375       add_srs_wkt (p, 2,
   376         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          376  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   377    377       add_srs_wkt (p, 3,
   378    378           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   379    379       add_srs_wkt (p, 4,
   380    380           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   381    381       add_srs_wkt (p, 5,
   382    382           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   383    383       add_srs_wkt (p, 6,
................................................................................
   406    406       add_proj4text (p, 1,
   407    407           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   408    408       add_srs_wkt (p, 0,
   409    409           "PROJCS[\"NAD27 / BLM 60N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   410    410       add_srs_wkt (p, 1,
   411    411           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   412    412       add_srs_wkt (p, 2,
   413         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          413  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   414    414       add_srs_wkt (p, 3,
   415    415           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   416    416       add_srs_wkt (p, 4,
   417    417           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   418    418       add_srs_wkt (p, 5,
   419    419           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   420    420       add_srs_wkt (p, 6,
................................................................................
   443    443       add_proj4text (p, 1,
   444    444           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   445    445       add_srs_wkt (p, 0,
   446    446           "PROJCS[\"NAD27 / BLM 1N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   447    447       add_srs_wkt (p, 1,
   448    448           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   449    449       add_srs_wkt (p, 2,
   450         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          450  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   451    451       add_srs_wkt (p, 3,
   452    452           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   453    453       add_srs_wkt (p, 4,
   454    454           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   455    455       add_srs_wkt (p, 5,
   456    456           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   457    457       add_srs_wkt (p, 6,
................................................................................
   480    480       add_proj4text (p, 1,
   481    481           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   482    482       add_srs_wkt (p, 0,
   483    483           "PROJCS[\"NAD27 / BLM 2N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   484    484       add_srs_wkt (p, 1,
   485    485           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   486    486       add_srs_wkt (p, 2,
   487         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          487  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   488    488       add_srs_wkt (p, 3,
   489    489           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   490    490       add_srs_wkt (p, 4,
   491    491           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   492    492       add_srs_wkt (p, 5,
   493    493           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   494    494       add_srs_wkt (p, 6,
................................................................................
   517    517       add_proj4text (p, 1,
   518    518           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   519    519       add_srs_wkt (p, 0,
   520    520           "PROJCS[\"NAD27 / BLM 3N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   521    521       add_srs_wkt (p, 1,
   522    522           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   523    523       add_srs_wkt (p, 2,
   524         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          524  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   525    525       add_srs_wkt (p, 3,
   526    526           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   527    527       add_srs_wkt (p, 4,
   528    528           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   529    529       add_srs_wkt (p, 5,
   530    530           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   531    531       add_srs_wkt (p, 6,
................................................................................
   554    554       add_proj4text (p, 1,
   555    555           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   556    556       add_srs_wkt (p, 0,
   557    557           "PROJCS[\"NAD27 / BLM 4N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   558    558       add_srs_wkt (p, 1,
   559    559           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   560    560       add_srs_wkt (p, 2,
   561         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          561  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   562    562       add_srs_wkt (p, 3,
   563    563           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   564    564       add_srs_wkt (p, 4,
   565    565           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   566    566       add_srs_wkt (p, 5,
   567    567           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   568    568       add_srs_wkt (p, 6,
................................................................................
   591    591       add_proj4text (p, 1,
   592    592           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   593    593       add_srs_wkt (p, 0,
   594    594           "PROJCS[\"NAD27 / BLM 5N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   595    595       add_srs_wkt (p, 1,
   596    596           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   597    597       add_srs_wkt (p, 2,
   598         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          598  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   599    599       add_srs_wkt (p, 3,
   600    600           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   601    601       add_srs_wkt (p, 4,
   602    602           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   603    603       add_srs_wkt (p, 5,
   604    604           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   605    605       add_srs_wkt (p, 6,
................................................................................
   628    628       add_proj4text (p, 1,
   629    629           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   630    630       add_srs_wkt (p, 0,
   631    631           "PROJCS[\"NAD27 / BLM 6N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   632    632       add_srs_wkt (p, 1,
   633    633           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   634    634       add_srs_wkt (p, 2,
   635         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          635  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   636    636       add_srs_wkt (p, 3,
   637    637           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   638    638       add_srs_wkt (p, 4,
   639    639           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   640    640       add_srs_wkt (p, 5,
   641    641           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   642    642       add_srs_wkt (p, 6,
................................................................................
   665    665       add_proj4text (p, 1,
   666    666           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   667    667       add_srs_wkt (p, 0,
   668    668           "PROJCS[\"NAD27 / BLM 7N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   669    669       add_srs_wkt (p, 1,
   670    670           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   671    671       add_srs_wkt (p, 2,
   672         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          672  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   673    673       add_srs_wkt (p, 3,
   674    674           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   675    675       add_srs_wkt (p, 4,
   676    676           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   677    677       add_srs_wkt (p, 5,
   678    678           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   679    679       add_srs_wkt (p, 6,
................................................................................
   702    702       add_proj4text (p, 1,
   703    703           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   704    704       add_srs_wkt (p, 0,
   705    705           "PROJCS[\"NAD27 / BLM 8N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   706    706       add_srs_wkt (p, 1,
   707    707           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   708    708       add_srs_wkt (p, 2,
   709         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          709  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   710    710       add_srs_wkt (p, 3,
   711    711           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   712    712       add_srs_wkt (p, 4,
   713    713           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   714    714       add_srs_wkt (p, 5,
   715    715           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   716    716       add_srs_wkt (p, 6,
................................................................................
   739    739       add_proj4text (p, 1,
   740    740           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   741    741       add_srs_wkt (p, 0,
   742    742           "PROJCS[\"NAD27 / BLM 9N (ftUS)\",GEOGCS[\"NAD27\",DATUM[");
   743    743       add_srs_wkt (p, 1,
   744    744           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   745    745       add_srs_wkt (p, 2,
   746         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          746  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   747    747       add_srs_wkt (p, 3,
   748    748           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   749    749       add_srs_wkt (p, 4,
   750    750           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   751    751       add_srs_wkt (p, 5,
   752    752           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   753    753       add_srs_wkt (p, 6,
................................................................................
   776    776       add_proj4text (p, 1,
   777    777           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   778    778       add_srs_wkt (p, 0,
   779    779           "PROJCS[\"NAD27 / BLM 10N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   780    780       add_srs_wkt (p, 1,
   781    781           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   782    782       add_srs_wkt (p, 2,
   783         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          783  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   784    784       add_srs_wkt (p, 3,
   785    785           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   786    786       add_srs_wkt (p, 4,
   787    787           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   788    788       add_srs_wkt (p, 5,
   789    789           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   790    790       add_srs_wkt (p, 6,
................................................................................
   813    813       add_proj4text (p, 1,
   814    814           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   815    815       add_srs_wkt (p, 0,
   816    816           "PROJCS[\"NAD27 / BLM 11N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   817    817       add_srs_wkt (p, 1,
   818    818           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   819    819       add_srs_wkt (p, 2,
   820         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          820  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   821    821       add_srs_wkt (p, 3,
   822    822           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   823    823       add_srs_wkt (p, 4,
   824    824           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   825    825       add_srs_wkt (p, 5,
   826    826           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   827    827       add_srs_wkt (p, 6,
................................................................................
   850    850       add_proj4text (p, 1,
   851    851           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   852    852       add_srs_wkt (p, 0,
   853    853           "PROJCS[\"NAD27 / BLM 12N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   854    854       add_srs_wkt (p, 1,
   855    855           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   856    856       add_srs_wkt (p, 2,
   857         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          857  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   858    858       add_srs_wkt (p, 3,
   859    859           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   860    860       add_srs_wkt (p, 4,
   861    861           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   862    862       add_srs_wkt (p, 5,
   863    863           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   864    864       add_srs_wkt (p, 6,
................................................................................
   887    887       add_proj4text (p, 1,
   888    888           "01016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   889    889       add_srs_wkt (p, 0,
   890    890           "PROJCS[\"NAD27 / BLM 13N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
   891    891       add_srs_wkt (p, 1,
   892    892           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   893    893       add_srs_wkt (p, 2,
   894         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          894  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   895    895       add_srs_wkt (p, 3,
   896    896           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   897    897       add_srs_wkt (p, 4,
   898    898           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   899    899       add_srs_wkt (p, 5,
   900    900           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   901    901       add_srs_wkt (p, 6,
................................................................................
   965    965       add_proj4text (p, 2,
   966    966           "9.614,-255.95,0,0,0,0 +units=m +no_defs");
   967    967       add_srs_wkt (p, 0,
   968    968           "PROJCS[\"Katanga 1955 / Katanga Lambert\",GEOGCS[\"Katan");
   969    969       add_srs_wkt (p, 1,
   970    970           "ga 1955\",DATUM[\"Katanga_1955\",SPHEROID[\"Clarke 1866\"");
   971    971       add_srs_wkt (p, 2,
   972         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          972  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   973    973       add_srs_wkt (p, 3,
   974    974           "]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,0],AUTHORITY[\"");
   975    975       add_srs_wkt (p, 4,
   976    976           "EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
   977    977       add_srs_wkt (p, 5,
   978    978           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
   979    979       add_srs_wkt (p, 6,
................................................................................
  1043   1043       add_proj4text (p, 1,
  1044   1044           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1045   1045       add_srs_wkt (p, 0,
  1046   1046           "PROJCS[\"NAD27 / BLM 18N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  1047   1047       add_srs_wkt (p, 1,
  1048   1048           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  1049   1049       add_srs_wkt (p, 2,
  1050         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         1050  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  1051   1051       add_srs_wkt (p, 3,
  1052   1052           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  1053   1053       add_srs_wkt (p, 4,
  1054   1054           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1055   1055       add_srs_wkt (p, 5,
  1056   1056           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1057   1057       add_srs_wkt (p, 6,
................................................................................
  1080   1080       add_proj4text (p, 1,
  1081   1081           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1082   1082       add_srs_wkt (p, 0,
  1083   1083           "PROJCS[\"NAD27 / BLM 19N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  1084   1084       add_srs_wkt (p, 1,
  1085   1085           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  1086   1086       add_srs_wkt (p, 2,
  1087         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         1087  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  1088   1088       add_srs_wkt (p, 3,
  1089   1089           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  1090   1090       add_srs_wkt (p, 4,
  1091   1091           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1092   1092       add_srs_wkt (p, 5,
  1093   1093           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1094   1094       add_srs_wkt (p, 6,
................................................................................
  1829   1829       add_proj4text (p, 2,
  1830   1830           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1831   1831       add_srs_wkt (p, 0,
  1832   1832           "PROJCS[\"NAD27 / Pennsylvania South\",GEOGCS[\"NAD27\",D");
  1833   1833       add_srs_wkt (p, 1,
  1834   1834           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1835   1835       add_srs_wkt (p, 2,
  1836         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1836  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1837   1837       add_srs_wkt (p, 3,
  1838   1838           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1839   1839       add_srs_wkt (p, 4,
  1840   1840           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1841   1841       add_srs_wkt (p, 5,
  1842   1842           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1843   1843       add_srs_wkt (p, 6,
................................................................................
  1872   1872       add_proj4text (p, 2,
  1873   1873           "0480.06096012192 +datum=NAD27 +units=us-ft +no_defs");
  1874   1874       add_srs_wkt (p, 0,
  1875   1875           "PROJCS[\"NAD27 / New York Long Island\",GEOGCS[\"NAD27\"");
  1876   1876       add_srs_wkt (p, 1,
  1877   1877           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  1878   1878       add_srs_wkt (p, 2,
  1879         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         1879  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  1880   1880       add_srs_wkt (p, 3,
  1881   1881           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  1882   1882       add_srs_wkt (p, 4,
  1883   1883           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1884   1884       add_srs_wkt (p, 5,
  1885   1885           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1886   1886       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_22.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  2281   2281           "North_American_Datum_1927_1976", "none", "degree",
  2282   2282           "Latitude", "North", "Longitude", "East");
  2283   2283       add_proj4text (p, 0,
  2284   2284           "+proj=longlat +ellps=clrk66 +no_defs");
  2285   2285       add_srs_wkt (p, 0,
  2286   2286           "GEOGCS[\"NAD27(76)\",DATUM[\"North_American_Datum_1927_1");
  2287   2287       add_srs_wkt (p, 1,
  2288         -        "976\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821389");
         2288  +        "976\",SPHEROID[\"Clarke 1866\",6378206.4,294.97869821390");
  2289   2289       add_srs_wkt (p, 2,
  2290         -        "82,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"66");
         2290  +        "06,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"66");
  2291   2291       add_srs_wkt (p, 3,
  2292   2292           "08\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
  2293   2293       add_srs_wkt (p, 4,
  2294   2294           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
  2295   2295       add_srs_wkt (p, 5,
  2296   2296           ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
  2297   2297       add_srs_wkt (p, 6,
................................................................................
  2304   2304       add_proj4text (p, 0,
  2305   2305           "+proj=longlat +ellps=clrk66 +no_defs");
  2306   2306       add_srs_wkt (p, 0,
  2307   2307           "GEOGCS[\"NAD27(CGQ77)\",DATUM[\"North_American_Datum_192");
  2308   2308       add_srs_wkt (p, 1,
  2309   2309           "7_CGQ77\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982");
  2310   2310       add_srs_wkt (p, 2,
  2311         -        "138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",");
         2311  +        "139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",");
  2312   2312       add_srs_wkt (p, 3,
  2313   2313           "\"6609\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  2314   2314       add_srs_wkt (p, 4,
  2315   2315           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  2316   2316       add_srs_wkt (p, 5,
  2317   2317           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  2318   2318       add_srs_wkt (p, 6,
................................................................................
  2340   2340           "Hong Kong 1980", 1, 1,
  2341   2341           "International 1924", "Greenwich",
  2342   2342           "Hong_Kong_1980", "none", "degree",
  2343   2343           "Latitude", "North", "Longitude", "East");
  2344   2344       add_proj4text (p, 0,
  2345   2345           "+proj=longlat +ellps=intl +towgs84=-162.619,-276.959,-16");
  2346   2346       add_proj4text (p, 1,
  2347         -        "1.764,0.067753,-2.243649,-1.158827,-1.094246 +no_defs");
         2347  +        "1.764,0.067753,-2.24365,-1.15883,-1.09425 +no_defs");
  2348   2348       add_srs_wkt (p, 0,
  2349   2349           "GEOGCS[\"Hong Kong 1980\",DATUM[\"Hong_Kong_1980\",SPHER");
  2350   2350       add_srs_wkt (p, 1,
  2351   2351           "OID[\"International 1924\",6378388,297,AUTHORITY[\"EPSG\"");
  2352   2352       add_srs_wkt (p, 2,
  2353   2353           ",\"7022\"]],TOWGS84[-162.619,-276.959,-161.764,0.067753,");
  2354   2354       add_srs_wkt (p, 3,
  2355         -        "-2.243649,-1.158827,-1.094246],AUTHORITY[\"EPSG\",\"6611");
         2355  +        "-2.24365,-1.15883,-1.09425],AUTHORITY[\"EPSG\",\"6611\"]");
  2356   2356       add_srs_wkt (p, 4,
  2357         -        "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
         2357  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2358   2358       add_srs_wkt (p, 5,
  2359         -        "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
         2359  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2360   2360       add_srs_wkt (p, 6,
  2361         -        "\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",E");
         2361  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
  2362   2362       add_srs_wkt (p, 7,
  2363         -        "AST],AUTHORITY[\"EPSG\",\"4611\"]]");
         2363  +        "],AUTHORITY[\"EPSG\",\"4611\"]]");
  2364   2364       p = add_epsg_def_ex (filter, first, last, 4612, "epsg", 4612,
  2365   2365           "JGD2000", 1, 1,
  2366   2366           "GRS 1980", "Greenwich",
  2367   2367           "Japanese_Geodetic_Datum_2000", "none", "degree",
  2368   2368           "Latitude", "North", "Longitude", "East");
  2369   2369       add_proj4text (p, 0,
  2370   2370           "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_de");
................................................................................
  2409   2409           "ude\",EAST],AUTHORITY[\"EPSG\",\"4613\"]]");
  2410   2410       p = add_epsg_def_ex (filter, first, last, 4614, "epsg", 4614,
  2411   2411           "QND95", 1, 1,
  2412   2412           "International 1924", "Greenwich",
  2413   2413           "Qatar_National_Datum_1995", "none", "degree",
  2414   2414           "Latitude", "North", "Longitude", "East");
  2415   2415       add_proj4text (p, 0,
  2416         -        "+proj=longlat +ellps=intl +towgs84=-119.4248,-303.65872,");
         2416  +        "+proj=longlat +ellps=intl +towgs84=-119.425,-303.659,-11");
  2417   2417       add_proj4text (p, 1,
  2418         -        "-11.00061,1.164298,0.174458,1.096259,3.657065 +no_defs");
         2418  +        ".0006,1.1643,0.174458,1.09626,3.65706 +no_defs");
  2419   2419       add_srs_wkt (p, 0,
  2420   2420           "GEOGCS[\"QND95\",DATUM[\"Qatar_National_Datum_1995\",SPH");
  2421   2421       add_srs_wkt (p, 1,
  2422   2422           "EROID[\"International 1924\",6378388,297,AUTHORITY[\"EPS");
  2423   2423       add_srs_wkt (p, 2,
  2424         -        "G\",\"7022\"]],TOWGS84[-119.4248,-303.65872,-11.00061,1.");
         2424  +        "G\",\"7022\"]],TOWGS84[-119.425,-303.659,-11.0006,1.1643");
  2425   2425       add_srs_wkt (p, 3,
  2426         -        "164298,0.174458,1.096259,3.657065],AUTHORITY[\"EPSG\",\"");
         2426  +        ",0.174458,1.09626,3.65706],AUTHORITY[\"EPSG\",\"6614\"]]");
  2427   2427       add_srs_wkt (p, 4,
  2428         -        "6614\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2428  +        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
  2429   2429       add_srs_wkt (p, 5,
  2430         -        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2430  +        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
  2431   2431       add_srs_wkt (p, 6,
  2432         -        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2432  +        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
  2433   2433       add_srs_wkt (p, 7,
  2434         -        "\",EAST],AUTHORITY[\"EPSG\",\"4614\"]]");
         2434  +        ",AUTHORITY[\"EPSG\",\"4614\"]]");
  2435   2435       p = add_epsg_def_ex (filter, first, last, 4615, "epsg", 4615,
  2436   2436           "Porto Santo", 1, 1,
  2437   2437           "International 1924", "Greenwich",
  2438   2438           "Porto_Santo_1936", "none", "degree",
  2439   2439           "Latitude", "North", "Longitude", "East");
  2440   2440       add_proj4text (p, 0,
  2441   2441           "+proj=longlat +ellps=intl +towgs84=-499,-249,314,0,0,0,0");
................................................................................
  2979   2979       add_proj4text (p, 1,
  2980   2980           "+no_defs");
  2981   2981       add_srs_wkt (p, 0,
  2982   2982           "GEOGCS[\"Saint Pierre et Miquelon 1950\",DATUM[\"Saint_P");
  2983   2983       add_srs_wkt (p, 1,
  2984   2984           "ierre_et_Miquelon_1950\",SPHEROID[\"Clarke 1866\",637820");
  2985   2985       add_srs_wkt (p, 2,
  2986         -        "6.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWG");
         2986  +        "6.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWG");
  2987   2987       add_srs_wkt (p, 3,
  2988   2988           "S84[30,430,368,0,0,0,0],AUTHORITY[\"EPSG\",\"6638\"]],PR");
  2989   2989       add_srs_wkt (p, 4,
  2990   2990           "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
  2991   2991       add_srs_wkt (p, 5,
  2992   2992           "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
  2993   2993       add_srs_wkt (p, 6,
................................................................................
  3092   3092           "ST71 Belep", 1, 1,
  3093   3093           "International 1924", "Greenwich",
  3094   3094           "ST71_Belep", "none", "degree",
  3095   3095           "Latitude", "North", "Longitude", "East");
  3096   3096       add_proj4text (p, 0,
  3097   3097           "+proj=longlat +ellps=intl +towgs84=-480.26,-438.32,-643.");
  3098   3098       add_proj4text (p, 1,
  3099         -        "429,16.3119,20.1721,-4.0349,-111.7002 +no_defs");
         3099  +        "429,16.3119,20.1721,-4.0349,-111.7 +no_defs");
  3100   3100       add_srs_wkt (p, 0,
  3101   3101           "GEOGCS[\"ST71 Belep\",DATUM[\"ST71_Belep\",SPHEROID[\"In");
  3102   3102       add_srs_wkt (p, 1,
  3103   3103           "ternational 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022");
  3104   3104       add_srs_wkt (p, 2,
  3105   3105           "\"]],TOWGS84[-480.26,-438.32,-643.429,16.3119,20.1721,-4");
  3106   3106       add_srs_wkt (p, 3,
  3107         -        ".0349,-111.7002],AUTHORITY[\"EPSG\",\"6643\"]],PRIMEM[\"");
         3107  +        ".0349,-111.7],AUTHORITY[\"EPSG\",\"6643\"]],PRIMEM[\"Gre");
  3108   3108       add_srs_wkt (p, 4,
  3109         -        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
         3109  +        "enwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  3110   3110       add_srs_wkt (p, 5,
  3111         -        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
         3111  +        ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  3112   3112       add_srs_wkt (p, 6,
  3113         -        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
         3113  +        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
  3114   3114       add_srs_wkt (p, 7,
  3115         -        "[\"EPSG\",\"4643\"]]");
         3115  +        "PSG\",\"4643\"]]");
  3116   3116   }
  3117   3117   
  3118   3118   #endif /* full EPSG initialization enabled/disabled */
  3119   3119   

Changes to src/srsinit/epsg_inlined_23.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   410    410           "T],AUTHORITY[\"EPSG\",\"4659\"]]");
   411    411       p = add_epsg_def_ex (filter, first, last, 4660, "epsg", 4660,
   412    412           "Helle 1954", 1, 1,
   413    413           "International 1924", "Greenwich",
   414    414           "Helle_1954", "none", "degree",
   415    415           "Latitude", "North", "Longitude", "East");
   416    416       add_proj4text (p, 0,
   417         -        "+proj=longlat +ellps=intl +towgs84=982.6087,552.753,-540");
          417  +        "+proj=longlat +ellps=intl +towgs84=982.609,552.753,-540.");
   418    418       add_proj4text (p, 1,
   419         -        ".873,6.68162662527694,-31.6114924086422,-19.848161004816");
   420         -    add_proj4text (p, 2,
   421         -        "8,16.805 +no_defs");
          419  +        "873,6.68163,-31.6115,-19.8482,16.805 +no_defs");
   422    420       add_srs_wkt (p, 0,
   423    421           "GEOGCS[\"Helle 1954\",DATUM[\"Helle_1954\",SPHEROID[\"In");
   424    422       add_srs_wkt (p, 1,
   425    423           "ternational 1924\",6378388,297,AUTHORITY[\"EPSG\",\"7022");
   426    424       add_srs_wkt (p, 2,
   427         -        "\"]],TOWGS84[982.6087,552.753,-540.873,6.68162662527694,");
          425  +        "\"]],TOWGS84[982.609,552.753,-540.873,6.68163,-31.6115,-");
   428    426       add_srs_wkt (p, 3,
   429         -        "-31.6114924086422,-19.8481610048168,16.805],AUTHORITY[\"");
          427  +        "19.8482,16.805],AUTHORITY[\"EPSG\",\"6660\"]],PRIMEM[\"G");
   430    428       add_srs_wkt (p, 4,
   431         -        "EPSG\",\"6660\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
          429  +        "reenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree");
   432    430       add_srs_wkt (p, 5,
   433         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
          431  +        "\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS");
   434    432       add_srs_wkt (p, 6,
   435         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
          433  +        "[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[");
   436    434       add_srs_wkt (p, 7,
   437         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4660\"]]");
          435  +        "\"EPSG\",\"4660\"]]");
   438    436       p = add_epsg_def_ex (filter, first, last, 4661, "epsg", 4661,
   439    437           "LKS92", 1, 1,
   440    438           "GRS 1980", "Greenwich",
   441    439           "Latvia_1992", "none", "degree",
   442    440           "Latitude", "North", "Longitude", "East");
   443    441       add_proj4text (p, 0,
   444    442           "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_de");
................................................................................
   681    679           "Voirol_1879", "none", "degree",
   682    680           "Latitude", "North", "Longitude", "East");
   683    681       add_proj4text (p, 0,
   684    682           "+proj=longlat +a=6378249.2 +b=6356515 +no_defs");
   685    683       add_srs_wkt (p, 0,
   686    684           "GEOGCS[\"Voirol 1879\",DATUM[\"Voirol_1879\",SPHEROID[\"");
   687    685       add_srs_wkt (p, 1,
   688         -        "Clarke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORIT");
          686  +        "Clarke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORIT");
   689    687       add_srs_wkt (p, 2,
   690    688           "Y[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\",\"6671\"]],PRIM");
   691    689       add_srs_wkt (p, 3,
   692    690           "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
   693    691       add_srs_wkt (p, 4,
   694    692           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
   695    693       add_srs_wkt (p, 5,
................................................................................
   725    723           "Chatham Islands 1979", 1, 1,
   726    724           "International 1924", "Greenwich",
   727    725           "Chatham_Islands_Datum_1979", "none", "degree",
   728    726           "Latitude", "North", "Longitude", "East");
   729    727       add_proj4text (p, 0,
   730    728           "+proj=longlat +ellps=intl +towgs84=174.05,-25.49,112.57,");
   731    729       add_proj4text (p, 1,
   732         -        "0,0,0.554,0.2263 +no_defs");
          730  +        "-0,-0,0.554,0.2263 +no_defs");
   733    731       add_srs_wkt (p, 0,
   734    732           "GEOGCS[\"Chatham Islands 1979\",DATUM[\"Chatham_Islands_");
   735    733       add_srs_wkt (p, 1,
   736    734           "Datum_1979\",SPHEROID[\"International 1924\",6378388,297");
   737    735       add_srs_wkt (p, 2,
   738    736           ",AUTHORITY[\"EPSG\",\"7022\"]],TOWGS84[174.05,-25.49,112");
   739    737       add_srs_wkt (p, 3,
   740         -        ".57,0,0,0.554,0.2263],AUTHORITY[\"EPSG\",\"6673\"]],PRIM");
          738  +        ".57,-0,-0,0.554,0.2263],AUTHORITY[\"EPSG\",\"6673\"]],PR");
   741    739       add_srs_wkt (p, 4,
   742         -        "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
          740  +        "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
   743    741       add_srs_wkt (p, 5,
   744         -        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
          742  +        "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
   745    743       add_srs_wkt (p, 6,
   746         -        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
          744  +        "]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUT");
   747    745       add_srs_wkt (p, 7,
   748         -        "ORITY[\"EPSG\",\"4673\"]]");
          746  +        "HORITY[\"EPSG\",\"4673\"]]");
   749    747       p = add_epsg_def_ex (filter, first, last, 4674, "epsg", 4674,
   750    748           "SIRGAS 2000", 1, 1,
   751    749           "GRS 1980", "Greenwich",
   752    750           "Sistema_de_Referencia_Geocentrico_para_las_AmericaS_2000", "none", "degree",
   753    751           "Latitude", "North", "Longitude", "East");
   754    752       add_proj4text (p, 0,
   755    753           "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_de");
................................................................................
   779    777       add_proj4text (p, 0,
   780    778           "+proj=longlat +ellps=clrk66 +towgs84=-100,-248,259,0,0,0");
   781    779       add_proj4text (p, 1,
   782    780           ",0 +no_defs");
   783    781       add_srs_wkt (p, 0,
   784    782           "GEOGCS[\"Guam 1963\",DATUM[\"Guam_1963\",SPHEROID[\"Clar");
   785    783       add_srs_wkt (p, 1,
   786         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
          784  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
   787    785       add_srs_wkt (p, 2,
   788    786           ",\"7008\"]],TOWGS84[-100,-248,259,0,0,0,0],AUTHORITY[\"E");
   789    787       add_srs_wkt (p, 3,
   790    788           "PSG\",\"6675\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
   791    789       add_srs_wkt (p, 4,
   792    790           "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
   793    791       add_srs_wkt (p, 5,
................................................................................
   932    930           "ORITY[\"EPSG\",\"4681\"]]");
   933    931       p = add_epsg_def_ex (filter, first, last, 4682, "epsg", 4682,
   934    932           "Gulshan 303", 1, 1,
   935    933           "Everest 1830 (1937 Adjustment)", "Greenwich",
   936    934           "Gulshan_303", "none", "degree",
   937    935           "Latitude", "North", "Longitude", "East");
   938    936       add_proj4text (p, 0,
   939         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
          937  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
   940    938       add_proj4text (p, 1,
   941         -        "84=283.7,735.9,261.1,0,0,0,0 +no_defs");
          939  +        "4=283.7,735.9,261.1,0,0,0,0 +no_defs");
   942    940       add_srs_wkt (p, 0,
   943    941           "GEOGCS[\"Gulshan 303\",DATUM[\"Gulshan_303\",SPHEROID[\"");
   944    942       add_srs_wkt (p, 1,
   945    943           "Everest 1830 (1937 Adjustment)\",6377276.345,300.8017,AU");
   946    944       add_srs_wkt (p, 2,
   947    945           "THORITY[\"EPSG\",\"7015\"]],TOWGS84[283.7,735.9,261.1,0,");
   948    946       add_srs_wkt (p, 3,
................................................................................
   963    961       add_proj4text (p, 0,
   964    962           "+proj=longlat +ellps=clrk66 +towgs84=-127.62,-67.24,-47.");
   965    963       add_proj4text (p, 1,
   966    964           "04,-3.068,4.903,1.578,-1.06 +no_defs");
   967    965       add_srs_wkt (p, 0,
   968    966           "GEOGCS[\"PRS92\",DATUM[\"Philippine_Reference_System_199");
   969    967       add_srs_wkt (p, 1,
   970         -        "2\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982");
          968  +        "2\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139006");
   971    969       add_srs_wkt (p, 2,
   972    970           ",AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-127.62,-67.24,-4");
   973    971       add_srs_wkt (p, 3,
   974    972           "7.04,-3.068,4.903,1.578,-1.06],AUTHORITY[\"EPSG\",\"6683");
   975    973       add_srs_wkt (p, 4,
   976    974           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
   977    975       add_srs_wkt (p, 5,
................................................................................
  1076   1074           "\",EAST],AUTHORITY[\"EPSG\",\"4687\"]]");
  1077   1075       p = add_epsg_def_ex (filter, first, last, 4688, "epsg", 4688,
  1078   1076           "Fatu Iva 72", 1, 1,
  1079   1077           "International 1924", "Greenwich",
  1080   1078           "Fatu_Iva_72", "none", "degree",
  1081   1079           "Latitude", "North", "Longitude", "East");
  1082   1080       add_proj4text (p, 0,
  1083         -        "+proj=longlat +ellps=intl +towgs84=347.103,1078.125,2623");
         1081  +        "+proj=longlat +ellps=intl +towgs84=347.103,1078.12,2623.");
  1084   1082       add_proj4text (p, 1,
  1085         -        ".922,-33.8875,70.6773,-9.3943,186.074 +no_defs");
         1083  +        "92,-33.8875,70.6773,-9.3943,186.074 +no_defs");
  1086   1084       add_srs_wkt (p, 0,
  1087   1085           "GEOGCS[\"Fatu Iva 72\",DATUM[\"Fatu_Iva_72\",SPHEROID[\"");
  1088   1086       add_srs_wkt (p, 1,
  1089   1087           "International 1924\",6378388,297,AUTHORITY[\"EPSG\",\"70");
  1090   1088       add_srs_wkt (p, 2,
  1091         -        "22\"]],TOWGS84[347.103,1078.125,2623.922,-33.8875,70.677");
         1089  +        "22\"]],TOWGS84[347.103,1078.12,2623.92,-33.8875,70.6773,");
  1092   1090       add_srs_wkt (p, 3,
  1093         -        "3,-9.3943,186.074],AUTHORITY[\"EPSG\",\"6688\"]],PRIMEM[");
         1091  +        "-9.3943,186.074],AUTHORITY[\"EPSG\",\"6688\"]],PRIMEM[\"");
  1094   1092       add_srs_wkt (p, 4,
  1095         -        "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
         1093  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
  1096   1094       add_srs_wkt (p, 5,
  1097         -        "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
         1095  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
  1098   1096       add_srs_wkt (p, 6,
  1099         -        "XIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORI");
         1097  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
  1100   1098       add_srs_wkt (p, 7,
  1101         -        "TY[\"EPSG\",\"4688\"]]");
         1099  +        "[\"EPSG\",\"4688\"]]");
  1102   1100       p = add_epsg_def_ex (filter, first, last, 4689, "epsg", 4689,
  1103   1101           "IGN63 Hiva Oa", 1, 1,
  1104   1102           "International 1924", "Greenwich",
  1105   1103           "IGN63_Hiva_Oa", "none", "degree",
  1106   1104           "Latitude", "North", "Longitude", "East");
  1107   1105       add_proj4text (p, 0,
  1108   1106           "+proj=longlat +ellps=intl +towgs84=410.721,55.049,80.746");
................................................................................
  1251   1249       add_proj4text (p, 0,
  1252   1250           "+proj=longlat +ellps=clrk66 +towgs84=-103.746,-9.614,-25");
  1253   1251       add_proj4text (p, 1,
  1254   1252           "5.95,0,0,0,0 +no_defs");
  1255   1253       add_srs_wkt (p, 0,
  1256   1254           "GEOGCS[\"Katanga 1955\",DATUM[\"Katanga_1955\",SPHEROID[");
  1257   1255       add_srs_wkt (p, 1,
  1258         -        "\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         1256  +        "\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  1259   1257       add_srs_wkt (p, 2,
  1260   1258           "EPSG\",\"7008\"]],TOWGS84[-103.746,-9.614,-255.95,0,0,0,");
  1261   1259       add_srs_wkt (p, 3,
  1262   1260           "0],AUTHORITY[\"EPSG\",\"6695\"]],PRIMEM[\"Greenwich\",0,");
  1263   1261       add_srs_wkt (p, 4,
  1264   1262           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  1265   1263       add_srs_wkt (p, 5,
................................................................................
  1763   1761       add_proj4text (p, 0,
  1764   1762           "+proj=longlat +ellps=clrk66 +towgs84=-2,151,181,0,0,0,0 ");
  1765   1763       add_proj4text (p, 1,
  1766   1764           "+no_defs");
  1767   1765       add_srs_wkt (p, 0,
  1768   1766           "GEOGCS[\"Cape Canaveral\",DATUM[\"Cape_Canaveral\",SPHER");
  1769   1767       add_srs_wkt (p, 1,
  1770         -        "OID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORIT");
         1768  +        "OID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORIT");
  1771   1769       add_srs_wkt (p, 2,
  1772   1770           "Y[\"EPSG\",\"7008\"]],TOWGS84[-2,151,181,0,0,0,0],AUTHOR");
  1773   1771       add_srs_wkt (p, 3,
  1774   1772           "ITY[\"EPSG\",\"6717\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
  1775   1773       add_srs_wkt (p, 4,
  1776   1774           "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
  1777   1775       add_srs_wkt (p, 5,
................................................................................
  1901   1899       add_proj4text (p, 0,
  1902   1900           "+proj=longlat +ellps=clrk66 +towgs84=-179.483,-69.379,-2");
  1903   1901       add_proj4text (p, 1,
  1904   1902           "7.584,-7.862,8.163,6.042,-13.925 +no_defs");
  1905   1903       add_srs_wkt (p, 0,
  1906   1904           "GEOGCS[\"GCGD59\",DATUM[\"Grand_Cayman_Geodetic_Datum_19");
  1907   1905       add_srs_wkt (p, 1,
  1908         -        "59\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213898");
         1906  +        "59\",SPHEROID[\"Clarke 1866\",6378206.4,294.978698213900");
  1909   1907       add_srs_wkt (p, 2,
  1910         -        "2,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-179.483,-69.379");
         1908  +        "6,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[-179.483,-69.379");
  1911   1909       add_srs_wkt (p, 3,
  1912   1910           ",-27.584,-7.862,8.163,6.042,-13.925],AUTHORITY[\"EPSG\",");
  1913   1911       add_srs_wkt (p, 4,
  1914   1912           "\"6723\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  1915   1913       add_srs_wkt (p, 5,
  1916   1914           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  1917   1915       add_srs_wkt (p, 6,
................................................................................
  1974   1972       add_proj4text (p, 0,
  1975   1973           "+proj=longlat +ellps=clrk66 +towgs84=8.853,-52.644,180.3");
  1976   1974       add_proj4text (p, 1,
  1977   1975           "04,-0.393,-2.323,2.96,-24.081 +no_defs");
  1978   1976       add_srs_wkt (p, 0,
  1979   1977           "GEOGCS[\"SIGD61\",DATUM[\"Sister_Islands_Geodetic_Datum_");
  1980   1978       add_srs_wkt (p, 1,
  1981         -        "1961\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138");
         1979  +        "1961\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139");
  1982   1980       add_srs_wkt (p, 2,
  1983         -        "982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[8.853,-52.644,");
         1981  +        "006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS84[8.853,-52.644,");
  1984   1982       add_srs_wkt (p, 3,
  1985   1983           "180.304,-0.393,-2.323,2.96,-24.081],AUTHORITY[\"EPSG\",\"");
  1986   1984       add_srs_wkt (p, 4,
  1987   1985           "6726\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
  1988   1986       add_srs_wkt (p, 5,
  1989   1987           "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
  1990   1988       add_srs_wkt (p, 6,
................................................................................
  2254   2252       add_proj4text (p, 0,
  2255   2253           "+proj=longlat +a=6378293.645208759 +b=6356617.987679838 ");
  2256   2254       add_proj4text (p, 1,
  2257   2255           "+no_defs");
  2258   2256       add_srs_wkt (p, 0,
  2259   2257           "GEOGCS[\"Hong Kong 1963\",DATUM[\"Hong_Kong_1963\",SPHER");
  2260   2258       add_srs_wkt (p, 1,
  2261         -        "OID[\"Clarke 1858\",6378293.645208759,294.2606763692606,");
         2259  +        "OID[\"Clarke 1858\",6378293.645208759,294.2606763692569,");
  2262   2260       add_srs_wkt (p, 2,
  2263   2261           "AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"6738\"");
  2264   2262       add_srs_wkt (p, 3,
  2265   2263           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  2266   2264       add_srs_wkt (p, 4,
  2267   2265           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  2268   2266       add_srs_wkt (p, 5,
................................................................................
  2296   2294           "PZ-90", 1, 1,
  2297   2295           "PZ-90", "Greenwich",
  2298   2296           "Parametrop_Zemp_1990", "none", "degree",
  2299   2297           "Latitude", "North", "Longitude", "East");
  2300   2298       add_proj4text (p, 0,
  2301   2299           "+proj=longlat +a=6378136 +b=6356751.361745712 +towgs84=0");
  2302   2300       add_proj4text (p, 1,
  2303         -        ",0,1.5,0,0,0.076,0 +no_defs");
         2301  +        ",0,1.5,-0,-0,0.076,0 +no_defs");
  2304   2302       add_srs_wkt (p, 0,
  2305   2303           "GEOGCS[\"PZ-90\",DATUM[\"Parametrop_Zemp_1990\",SPHEROID");
  2306   2304       add_srs_wkt (p, 1,
  2307   2305           "[\"PZ-90\",6378136,298.257839303,AUTHORITY[\"EPSG\",\"70");
  2308   2306       add_srs_wkt (p, 2,
  2309         -        "54\"]],TOWGS84[0,0,1.5,0,0,0.076,0],AUTHORITY[\"EPSG\",\"");
         2307  +        "54\"]],TOWGS84[0,0,1.5,-0,-0,0.076,0],AUTHORITY[\"EPSG\"");
  2310   2308       add_srs_wkt (p, 3,
  2311         -        "6740\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
         2309  +        ",\"6740\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2312   2310       add_srs_wkt (p, 4,
  2313         -        "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
         2311  +        "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2314   2312       add_srs_wkt (p, 5,
  2315         -        "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
         2313  +        "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2316   2314       add_srs_wkt (p, 6,
  2317         -        "\",EAST],AUTHORITY[\"EPSG\",\"4740\"]]");
         2315  +        "ude\",EAST],AUTHORITY[\"EPSG\",\"4740\"]]");
  2318   2316       p = add_epsg_def_ex (filter, first, last, 4741, "epsg", 4741,
  2319   2317           "FD54", 1, 1,
  2320   2318           "International 1924", "Greenwich",
  2321   2319           "Faroe_Datum_1954", "none", "degree",
  2322   2320           "Latitude", "North", "Longitude", "East");
  2323   2321       add_proj4text (p, 0,
  2324   2322           "+proj=longlat +ellps=intl +no_defs");
................................................................................
  2478   2476       add_proj4text (p, 1,
  2479   2477           ",391,-36,0,0,0,0 +no_defs");
  2480   2478       add_srs_wkt (p, 0,
  2481   2479           "GEOGCS[\"Vanua Levu 1915\",DATUM[\"Vanua_Levu_1915\",SPH");
  2482   2480       add_srs_wkt (p, 1,
  2483   2481           "EROID[\"Clarke 1880 (international foot)\",6378306.3696,");
  2484   2482       add_srs_wkt (p, 2,
  2485         -        "293.4663076556355,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[");
         2483  +        "293.4663076556349,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[");
  2486   2484       add_srs_wkt (p, 3,
  2487   2485           "51,391,-36,0,0,0,0],AUTHORITY[\"EPSG\",\"6748\"]],PRIMEM");
  2488   2486       add_srs_wkt (p, 4,
  2489   2487           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  2490   2488       add_srs_wkt (p, 5,
  2491   2489           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  2492   2490       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_24.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   135    135       add_proj4text (p, 1,
   136    136           ",391,-36,0,0,0,0 +no_defs");
   137    137       add_srs_wkt (p, 0,
   138    138           "GEOGCS[\"Viti Levu 1912\",DATUM[\"Viti_Levu_1912\",SPHER");
   139    139       add_srs_wkt (p, 1,
   140    140           "OID[\"Clarke 1880 (international foot)\",6378306.3696,29");
   141    141       add_srs_wkt (p, 2,
   142         -        "3.4663076556355,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[51");
          142  +        "3.4663076556349,AUTHORITY[\"EPSG\",\"7055\"]],TOWGS84[51");
   143    143       add_srs_wkt (p, 3,
   144    144           ",391,-36,0,0,0,0],AUTHORITY[\"EPSG\",\"6752\"]],PRIMEM[\"");
   145    145       add_srs_wkt (p, 4,
   146    146           "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
   147    147       add_srs_wkt (p, 5,
   148    148           "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
   149    149       add_srs_wkt (p, 6,
................................................................................
   171    171           "IS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4753\"]]");
   172    172       p = add_epsg_def_ex (filter, first, last, 4754, "epsg", 4754,
   173    173           "LGD2006", 1, 1,
   174    174           "International 1924", "Greenwich",
   175    175           "Libyan_Geodetic_Datum_2006", "none", "degree",
   176    176           "Latitude", "North", "Longitude", "East");
   177    177       add_proj4text (p, 0,
   178         -        "+proj=longlat +ellps=intl +towgs84=-208.4058,-109.8777,-");
          178  +        "+proj=longlat +ellps=intl +towgs84=-208.406,-109.878,-2.");
   179    179       add_proj4text (p, 1,
   180         -        "2.5764,0,0,0,0 +no_defs");
          180  +        "5764,0,0,0,0 +no_defs");
   181    181       add_srs_wkt (p, 0,
   182    182           "GEOGCS[\"LGD2006\",DATUM[\"Libyan_Geodetic_Datum_2006\",");
   183    183       add_srs_wkt (p, 1,
   184    184           "SPHEROID[\"International 1924\",6378388,297,AUTHORITY[\"");
   185    185       add_srs_wkt (p, 2,
   186         -        "EPSG\",\"7022\"]],TOWGS84[-208.4058,-109.8777,-2.5764,0,");
          186  +        "EPSG\",\"7022\"]],TOWGS84[-208.406,-109.878,-2.5764,0,0,");
   187    187       add_srs_wkt (p, 3,
   188         -        "0,0,0],AUTHORITY[\"EPSG\",\"6754\"]],PRIMEM[\"Greenwich\"");
          188  +        "0,0],AUTHORITY[\"EPSG\",\"6754\"]],PRIMEM[\"Greenwich\",");
   189    189       add_srs_wkt (p, 4,
   190         -        ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
          190  +        "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
   191    191       add_srs_wkt (p, 5,
   192         -        "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
          192  +        "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
   193    193       add_srs_wkt (p, 6,
   194         -        "e\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
          194  +        "\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
   195    195       add_srs_wkt (p, 7,
   196    196           "4754\"]]");
   197    197       p = add_epsg_def_ex (filter, first, last, 4755, "epsg", 4755,
   198    198           "DGN95", 1, 1,
   199    199           "WGS 84", "Greenwich",
   200    200           "Datum_Geodesi_Nasional_1995", "none", "degree",
   201    201           "Latitude", "North", "Longitude", "East");
................................................................................
  1830   1830       add_proj4text (p, 1,
  1831   1831           "320,0,0,0,0 +pm=paris +no_defs");
  1832   1832       add_srs_wkt (p, 0,
  1833   1833           "GEOGCS[\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Fr");
  1834   1834       add_srs_wkt (p, 1,
  1835   1835           "ancaise_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2");
  1836   1836       add_srs_wkt (p, 2,
  1837         -        ",293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
         1837  +        ",293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
  1838   1838       add_srs_wkt (p, 3,
  1839   1839           "[-168,-60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRI");
  1840   1840       add_srs_wkt (p, 4,
  1841   1841           "MEM[\"Paris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],U");
  1842   1842       add_srs_wkt (p, 5,
  1843   1843           "NIT[\"grad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"91");
  1844   1844       add_srs_wkt (p, 6,
................................................................................
  1922   1922       add_proj4text (p, 1,
  1923   1923           "227,0,0,0,0 +pm=paris +no_defs");
  1924   1924       add_srs_wkt (p, 0,
  1925   1925           "GEOGCS[\"Voirol 1875 (Paris)\",DATUM[\"Voirol_1875_Paris");
  1926   1926       add_srs_wkt (p, 1,
  1927   1927           "\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602129");
  1928   1928       add_srs_wkt (p, 2,
  1929         -        "36269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-73,-247,227");
         1929  +        "36265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-73,-247,227");
  1930   1930       add_srs_wkt (p, 3,
  1931   1931           ",0,0,0,0],AUTHORITY[\"EPSG\",\"6811\"]],PRIMEM[\"Paris\"");
  1932   1932       add_srs_wkt (p, 4,
  1933   1933           ",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",");
  1934   1934       add_srs_wkt (p, 5,
  1935   1935           "0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"");
  1936   1936       add_srs_wkt (p, 6,
................................................................................
  2047   2047       add_proj4text (p, 0,
  2048   2048           "+proj=longlat +a=6378249.2 +b=6356515 +towgs84=-263,6,43");
  2049   2049       add_proj4text (p, 1,
  2050   2050           "1,0,0,0,0 +pm=paris +no_defs");
  2051   2051       add_srs_wkt (p, 0,
  2052   2052           "GEOGCS[\"Carthage (Paris)\",DATUM[\"Carthage_Paris\",SPH");
  2053   2053       add_srs_wkt (p, 1,
  2054         -        "EROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936269,");
         2054  +        "EROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936265,");
  2055   2055       add_srs_wkt (p, 2,
  2056   2056           "AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-263,6,431,0,0,0,0");
  2057   2057       add_srs_wkt (p, 3,
  2058   2058           "],AUTHORITY[\"EPSG\",\"6816\"]],PRIMEM[\"Paris\",2.33722");
  2059   2059       add_srs_wkt (p, 4,
  2060   2060           "917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.015707");
  2061   2061       add_srs_wkt (p, 5,
................................................................................
  2118   2118           "gitude\",EAST],AUTHORITY[\"EPSG\",\"4818\"]]");
  2119   2119       p = add_epsg_def_ex (filter, first, last, 4819, "epsg", 4819,
  2120   2120           "Nord Sahara 1959 (Paris)", 1, 1,
  2121   2121           "Clarke 1880 (RGS)", "Paris",
  2122   2122           "Nord_Sahara_1959_Paris", "none", "grad",
  2123   2123           "Latitude", "North", "Longitude", "East");
  2124   2124       add_proj4text (p, 0,
  2125         -        "+proj=longlat +ellps=clrk80 +towgs84=-209.3622,-87.8162,");
         2125  +        "+proj=longlat +ellps=clrk80 +towgs84=-209.362,-87.8162,4");
  2126   2126       add_proj4text (p, 1,
  2127         -        "404.6198,0.0046,3.4784,0.5805,-1.4547 +pm=paris +no_defs");
         2127  +        "04.62,0.0046,3.4784,0.5805,-1.4547 +pm=paris +no_defs");
  2128   2128       add_srs_wkt (p, 0,
  2129   2129           "GEOGCS[\"Nord Sahara 1959 (Paris)\",DATUM[\"Nord_Sahara_");
  2130   2130       add_srs_wkt (p, 1,
  2131   2131           "1959_Paris\",SPHEROID[\"Clarke 1880 (RGS)\",6378249.145,");
  2132   2132       add_srs_wkt (p, 2,
  2133         -        "293.465,AUTHORITY[\"EPSG\",\"7012\"]],TOWGS84[-209.3622,");
         2133  +        "293.465,AUTHORITY[\"EPSG\",\"7012\"]],TOWGS84[-209.362,-");
  2134   2134       add_srs_wkt (p, 3,
  2135         -        "-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547],AUTHORIT");
         2135  +        "87.8162,404.62,0.0046,3.4784,0.5805,-1.4547],AUTHORITY[\"");
  2136   2136       add_srs_wkt (p, 4,
  2137         -        "Y[\"EPSG\",\"6819\"]],PRIMEM[\"Paris\",2.33722917,AUTHOR");
         2137  +        "EPSG\",\"6819\"]],PRIMEM[\"Paris\",2.33722917,AUTHORITY[");
  2138   2138       add_srs_wkt (p, 5,
  2139         -        "ITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.0157079632679489");
         2139  +        "\"EPSG\",\"8903\"]],UNIT[\"grad\",0.01570796326794897,AU");
  2140   2140       add_srs_wkt (p, 6,
  2141         -        "7,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"Latitude\",NORTH]");
         2141  +        "THORITY[\"EPSG\",\"9105\"]],AXIS[\"Latitude\",NORTH],AXI");
  2142   2142       add_srs_wkt (p, 7,
  2143         -        ",AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4819\"]]");
         2143  +        "S[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4819\"]]");
  2144   2144       p = add_epsg_def_ex (filter, first, last, 4820, "epsg", 4820,
  2145   2145           "Segara (Jakarta)", 1, 1,
  2146   2146           "Bessel 1841", "Jakarta",
  2147   2147           "Gunung_Segara_Jakarta", "none", "degree",
  2148   2148           "Latitude", "North", "Longitude", "East");
  2149   2149       add_proj4text (p, 0,
  2150   2150           "+proj=longlat +ellps=bessel +towgs84=-403,684,41,0,0,0,0");
................................................................................
  2174   2174       add_proj4text (p, 0,
  2175   2175           "+proj=longlat +a=6378249.2 +b=6356515 +pm=paris +no_defs");
  2176   2176       add_srs_wkt (p, 0,
  2177   2177           "GEOGCS[\"Voirol 1879 (Paris)\",DATUM[\"Voirol_1879_Paris");
  2178   2178       add_srs_wkt (p, 1,
  2179   2179           "\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602129");
  2180   2180       add_srs_wkt (p, 2,
  2181         -        "36269,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\",\"");
         2181  +        "36265,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\",\"");
  2182   2182       add_srs_wkt (p, 3,
  2183   2183           "6821\"]],PRIMEM[\"Paris\",2.33722917,AUTHORITY[\"EPSG\",");
  2184   2184       add_srs_wkt (p, 4,
  2185   2185           "\"8903\"]],UNIT[\"grad\",0.01570796326794897,AUTHORITY[\"");
  2186   2186       add_srs_wkt (p, 5,
  2187   2187           "EPSG\",\"9105\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  2188   2188       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_25.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   219    219           "EPSG\",\"4902\"]]");
   220    220       p = add_epsg_def_ex (filter, first, last, 4903, "epsg", 4903,
   221    221           "Madrid 1870 (Madrid)", 1, 1,
   222    222           "Struve 1860", "Madrid",
   223    223           "Madrid_1870_Madrid", "none", "degree",
   224    224           "Latitude", "North", "Longitude", "East");
   225    225       add_proj4text (p, 0,
   226         -        "+proj=longlat +a=6378298.3 +b=6356657.142669562 +pm=madr");
          226  +        "+proj=longlat +a=6378298.3 +b=6356657.142669561 +pm=madr");
   227    227       add_proj4text (p, 1,
   228    228           "id +no_defs");
   229    229       add_srs_wkt (p, 0,
   230    230           "GEOGCS[\"Madrid 1870 (Madrid)\",DATUM[\"Madrid_1870_Madr");
   231    231       add_srs_wkt (p, 1,
   232    232           "id\",SPHEROID[\"Struve 1860\",6378298.3,294.73,AUTHORITY");
   233    233       add_srs_wkt (p, 2,
................................................................................
   555    555       add_proj4text (p, 1,
   556    556           "x_0=0 +y_0=0 +datum=NAD27 +units=m +no_defs");
   557    557       add_srs_wkt (p, 0,
   558    558           "PROJCS[\"NAD27 / Conus Albers\",GEOGCS[\"NAD27\",DATUM[\"");
   559    559       add_srs_wkt (p, 1,
   560    560           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
   561    561       add_srs_wkt (p, 2,
   562         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
          562  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
   563    563       add_srs_wkt (p, 3,
   564    564           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
   565    565       add_srs_wkt (p, 4,
   566    566           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
   567    567       add_srs_wkt (p, 5,
   568    568           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
   569    569       add_srs_wkt (p, 6,
................................................................................
  2690   2690           "ORITY[\"EPSG\",\"5229\"]]");
  2691   2691       p = add_epsg_def_ex (filter, first, last, 5233, "epsg", 5233,
  2692   2692           "SLD99", 1, 1,
  2693   2693           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2694   2694           "Sri_Lanka_Datum_1999", "none", "degree",
  2695   2695           "Latitude", "North", "Longitude", "East");
  2696   2696       add_proj4text (p, 0,
  2697         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
         2697  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
  2698   2698       add_proj4text (p, 1,
  2699         -        "84=-0.293,766.95,87.713,0.195704,1.695068,3.473016,-0.03");
         2699  +        "4=-0.293,766.95,87.713,0.195704,1.69507,3.47302,-0.03933");
  2700   2700       add_proj4text (p, 2,
  2701         -        "9338 +no_defs");
         2701  +        "8 +no_defs");
  2702   2702       add_srs_wkt (p, 0,
  2703   2703           "GEOGCS[\"SLD99\",DATUM[\"Sri_Lanka_Datum_1999\",SPHEROID");
  2704   2704       add_srs_wkt (p, 1,
  2705   2705           "[\"Everest 1830 (1937 Adjustment)\",6377276.345,300.8017");
  2706   2706       add_srs_wkt (p, 2,
  2707   2707           ",AUTHORITY[\"EPSG\",\"7015\"]],TOWGS84[-0.293,766.95,87.");
  2708   2708       add_srs_wkt (p, 3,
  2709         -        "713,0.195704,1.695068,3.473016,-0.039338],AUTHORITY[\"EP");
         2709  +        "713,0.195704,1.69507,3.47302,-0.039338],AUTHORITY[\"EPSG");
  2710   2710       add_srs_wkt (p, 4,
  2711         -        "SG\",\"1053\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         2711  +        "\",\"1053\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  2712   2712       add_srs_wkt (p, 5,
  2713         -        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         2713  +        "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  2714   2714       add_srs_wkt (p, 6,
  2715         -        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         2715  +        "\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Long");
  2716   2716       add_srs_wkt (p, 7,
  2717         -        "gitude\",EAST],AUTHORITY[\"EPSG\",\"5233\"]]");
         2717  +        "itude\",EAST],AUTHORITY[\"EPSG\",\"5233\"]]");
  2718   2718       p = add_epsg_def_ex (filter, first, last, 5234, "epsg", 5234,
  2719   2719           "Kandawala / Sri Lanka Grid", 0, 0,
  2720   2720           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2721   2721           "Kandawala", "Transverse_Mercator", "metre",
  2722   2722           "Easting", "East", "Northing", "North");
  2723   2723       add_proj4text (p, 0,
  2724   2724           "+proj=tmerc +lat_0=7.000480277777778 +lon_0=80.771711111");
  2725   2725       add_proj4text (p, 1,
  2726   2726           "11112 +k=0.9999238418 +x_0=200000 +y_0=200000 +a=6377276");
  2727   2727       add_proj4text (p, 2,
  2728         -        ".345 +b=6356075.413140239 +towgs84=-97,787,86,0,0,0,0 +u");
         2728  +        ".345 +b=6356075.41314024 +towgs84=-97,787,86,0,0,0,0 +un");
  2729   2729       add_proj4text (p, 3,
  2730         -        "nits=m +no_defs");
         2730  +        "its=m +no_defs");
  2731   2731       add_srs_wkt (p, 0,
  2732   2732           "PROJCS[\"Kandawala / Sri Lanka Grid\",GEOGCS[\"Kandawala");
  2733   2733       add_srs_wkt (p, 1,
  2734   2734           "\",DATUM[\"Kandawala\",SPHEROID[\"Everest 1830 (1937 Adj");
  2735   2735       add_srs_wkt (p, 2,
  2736   2736           "ustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"701");
  2737   2737       add_srs_wkt (p, 3,
................................................................................
  2764   2764           "Sri_Lanka_Datum_1999", "Transverse_Mercator", "metre",
  2765   2765           "Easting", "East", "Northing", "North");
  2766   2766       add_proj4text (p, 0,
  2767   2767           "+proj=tmerc +lat_0=7.000471527777778 +lon_0=80.771713083");
  2768   2768       add_proj4text (p, 1,
  2769   2769           "33334 +k=0.9999238418 +x_0=500000 +y_0=500000 +a=6377276");
  2770   2770       add_proj4text (p, 2,
  2771         -        ".345 +b=6356075.413140239 +towgs84=-0.293,766.95,87.713,");
         2771  +        ".345 +b=6356075.41314024 +towgs84=-0.293,766.95,87.713,0");
  2772   2772       add_proj4text (p, 3,
  2773         -        "0.195704,1.695068,3.473016,-0.039338 +units=m +no_defs");
         2773  +        ".195704,1.69507,3.47302,-0.039338 +units=m +no_defs");
  2774   2774       add_srs_wkt (p, 0,
  2775   2775           "PROJCS[\"SLD99 / Sri Lanka Grid 1999\",GEOGCS[\"SLD99\",");
  2776   2776       add_srs_wkt (p, 1,
  2777   2777           "DATUM[\"Sri_Lanka_Datum_1999\",SPHEROID[\"Everest 1830 (");
  2778   2778       add_srs_wkt (p, 2,
  2779   2779           "1937 Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG");
  2780   2780       add_srs_wkt (p, 3,
  2781   2781           "\",\"7015\"]],TOWGS84[-0.293,766.95,87.713,0.195704,1.69");
  2782   2782       add_srs_wkt (p, 4,
  2783         -        "5068,3.473016,-0.039338],AUTHORITY[\"EPSG\",\"1053\"]],P");
         2783  +        "507,3.47302,-0.039338],AUTHORITY[\"EPSG\",\"1053\"]],PRI");
  2784   2784       add_srs_wkt (p, 5,
  2785         -        "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
         2785  +        "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  2786   2786       add_srs_wkt (p, 6,
  2787         -        "[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122");
         2787  +        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  2788   2788       add_srs_wkt (p, 7,
  2789         -        "\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],A");
         2789  +        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
  2790   2790       add_srs_wkt (p, 8,
  2791         -        "UTHORITY[\"EPSG\",\"5233\"]],PROJECTION[\"Transverse_Mer");
         2791  +        "ORITY[\"EPSG\",\"5233\"]],PROJECTION[\"Transverse_Mercat");
  2792   2792       add_srs_wkt (p, 9,
  2793         -        "cator\"],PARAMETER[\"latitude_of_origin\",7.000471527777");
         2793  +        "or\"],PARAMETER[\"latitude_of_origin\",7.000471527777778");
  2794   2794       add_srs_wkt (p, 10,
  2795         -        "778],PARAMETER[\"central_meridian\",80.77171308333334],P");
         2795  +        "],PARAMETER[\"central_meridian\",80.77171308333334],PARA");
  2796   2796       add_srs_wkt (p, 11,
  2797         -        "ARAMETER[\"scale_factor\",0.9999238418],PARAMETER[\"fals");
         2797  +        "METER[\"scale_factor\",0.9999238418],PARAMETER[\"false_e");
  2798   2798       add_srs_wkt (p, 12,
  2799         -        "e_easting\",500000],PARAMETER[\"false_northing\",500000]");
         2799  +        "asting\",500000],PARAMETER[\"false_northing\",500000],UN");
  2800   2800       add_srs_wkt (p, 13,
  2801         -        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"E");
         2801  +        "IT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"East");
  2802   2802       add_srs_wkt (p, 14,
  2803         -        "asting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG");
         2803  +        "ing\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",");
  2804   2804       add_srs_wkt (p, 15,
  2805         -        "\",\"5235\"]]");
         2805  +        "\"5235\"]]");
  2806   2806       p = add_epsg_def_ex (filter, first, last, 5243, "epsg", 5243,
  2807   2807           "ETRS89 / LCC Germany (E-N)", 0, 0,
  2808   2808           "GRS 1980", "Greenwich",
  2809   2809           "European_Terrestrial_Reference_System_1989", "Lambert_Conformal_Conic_2SP", "metre",
  2810   2810           "Easting", "East", "Northing", "North");
  2811   2811       add_proj4text (p, 0,
  2812   2812           "+proj=lcc +lat_1=48.66666666666666 +lat_2=53.66666666666");

Changes to src/srsinit/epsg_inlined_26.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1889   1889       add_proj4text (p, 0,
  1890   1890           "+proj=longlat +ellps=clrk66 +towgs84=205,96,-98,0,0,0,0 ");
  1891   1891       add_proj4text (p, 1,
  1892   1892           "+no_defs");
  1893   1893       add_srs_wkt (p, 0,
  1894   1894           "GEOGCS[\"Ocotepeque 1935\",DATUM[\"Ocotepeque_1935\",SPH");
  1895   1895       add_srs_wkt (p, 1,
  1896         -        "EROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHOR");
         1896  +        "EROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHOR");
  1897   1897       add_srs_wkt (p, 2,
  1898   1898           "ITY[\"EPSG\",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTH");
  1899   1899       add_srs_wkt (p, 3,
  1900   1900           "ORITY[\"EPSG\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
  1901   1901       add_srs_wkt (p, 4,
  1902   1902           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
  1903   1903       add_srs_wkt (p, 5,
................................................................................
  1918   1918       add_proj4text (p, 3,
  1919   1919           "0,0 +units=m +no_defs");
  1920   1920       add_srs_wkt (p, 0,
  1921   1921           "PROJCS[\"Ocotepeque 1935 / Costa Rica Norte\",GEOGCS[\"O");
  1922   1922       add_srs_wkt (p, 1,
  1923   1923           "cotepeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Cl");
  1924   1924       add_srs_wkt (p, 2,
  1925         -        "arke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG");
         1925  +        "arke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG");
  1926   1926       add_srs_wkt (p, 3,
  1927   1927           "\",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EP");
  1928   1928       add_srs_wkt (p, 4,
  1929   1929           "SG\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  1930   1930       add_srs_wkt (p, 5,
  1931   1931           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  1932   1932       add_srs_wkt (p, 6,
................................................................................
  1959   1959       add_proj4text (p, 2,
  1960   1960           "+towgs84=205,96,-98,0,0,0,0 +units=m +no_defs");
  1961   1961       add_srs_wkt (p, 0,
  1962   1962           "PROJCS[\"Ocotepeque 1935 / Costa Rica Sur\",GEOGCS[\"Oco");
  1963   1963       add_srs_wkt (p, 1,
  1964   1964           "tepeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Clar");
  1965   1965       add_srs_wkt (p, 2,
  1966         -        "ke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         1966  +        "ke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  1967   1967       add_srs_wkt (p, 3,
  1968   1968           ",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EPSG");
  1969   1969       add_srs_wkt (p, 4,
  1970   1970           "\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  1971   1971       add_srs_wkt (p, 5,
  1972   1972           "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  1973   1973       add_srs_wkt (p, 6,
................................................................................
  2000   2000       add_proj4text (p, 2,
  2001   2001           "0 +y_0=292209.579 +datum=NAD27 +units=m +no_defs");
  2002   2002       add_srs_wkt (p, 0,
  2003   2003           "PROJCS[\"Ocotepeque 1935 / Guatemala Norte (deprecated)\"");
  2004   2004       add_srs_wkt (p, 1,
  2005   2005           ",GEOGCS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SP");
  2006   2006       add_srs_wkt (p, 2,
  2007         -        "HEROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHO");
         2007  +        "HEROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHO");
  2008   2008       add_srs_wkt (p, 3,
  2009   2009           "RITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],P");
  2010   2010       add_srs_wkt (p, 4,
  2011   2011           "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
  2012   2012       add_srs_wkt (p, 5,
  2013   2013           "[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122");
  2014   2014       add_srs_wkt (p, 6,
................................................................................
  2041   2041       add_proj4text (p, 2,
  2042   2042           "lrk66 +towgs84=205,96,-98,0,0,0,0 +units=m +no_defs");
  2043   2043       add_srs_wkt (p, 0,
  2044   2044           "PROJCS[\"Ocotepeque 1935 / Guatemala Sur\",GEOGCS[\"Ocot");
  2045   2045       add_srs_wkt (p, 1,
  2046   2046           "epeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Clark");
  2047   2047       add_srs_wkt (p, 2,
  2048         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
         2048  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
  2049   2049       add_srs_wkt (p, 3,
  2050   2050           "\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EPSG\"");
  2051   2051       add_srs_wkt (p, 4,
  2052   2052           ",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2053   2053       add_srs_wkt (p, 5,
  2054   2054           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2055   2055       add_srs_wkt (p, 6,
................................................................................
  2084   2084       add_proj4text (p, 3,
  2085   2085           "o_defs");
  2086   2086       add_srs_wkt (p, 0,
  2087   2087           "PROJCS[\"Ocotepeque 1935 / El Salvador Lambert\",GEOGCS[");
  2088   2088       add_srs_wkt (p, 1,
  2089   2089           "\"Ocotepeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"");
  2090   2090       add_srs_wkt (p, 2,
  2091         -        "Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EP");
         2091  +        "Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EP");
  2092   2092       add_srs_wkt (p, 3,
  2093   2093           "SG\",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"");
  2094   2094       add_srs_wkt (p, 4,
  2095   2095           "EPSG\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2096   2096       add_srs_wkt (p, 5,
  2097   2097           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2098   2098       add_srs_wkt (p, 6,
................................................................................
  2127   2127       add_proj4text (p, 3,
  2128   2128           "+no_defs");
  2129   2129       add_srs_wkt (p, 0,
  2130   2130           "PROJCS[\"Ocotepeque 1935 / Nicaragua Norte\",GEOGCS[\"Oc");
  2131   2131       add_srs_wkt (p, 1,
  2132   2132           "otepeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Cla");
  2133   2133       add_srs_wkt (p, 2,
  2134         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         2134  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  2135   2135       add_srs_wkt (p, 3,
  2136   2136           ",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EPSG");
  2137   2137       add_srs_wkt (p, 4,
  2138   2138           "\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  2139   2139       add_srs_wkt (p, 5,
  2140   2140           "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  2141   2141       add_srs_wkt (p, 6,
................................................................................
  2170   2170       add_proj4text (p, 3,
  2171   2171           "units=m +no_defs");
  2172   2172       add_srs_wkt (p, 0,
  2173   2173           "PROJCS[\"Ocotepeque 1935 / Nicaragua Sur\",GEOGCS[\"Ocot");
  2174   2174       add_srs_wkt (p, 1,
  2175   2175           "epeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Clark");
  2176   2176       add_srs_wkt (p, 2,
  2177         -        "e 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",");
         2177  +        "e 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",");
  2178   2178       add_srs_wkt (p, 3,
  2179   2179           "\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EPSG\"");
  2180   2180       add_srs_wkt (p, 4,
  2181   2181           ",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  2182   2182       add_srs_wkt (p, 5,
  2183   2183           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  2184   2184       add_srs_wkt (p, 6,
................................................................................
  2246   2246       add_proj4text (p, 1,
  2247   2247           "+no_defs");
  2248   2248       add_srs_wkt (p, 0,
  2249   2249           "GEOGCS[\"Sibun Gorge 1922\",DATUM[\"Sibun_Gorge_1922\",S");
  2250   2250       add_srs_wkt (p, 1,
  2251   2251           "PHEROID[\"Clarke 1858\",6378293.645208759,294.2606763692");
  2252   2252       add_srs_wkt (p, 2,
  2253         -        "606,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"1");
         2253  +        "569,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"1");
  2254   2254       add_srs_wkt (p, 3,
  2255   2255           "071\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901");
  2256   2256       add_srs_wkt (p, 4,
  2257   2257           "\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG");
  2258   2258       add_srs_wkt (p, 5,
  2259   2259           "\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\"");
  2260   2260       add_srs_wkt (p, 6,
................................................................................
  2271   2271       add_proj4text (p, 2,
  2272   2272           "78293.645208759 +b=6356617.987679838 +units=m +no_defs");
  2273   2273       add_srs_wkt (p, 0,
  2274   2274           "PROJCS[\"Sibun Gorge 1922 / Colony Grid (deprecated)\",G");
  2275   2275       add_srs_wkt (p, 1,
  2276   2276           "EOGCS[\"Sibun Gorge 1922\",DATUM[\"Sibun_Gorge_1922\",SP");
  2277   2277       add_srs_wkt (p, 2,
  2278         -        "HEROID[\"Clarke 1858\",6378293.645208759,294.26067636926");
         2278  +        "HEROID[\"Clarke 1858\",6378293.645208759,294.26067636925");
  2279   2279       add_srs_wkt (p, 3,
  2280         -        "06,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"10");
         2280  +        "69,AUTHORITY[\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"10");
  2281   2281       add_srs_wkt (p, 4,
  2282   2282           "71\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
  2283   2283       add_srs_wkt (p, 5,
  2284   2284           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
  2285   2285       add_srs_wkt (p, 6,
  2286   2286           ",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",");
  2287   2287       add_srs_wkt (p, 7,
................................................................................
  2306   2306           "Panama_Colon_1911", "none", "degree",
  2307   2307           "Latitude", "North", "Longitude", "East");
  2308   2308       add_proj4text (p, 0,
  2309   2309           "+proj=longlat +ellps=clrk66 +no_defs");
  2310   2310       add_srs_wkt (p, 0,
  2311   2311           "GEOGCS[\"Panama-Colon 1911\",DATUM[\"Panama_Colon_1911\"");
  2312   2312       add_srs_wkt (p, 1,
  2313         -        ",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982,AU");
         2313  +        ",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982139006,AU");
  2314   2314       add_srs_wkt (p, 2,
  2315   2315           "THORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"1072\"]");
  2316   2316       add_srs_wkt (p, 3,
  2317   2317           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2318   2318       add_srs_wkt (p, 4,
  2319   2319           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2320   2320       add_srs_wkt (p, 5,
................................................................................
  2333   2333       add_proj4text (p, 2,
  2334   2334           "03 +ellps=clrk66 +units=m +no_defs");
  2335   2335       add_srs_wkt (p, 0,
  2336   2336           "PROJCS[\"Panama-Colon 1911 / Panama Lambert\",GEOGCS[\"P");
  2337   2337       add_srs_wkt (p, 1,
  2338   2338           "anama-Colon 1911\",DATUM[\"Panama_Colon_1911\",SPHEROID[");
  2339   2339       add_srs_wkt (p, 2,
  2340         -        "\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         2340  +        "\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  2341   2341       add_srs_wkt (p, 3,
  2342   2342           "EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"1072\"]],PRIMEM[\"");
  2343   2343       add_srs_wkt (p, 4,
  2344   2344           "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
  2345   2345       add_srs_wkt (p, 5,
  2346   2346           "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
  2347   2347       add_srs_wkt (p, 6,
................................................................................
  2372   2372       add_proj4text (p, 2,
  2373   2373           "no_defs");
  2374   2374       add_srs_wkt (p, 0,
  2375   2375           "PROJCS[\"Panama-Colon 1911 / Panama Polyconic\",GEOGCS[\"");
  2376   2376       add_srs_wkt (p, 1,
  2377   2377           "Panama-Colon 1911\",DATUM[\"Panama_Colon_1911\",SPHEROID");
  2378   2378       add_srs_wkt (p, 2,
  2379         -        "[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         2379  +        "[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  2380   2380       add_srs_wkt (p, 3,
  2381   2381           "EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"1072\"]],PRIMEM[\"");
  2382   2382       add_srs_wkt (p, 4,
  2383   2383           "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
  2384   2384       add_srs_wkt (p, 5,
  2385   2385           "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
  2386   2386       add_srs_wkt (p, 6,
................................................................................
  2887   2887           "CI1979 / Chatham Islands Map Grid", 0, 1,
  2888   2888           "International 1924", "Greenwich",
  2889   2889           "Chatham_Islands_Datum_1979", "Transverse_Mercator", "metre",
  2890   2890           "Northing", "North", "Easting", "East");
  2891   2891       add_proj4text (p, 0,
  2892   2892           "+proj=tmerc +lat_0=-44 +lon_0=-176.5 +k=1 +x_0=350000 +y");
  2893   2893       add_proj4text (p, 1,
  2894         -        "_0=650000 +ellps=intl +towgs84=174.05,-25.49,112.57,0,0,");
         2894  +        "_0=650000 +ellps=intl +towgs84=174.05,-25.49,112.57,-0,-");
  2895   2895       add_proj4text (p, 2,
  2896         -        "0.554,0.2263 +units=m +no_defs");
         2896  +        "0,0.554,0.2263 +units=m +no_defs");
  2897   2897       add_srs_wkt (p, 0,
  2898   2898           "PROJCS[\"CI1979 / Chatham Islands Map Grid\",GEOGCS[\"Ch");
  2899   2899       add_srs_wkt (p, 1,
  2900   2900           "atham Islands 1979\",DATUM[\"Chatham_Islands_Datum_1979\"");
  2901   2901       add_srs_wkt (p, 2,
  2902   2902           ",SPHEROID[\"International 1924\",6378388,297,AUTHORITY[\"");
  2903   2903       add_srs_wkt (p, 3,
  2904         -        "EPSG\",\"7022\"]],TOWGS84[174.05,-25.49,112.57,0,0,0.554");
  2905         -    add_srs_wkt (p, 4,
  2906         -        ",0.2263],AUTHORITY[\"EPSG\",\"6673\"]],PRIMEM[\"Greenwic");
  2907         -    add_srs_wkt (p, 5,
  2908         -        "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
  2909         -    add_srs_wkt (p, 6,
  2910         -        "74532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lati");
  2911         -    add_srs_wkt (p, 7,
  2912         -        "tude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\"");
  2913         -    add_srs_wkt (p, 8,
  2914         -        ",\"4673\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETE");
  2915         -    add_srs_wkt (p, 9,
  2916         -        "R[\"latitude_of_origin\",-44],PARAMETER[\"central_meridi");
  2917         -    add_srs_wkt (p, 10,
  2918         -        "an\",-176.5],PARAMETER[\"scale_factor\",1],PARAMETER[\"f");
  2919         -    add_srs_wkt (p, 11,
  2920         -        "alse_easting\",350000],PARAMETER[\"false_northing\",6500");
  2921         -    add_srs_wkt (p, 12,
  2922         -        "00],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[");
  2923         -    add_srs_wkt (p, 13,
  2924         -        "\"Northing\",NORTH],AXIS[\"Easting\",EAST],AUTHORITY[\"E");
         2904  +        "EPSG\",\"7022\"]],TOWGS84[174.05,-25.49,112.57,-0,-0,0.5");
         2905  +    add_srs_wkt (p, 4,
         2906  +        "54,0.2263],AUTHORITY[\"EPSG\",\"6673\"]],PRIMEM[\"Greenw");
         2907  +    add_srs_wkt (p, 5,
         2908  +        "ich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.");
         2909  +    add_srs_wkt (p, 6,
         2910  +        "0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"La");
         2911  +    add_srs_wkt (p, 7,
         2912  +        "titude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPS");
         2913  +    add_srs_wkt (p, 8,
         2914  +        "G\",\"4673\"]],PROJECTION[\"Transverse_Mercator\"],PARAM");
         2915  +    add_srs_wkt (p, 9,
         2916  +        "ETER[\"latitude_of_origin\",-44],PARAMETER[\"central_mer");
         2917  +    add_srs_wkt (p, 10,
         2918  +        "idian\",-176.5],PARAMETER[\"scale_factor\",1],PARAMETER[");
         2919  +    add_srs_wkt (p, 11,
         2920  +        "\"false_easting\",350000],PARAMETER[\"false_northing\",6");
         2921  +    add_srs_wkt (p, 12,
         2922  +        "50000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AX");
         2923  +    add_srs_wkt (p, 13,
         2924  +        "IS[\"Northing\",NORTH],AXIS[\"Easting\",EAST],AUTHORITY[");
  2925   2925       add_srs_wkt (p, 14,
  2926         -        "PSG\",\"5519\"]]");
         2926  +        "\"EPSG\",\"5519\"]]");
  2927   2927       p = add_epsg_def_ex (filter, first, last, 5520, "epsg", 5520,
  2928   2928           "DHDN / 3-degree Gauss-Kruger zone 1", 0, 1,
  2929   2929           "Bessel 1841", "Greenwich",
  2930   2930           "Deutsches_Hauptdreiecksnetz", "Transverse_Mercator", "metre",
  2931   2931           "X", "North", "Y", "East");
  2932   2932       add_proj4text (p, 0,
  2933   2933           "+proj=tmerc +lat_0=0 +lon_0=3 +k=1 +x_0=1500000 +y_0=0 +");
................................................................................
  3695   3695       add_proj4text (p, 3,
  3696   3696           "0,0 +units=m +no_defs");
  3697   3697       add_srs_wkt (p, 0,
  3698   3698           "PROJCS[\"Ocotepeque 1935 / Guatemala Norte\",GEOGCS[\"Oc");
  3699   3699       add_srs_wkt (p, 1,
  3700   3700           "otepeque 1935\",DATUM[\"Ocotepeque_1935\",SPHEROID[\"Cla");
  3701   3701       add_srs_wkt (p, 2,
  3702         -        "rke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\"");
         3702  +        "rke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\"");
  3703   3703       add_srs_wkt (p, 3,
  3704   3704           ",\"7008\"]],TOWGS84[205,96,-98,0,0,0,0],AUTHORITY[\"EPSG");
  3705   3705       add_srs_wkt (p, 4,
  3706   3706           "\",\"1070\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",");
  3707   3707       add_srs_wkt (p, 5,
  3708   3708           "\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[");
  3709   3709       add_srs_wkt (p, 6,
................................................................................
  3726   3726           "RITY[\"EPSG\",\"5559\"]]");
  3727   3727       p = add_epsg_def_ex (filter, first, last, 5561, "epsg", 5561,
  3728   3728           "UCS-2000", 1, 1,
  3729   3729           "Krassowsky 1940", "Greenwich",
  3730   3730           "Ukraine_2000", "none", "degree",
  3731   3731           "Latitude", "North", "Longitude", "East");
  3732   3732       add_proj4text (p, 0,
  3733         -        "+proj=longlat +ellps=krass +towgs84=25,-141,-78.5,0,0.35");
         3733  +        "+proj=longlat +ellps=krass +towgs84=25,-141,-78.5,-0,0.3");
  3734   3734       add_proj4text (p, 1,
  3735         -        ",0.736,0 +no_defs");
         3735  +        "5,0.736,0 +no_defs");
  3736   3736       add_srs_wkt (p, 0,
  3737   3737           "GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Kr");
  3738   3738       add_srs_wkt (p, 1,
  3739   3739           "assowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"");
  3740   3740       add_srs_wkt (p, 2,
  3741         -        "]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPS");
         3741  +        "]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EP");
  3742   3742       add_srs_wkt (p, 3,
  3743         -        "G\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         3743  +        "SG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  3744   3744       add_srs_wkt (p, 4,
  3745   3745           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  3746   3746       add_srs_wkt (p, 5,
  3747   3747           "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  3748   3748       add_srs_wkt (p, 6,
  3749   3749           "gitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]]");
  3750   3750   }
  3751   3751   
  3752   3752   #endif /* full EPSG initialization enabled/disabled */
  3753   3753   

Changes to src/srsinit/epsg_inlined_27.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "UCS-2000 / Gauss-Kruger zone 4", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Ukraine_2000", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=4500000 +y_0=0 ");
    64     64       add_proj4text (p, 1,
    65         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
           65  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
    66     66       add_proj4text (p, 2,
    67         -        "s=m +no_defs");
           67  +        "ts=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"UCS-2000 / Gauss-Kruger zone 4\",GEOGCS[\"UCS-2");
    70     70       add_srs_wkt (p, 1,
    71     71           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
    72     72       add_srs_wkt (p, 2,
    73     73           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
    74     74       add_srs_wkt (p, 3,
    75         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
    76         -    add_srs_wkt (p, 4,
    77         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
    78         -    add_srs_wkt (p, 5,
    79         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
    80         -    add_srs_wkt (p, 6,
    81         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
    82         -    add_srs_wkt (p, 7,
    83         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
    84         -    add_srs_wkt (p, 8,
    85         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
    86         -    add_srs_wkt (p, 9,
    87         -        "[\"central_meridian\",21],PARAMETER[\"scale_factor\",1],");
    88         -    add_srs_wkt (p, 10,
    89         -        "PARAMETER[\"false_easting\",4500000],PARAMETER[\"false_n");
    90         -    add_srs_wkt (p, 11,
    91         -        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
    92         -    add_srs_wkt (p, 12,
    93         -        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
    94         -    add_srs_wkt (p, 13,
    95         -        ",\"5562\"]]");
           75  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
           76  +    add_srs_wkt (p, 4,
           77  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
           78  +    add_srs_wkt (p, 5,
           79  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
           80  +    add_srs_wkt (p, 6,
           81  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
           82  +    add_srs_wkt (p, 7,
           83  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
           84  +    add_srs_wkt (p, 8,
           85  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
           86  +    add_srs_wkt (p, 9,
           87  +        "R[\"central_meridian\",21],PARAMETER[\"scale_factor\",1]");
           88  +    add_srs_wkt (p, 10,
           89  +        ",PARAMETER[\"false_easting\",4500000],PARAMETER[\"false_");
           90  +    add_srs_wkt (p, 11,
           91  +        "northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
           92  +    add_srs_wkt (p, 12,
           93  +        "\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG");
           94  +    add_srs_wkt (p, 13,
           95  +        "\",\"5562\"]]");
    96     96       p = add_epsg_def_ex (filter, first, last, 5563, "epsg", 5563,
    97     97           "UCS-2000 / Gauss-Kruger zone 5", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Ukraine_2000", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=5500000 +y_0=0 ");
   103    103       add_proj4text (p, 1,
   104         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          104  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   105    105       add_proj4text (p, 2,
   106         -        "s=m +no_defs");
          106  +        "ts=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"UCS-2000 / Gauss-Kruger zone 5\",GEOGCS[\"UCS-2");
   109    109       add_srs_wkt (p, 1,
   110    110           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   111    111       add_srs_wkt (p, 2,
   112    112           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   113    113       add_srs_wkt (p, 3,
   114         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
   115         -    add_srs_wkt (p, 4,
   116         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
   117         -    add_srs_wkt (p, 5,
   118         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
   119         -    add_srs_wkt (p, 6,
   120         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
   121         -    add_srs_wkt (p, 7,
   122         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
   123         -    add_srs_wkt (p, 8,
   124         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
   125         -    add_srs_wkt (p, 9,
   126         -        "[\"central_meridian\",27],PARAMETER[\"scale_factor\",1],");
   127         -    add_srs_wkt (p, 10,
   128         -        "PARAMETER[\"false_easting\",5500000],PARAMETER[\"false_n");
   129         -    add_srs_wkt (p, 11,
   130         -        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   131         -    add_srs_wkt (p, 12,
   132         -        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   133         -    add_srs_wkt (p, 13,
   134         -        ",\"5563\"]]");
          114  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
          115  +    add_srs_wkt (p, 4,
          116  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
          117  +    add_srs_wkt (p, 5,
          118  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
          119  +    add_srs_wkt (p, 6,
          120  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
          121  +    add_srs_wkt (p, 7,
          122  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
          123  +    add_srs_wkt (p, 8,
          124  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
          125  +    add_srs_wkt (p, 9,
          126  +        "R[\"central_meridian\",27],PARAMETER[\"scale_factor\",1]");
          127  +    add_srs_wkt (p, 10,
          128  +        ",PARAMETER[\"false_easting\",5500000],PARAMETER[\"false_");
          129  +    add_srs_wkt (p, 11,
          130  +        "northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
          131  +    add_srs_wkt (p, 12,
          132  +        "\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG");
          133  +    add_srs_wkt (p, 13,
          134  +        "\",\"5563\"]]");
   135    135       p = add_epsg_def_ex (filter, first, last, 5564, "epsg", 5564,
   136    136           "UCS-2000 / Gauss-Kruger zone 6", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Ukraine_2000", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=6500000 +y_0=0 ");
   142    142       add_proj4text (p, 1,
   143         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          143  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   144    144       add_proj4text (p, 2,
   145         -        "s=m +no_defs");
          145  +        "ts=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"UCS-2000 / Gauss-Kruger zone 6\",GEOGCS[\"UCS-2");
   148    148       add_srs_wkt (p, 1,
   149    149           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   150    150       add_srs_wkt (p, 2,
   151    151           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   152    152       add_srs_wkt (p, 3,
   153         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
   154         -    add_srs_wkt (p, 4,
   155         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
   156         -    add_srs_wkt (p, 5,
   157         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
   158         -    add_srs_wkt (p, 6,
   159         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
   160         -    add_srs_wkt (p, 7,
   161         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
   162         -    add_srs_wkt (p, 8,
   163         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
   164         -    add_srs_wkt (p, 9,
   165         -        "[\"central_meridian\",33],PARAMETER[\"scale_factor\",1],");
   166         -    add_srs_wkt (p, 10,
   167         -        "PARAMETER[\"false_easting\",6500000],PARAMETER[\"false_n");
   168         -    add_srs_wkt (p, 11,
   169         -        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   170         -    add_srs_wkt (p, 12,
   171         -        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   172         -    add_srs_wkt (p, 13,
   173         -        ",\"5564\"]]");
          153  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
          154  +    add_srs_wkt (p, 4,
          155  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
          156  +    add_srs_wkt (p, 5,
          157  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
          158  +    add_srs_wkt (p, 6,
          159  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
          160  +    add_srs_wkt (p, 7,
          161  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
          162  +    add_srs_wkt (p, 8,
          163  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
          164  +    add_srs_wkt (p, 9,
          165  +        "R[\"central_meridian\",33],PARAMETER[\"scale_factor\",1]");
          166  +    add_srs_wkt (p, 10,
          167  +        ",PARAMETER[\"false_easting\",6500000],PARAMETER[\"false_");
          168  +    add_srs_wkt (p, 11,
          169  +        "northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
          170  +    add_srs_wkt (p, 12,
          171  +        "\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG");
          172  +    add_srs_wkt (p, 13,
          173  +        "\",\"5564\"]]");
   174    174       p = add_epsg_def_ex (filter, first, last, 5565, "epsg", 5565,
   175    175           "UCS-2000 / Gauss-Kruger zone 7", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Ukraine_2000", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=7500000 +y_0=0 ");
   181    181       add_proj4text (p, 1,
   182         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          182  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   183    183       add_proj4text (p, 2,
   184         -        "s=m +no_defs");
          184  +        "ts=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"UCS-2000 / Gauss-Kruger zone 7\",GEOGCS[\"UCS-2");
   187    187       add_srs_wkt (p, 1,
   188    188           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   189    189       add_srs_wkt (p, 2,
   190    190           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   191    191       add_srs_wkt (p, 3,
   192         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
   193         -    add_srs_wkt (p, 4,
   194         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
   195         -    add_srs_wkt (p, 5,
   196         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
   197         -    add_srs_wkt (p, 6,
   198         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
   199         -    add_srs_wkt (p, 7,
   200         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
   201         -    add_srs_wkt (p, 8,
   202         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
   203         -    add_srs_wkt (p, 9,
   204         -        "[\"central_meridian\",39],PARAMETER[\"scale_factor\",1],");
   205         -    add_srs_wkt (p, 10,
   206         -        "PARAMETER[\"false_easting\",7500000],PARAMETER[\"false_n");
   207         -    add_srs_wkt (p, 11,
   208         -        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   209         -    add_srs_wkt (p, 12,
   210         -        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   211         -    add_srs_wkt (p, 13,
   212         -        ",\"5565\"]]");
          192  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
          193  +    add_srs_wkt (p, 4,
          194  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
          195  +    add_srs_wkt (p, 5,
          196  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
          197  +    add_srs_wkt (p, 6,
          198  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
          199  +    add_srs_wkt (p, 7,
          200  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
          201  +    add_srs_wkt (p, 8,
          202  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
          203  +    add_srs_wkt (p, 9,
          204  +        "R[\"central_meridian\",39],PARAMETER[\"scale_factor\",1]");
          205  +    add_srs_wkt (p, 10,
          206  +        ",PARAMETER[\"false_easting\",7500000],PARAMETER[\"false_");
          207  +    add_srs_wkt (p, 11,
          208  +        "northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
          209  +    add_srs_wkt (p, 12,
          210  +        "\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG");
          211  +    add_srs_wkt (p, 13,
          212  +        "\",\"5565\"]]");
   213    213       p = add_epsg_def_ex (filter, first, last, 5566, "epsg", 5566,
   214    214           "UCS-2000 / Gauss-Kruger CM 21E", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Ukraine_2000", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
   220    220       add_proj4text (p, 1,
   221         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          221  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   222    222       add_proj4text (p, 2,
   223         -        "=m +no_defs");
          223  +        "s=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"UCS-2000 / Gauss-Kruger CM 21E\",GEOGCS[\"UCS-2");
   226    226       add_srs_wkt (p, 1,
   227    227           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   228    228       add_srs_wkt (p, 2,
   229    229           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   230    230       add_srs_wkt (p, 3,
   231         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
          231  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
   232    232       add_srs_wkt (p, 4,
   233         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
          233  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
   234    234       add_srs_wkt (p, 5,
   235         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
          235  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
   236    236       add_srs_wkt (p, 6,
   237         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
          237  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
   238    238       add_srs_wkt (p, 7,
   239         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
          239  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
   240    240       add_srs_wkt (p, 8,
   241         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
          241  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
   242    242       add_srs_wkt (p, 9,
   243         -        "[\"central_meridian\",21],PARAMETER[\"scale_factor\",1],");
          243  +        "R[\"central_meridian\",21],PARAMETER[\"scale_factor\",1]");
   244    244       add_srs_wkt (p, 10,
   245         -        "PARAMETER[\"false_easting\",500000],PARAMETER[\"false_no");
          245  +        ",PARAMETER[\"false_easting\",500000],PARAMETER[\"false_n");
   246    246       add_srs_wkt (p, 11,
   247         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
          247  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   248    248       add_srs_wkt (p, 12,
   249    249           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   250    250       add_srs_wkt (p, 13,
   251    251           ",\"5566\"]]");
   252    252       p = add_epsg_def_ex (filter, first, last, 5567, "epsg", 5567,
   253    253           "UCS-2000 / Gauss-Kruger CM 27E", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Ukraine_2000", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
   259    259       add_proj4text (p, 1,
   260         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          260  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   261    261       add_proj4text (p, 2,
   262         -        "=m +no_defs");
          262  +        "s=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"UCS-2000 / Gauss-Kruger CM 27E\",GEOGCS[\"UCS-2");
   265    265       add_srs_wkt (p, 1,
   266    266           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   267    267       add_srs_wkt (p, 2,
   268    268           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   269    269       add_srs_wkt (p, 3,
   270         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
          270  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
   271    271       add_srs_wkt (p, 4,
   272         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
          272  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
   273    273       add_srs_wkt (p, 5,
   274         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
          274  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
   275    275       add_srs_wkt (p, 6,
   276         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
          276  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
   277    277       add_srs_wkt (p, 7,
   278         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
          278  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
   279    279       add_srs_wkt (p, 8,
   280         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
          280  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
   281    281       add_srs_wkt (p, 9,
   282         -        "[\"central_meridian\",27],PARAMETER[\"scale_factor\",1],");
          282  +        "R[\"central_meridian\",27],PARAMETER[\"scale_factor\",1]");
   283    283       add_srs_wkt (p, 10,
   284         -        "PARAMETER[\"false_easting\",500000],PARAMETER[\"false_no");
          284  +        ",PARAMETER[\"false_easting\",500000],PARAMETER[\"false_n");
   285    285       add_srs_wkt (p, 11,
   286         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
          286  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   287    287       add_srs_wkt (p, 12,
   288    288           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   289    289       add_srs_wkt (p, 13,
   290    290           ",\"5567\"]]");
   291    291       p = add_epsg_def_ex (filter, first, last, 5568, "epsg", 5568,
   292    292           "UCS-2000 / Gauss-Kruger CM 33E", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Ukraine_2000", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
   298    298       add_proj4text (p, 1,
   299         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          299  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   300    300       add_proj4text (p, 2,
   301         -        "=m +no_defs");
          301  +        "s=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"UCS-2000 / Gauss-Kruger CM 33E\",GEOGCS[\"UCS-2");
   304    304       add_srs_wkt (p, 1,
   305    305           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   306    306       add_srs_wkt (p, 2,
   307    307           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   308    308       add_srs_wkt (p, 3,
   309         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
          309  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
   310    310       add_srs_wkt (p, 4,
   311         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
          311  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
   312    312       add_srs_wkt (p, 5,
   313         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
          313  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
   314    314       add_srs_wkt (p, 6,
   315         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
          315  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
   316    316       add_srs_wkt (p, 7,
   317         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
          317  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
   318    318       add_srs_wkt (p, 8,
   319         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
          319  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
   320    320       add_srs_wkt (p, 9,
   321         -        "[\"central_meridian\",33],PARAMETER[\"scale_factor\",1],");
          321  +        "R[\"central_meridian\",33],PARAMETER[\"scale_factor\",1]");
   322    322       add_srs_wkt (p, 10,
   323         -        "PARAMETER[\"false_easting\",500000],PARAMETER[\"false_no");
          323  +        ",PARAMETER[\"false_easting\",500000],PARAMETER[\"false_n");
   324    324       add_srs_wkt (p, 11,
   325         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
          325  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   326    326       add_srs_wkt (p, 12,
   327    327           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   328    328       add_srs_wkt (p, 13,
   329    329           ",\"5568\"]]");
   330    330       p = add_epsg_def_ex (filter, first, last, 5569, "epsg", 5569,
   331    331           "UCS-2000 / Gauss-Kruger CM 39E", 0, 1,
   332    332           "Krassowsky 1940", "Greenwich",
   333    333           "Ukraine_2000", "Transverse_Mercator", "metre",
   334    334           "X", "North", "Y", "East");
   335    335       add_proj4text (p, 0,
   336    336           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
   337    337       add_proj4text (p, 1,
   338         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          338  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   339    339       add_proj4text (p, 2,
   340         -        "=m +no_defs");
          340  +        "s=m +no_defs");
   341    341       add_srs_wkt (p, 0,
   342    342           "PROJCS[\"UCS-2000 / Gauss-Kruger CM 39E\",GEOGCS[\"UCS-2");
   343    343       add_srs_wkt (p, 1,
   344    344           "000\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
   345    345       add_srs_wkt (p, 2,
   346    346           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
   347    347       add_srs_wkt (p, 3,
   348         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
          348  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
   349    349       add_srs_wkt (p, 4,
   350         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
          350  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
   351    351       add_srs_wkt (p, 5,
   352         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
          352  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
   353    353       add_srs_wkt (p, 6,
   354         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
          354  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
   355    355       add_srs_wkt (p, 7,
   356         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
          356  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
   357    357       add_srs_wkt (p, 8,
   358         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
          358  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
   359    359       add_srs_wkt (p, 9,
   360         -        "[\"central_meridian\",39],PARAMETER[\"scale_factor\",1],");
          360  +        "R[\"central_meridian\",39],PARAMETER[\"scale_factor\",1]");
   361    361       add_srs_wkt (p, 10,
   362         -        "PARAMETER[\"false_easting\",500000],PARAMETER[\"false_no");
          362  +        ",PARAMETER[\"false_easting\",500000],PARAMETER[\"false_n");
   363    363       add_srs_wkt (p, 11,
   364         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
          364  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
   365    365       add_srs_wkt (p, 12,
   366    366           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
   367    367       add_srs_wkt (p, 13,
   368    368           ",\"5569\"]]");
   369    369       p = add_epsg_def_ex (filter, first, last, 5570, "epsg", 5570,
   370    370           "UCS-2000 / 3-degree Gauss-Kruger zone 7 (deprecated)", 0, 1,
   371    371           "Krassowsky 1940", "Greenwich",
   372    372           "Ukraine_2000", "Transverse_Mercator", "metre",
   373    373           "X", "North", "Y", "East");
   374    374       add_proj4text (p, 0,
   375    375           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=7500000 +y_0=0 ");
   376    376       add_proj4text (p, 1,
   377         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          377  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   378    378       add_proj4text (p, 2,
   379         -        "s=m +no_defs");
          379  +        "ts=m +no_defs");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 7 (deprec");
   382    382       add_srs_wkt (p, 1,
   383    383           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   384    384       add_srs_wkt (p, 2,
   385    385           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   386    386       add_srs_wkt (p, 3,
   387         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   388         -    add_srs_wkt (p, 4,
   389         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   390         -    add_srs_wkt (p, 5,
   391         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   392         -    add_srs_wkt (p, 6,
   393         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   394         -    add_srs_wkt (p, 7,
   395         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   396         -    add_srs_wkt (p, 8,
   397         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   398         -    add_srs_wkt (p, 9,
   399         -        "f_origin\",0],PARAMETER[\"central_meridian\",21],PARAMET");
   400         -    add_srs_wkt (p, 10,
   401         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",75000");
   402         -    add_srs_wkt (p, 11,
   403         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   404         -    add_srs_wkt (p, 12,
   405         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   406         -    add_srs_wkt (p, 13,
   407         -        "EAST],AUTHORITY[\"EPSG\",\"5570\"]]");
          387  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          388  +    add_srs_wkt (p, 4,
          389  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          390  +    add_srs_wkt (p, 5,
          391  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          392  +    add_srs_wkt (p, 6,
          393  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          394  +    add_srs_wkt (p, 7,
          395  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          396  +    add_srs_wkt (p, 8,
          397  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          398  +    add_srs_wkt (p, 9,
          399  +        "of_origin\",0],PARAMETER[\"central_meridian\",21],PARAME");
          400  +    add_srs_wkt (p, 10,
          401  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",7500");
          402  +    add_srs_wkt (p, 11,
          403  +        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          404  +    add_srs_wkt (p, 12,
          405  +        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          406  +    add_srs_wkt (p, 13,
          407  +        ",EAST],AUTHORITY[\"EPSG\",\"5570\"]]");
   408    408       p = add_epsg_def_ex (filter, first, last, 5571, "epsg", 5571,
   409    409           "UCS-2000 / 3-degree Gauss-Kruger zone 8 (deprecated)", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Ukraine_2000", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=8500000 +y_0=0 ");
   415    415       add_proj4text (p, 1,
   416         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          416  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   417    417       add_proj4text (p, 2,
   418         -        "s=m +no_defs");
          418  +        "ts=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 8 (deprec");
   421    421       add_srs_wkt (p, 1,
   422    422           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   423    423       add_srs_wkt (p, 2,
   424    424           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   425    425       add_srs_wkt (p, 3,
   426         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   427         -    add_srs_wkt (p, 4,
   428         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   429         -    add_srs_wkt (p, 5,
   430         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   431         -    add_srs_wkt (p, 6,
   432         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   433         -    add_srs_wkt (p, 7,
   434         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   435         -    add_srs_wkt (p, 8,
   436         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   437         -    add_srs_wkt (p, 9,
   438         -        "f_origin\",0],PARAMETER[\"central_meridian\",24],PARAMET");
   439         -    add_srs_wkt (p, 10,
   440         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",85000");
   441         -    add_srs_wkt (p, 11,
   442         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   443         -    add_srs_wkt (p, 12,
   444         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   445         -    add_srs_wkt (p, 13,
   446         -        "EAST],AUTHORITY[\"EPSG\",\"5571\"]]");
          426  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          427  +    add_srs_wkt (p, 4,
          428  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          429  +    add_srs_wkt (p, 5,
          430  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          431  +    add_srs_wkt (p, 6,
          432  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          433  +    add_srs_wkt (p, 7,
          434  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          435  +    add_srs_wkt (p, 8,
          436  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          437  +    add_srs_wkt (p, 9,
          438  +        "of_origin\",0],PARAMETER[\"central_meridian\",24],PARAME");
          439  +    add_srs_wkt (p, 10,
          440  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",8500");
          441  +    add_srs_wkt (p, 11,
          442  +        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          443  +    add_srs_wkt (p, 12,
          444  +        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          445  +    add_srs_wkt (p, 13,
          446  +        ",EAST],AUTHORITY[\"EPSG\",\"5571\"]]");
   447    447       p = add_epsg_def_ex (filter, first, last, 5572, "epsg", 5572,
   448    448           "UCS-2000 / 3-degree Gauss-Kruger zone 9 (deprecated)", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Ukraine_2000", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=9500000 +y_0=0 ");
   454    454       add_proj4text (p, 1,
   455         -        "+ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +unit");
          455  +        "+ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +uni");
   456    456       add_proj4text (p, 2,
   457         -        "s=m +no_defs");
          457  +        "ts=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 9 (deprec");
   460    460       add_srs_wkt (p, 1,
   461    461           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   462    462       add_srs_wkt (p, 2,
   463    463           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   464    464       add_srs_wkt (p, 3,
   465         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   466         -    add_srs_wkt (p, 4,
   467         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   468         -    add_srs_wkt (p, 5,
   469         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   470         -    add_srs_wkt (p, 6,
   471         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   472         -    add_srs_wkt (p, 7,
   473         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   474         -    add_srs_wkt (p, 8,
   475         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   476         -    add_srs_wkt (p, 9,
   477         -        "f_origin\",0],PARAMETER[\"central_meridian\",27],PARAMET");
   478         -    add_srs_wkt (p, 10,
   479         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",95000");
   480         -    add_srs_wkt (p, 11,
   481         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   482         -    add_srs_wkt (p, 12,
   483         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   484         -    add_srs_wkt (p, 13,
   485         -        "EAST],AUTHORITY[\"EPSG\",\"5572\"]]");
          465  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          466  +    add_srs_wkt (p, 4,
          467  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          468  +    add_srs_wkt (p, 5,
          469  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          470  +    add_srs_wkt (p, 6,
          471  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          472  +    add_srs_wkt (p, 7,
          473  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          474  +    add_srs_wkt (p, 8,
          475  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          476  +    add_srs_wkt (p, 9,
          477  +        "of_origin\",0],PARAMETER[\"central_meridian\",27],PARAME");
          478  +    add_srs_wkt (p, 10,
          479  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",9500");
          480  +    add_srs_wkt (p, 11,
          481  +        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          482  +    add_srs_wkt (p, 12,
          483  +        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          484  +    add_srs_wkt (p, 13,
          485  +        ",EAST],AUTHORITY[\"EPSG\",\"5572\"]]");
   486    486       p = add_epsg_def_ex (filter, first, last, 5573, "epsg", 5573,
   487    487           "UCS-2000 / 3-degree Gauss-Kruger zone 10 (deprecated)", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Ukraine_2000", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=10500000 +y_0=0");
   493    493       add_proj4text (p, 1,
   494         -        " +ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +uni");
          494  +        " +ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +un");
   495    495       add_proj4text (p, 2,
   496         -        "ts=m +no_defs");
          496  +        "its=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 10 (depre");
   499    499       add_srs_wkt (p, 1,
   500    500           "cated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHE");
   501    501       add_srs_wkt (p, 2,
   502    502           "ROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   503    503       add_srs_wkt (p, 3,
   504         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
          504  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
   505    505       add_srs_wkt (p, 4,
   506         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
          506  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   507    507       add_srs_wkt (p, 5,
   508         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
          508  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   509    509       add_srs_wkt (p, 6,
   510         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
          510  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   511    511       add_srs_wkt (p, 7,
   512         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
          512  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
   513    513       add_srs_wkt (p, 8,
   514         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
          514  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   515    515       add_srs_wkt (p, 9,
   516         -        "f_origin\",0],PARAMETER[\"central_meridian\",30],PARAMET");
          516  +        "of_origin\",0],PARAMETER[\"central_meridian\",30],PARAME");
   517    517       add_srs_wkt (p, 10,
   518         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",10500");
          518  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",1050");
   519    519       add_srs_wkt (p, 11,
   520         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          520  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   521    521       add_srs_wkt (p, 12,
   522         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          522  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   523    523       add_srs_wkt (p, 13,
   524    524           ",EAST],AUTHORITY[\"EPSG\",\"5573\"]]");
   525    525       p = add_epsg_def_ex (filter, first, last, 5574, "epsg", 5574,
   526    526           "UCS-2000 / 3-degree Gauss-Kruger zone 11 (deprecated)", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Ukraine_2000", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=11500000 +y_0=0");
   532    532       add_proj4text (p, 1,
   533         -        " +ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +uni");
          533  +        " +ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +un");
   534    534       add_proj4text (p, 2,
   535         -        "ts=m +no_defs");
          535  +        "its=m +no_defs");
   536    536       add_srs_wkt (p, 0,
   537    537           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 11 (depre");
   538    538       add_srs_wkt (p, 1,
   539    539           "cated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHE");
   540    540       add_srs_wkt (p, 2,
   541    541           "ROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   542    542       add_srs_wkt (p, 3,
   543         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
          543  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
   544    544       add_srs_wkt (p, 4,
   545         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
          545  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   546    546       add_srs_wkt (p, 5,
   547         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
          547  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   548    548       add_srs_wkt (p, 6,
   549         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
          549  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   550    550       add_srs_wkt (p, 7,
   551         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
          551  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
   552    552       add_srs_wkt (p, 8,
   553         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
          553  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   554    554       add_srs_wkt (p, 9,
   555         -        "f_origin\",0],PARAMETER[\"central_meridian\",33],PARAMET");
          555  +        "of_origin\",0],PARAMETER[\"central_meridian\",33],PARAME");
   556    556       add_srs_wkt (p, 10,
   557         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",11500");
          557  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",1150");
   558    558       add_srs_wkt (p, 11,
   559         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          559  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   560    560       add_srs_wkt (p, 12,
   561         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          561  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   562    562       add_srs_wkt (p, 13,
   563    563           ",EAST],AUTHORITY[\"EPSG\",\"5574\"]]");
   564    564       p = add_epsg_def_ex (filter, first, last, 5575, "epsg", 5575,
   565    565           "UCS-2000 / 3-degree Gauss-Kruger zone 12 (deprecated)", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Ukraine_2000", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=12500000 +y_0=0");
   571    571       add_proj4text (p, 1,
   572         -        " +ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +uni");
          572  +        " +ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +un");
   573    573       add_proj4text (p, 2,
   574         -        "ts=m +no_defs");
          574  +        "its=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 12 (depre");
   577    577       add_srs_wkt (p, 1,
   578    578           "cated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHE");
   579    579       add_srs_wkt (p, 2,
   580    580           "ROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   581    581       add_srs_wkt (p, 3,
   582         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
          582  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
   583    583       add_srs_wkt (p, 4,
   584         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
          584  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   585    585       add_srs_wkt (p, 5,
   586         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
          586  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   587    587       add_srs_wkt (p, 6,
   588         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
          588  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   589    589       add_srs_wkt (p, 7,
   590         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
          590  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
   591    591       add_srs_wkt (p, 8,
   592         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
          592  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   593    593       add_srs_wkt (p, 9,
   594         -        "f_origin\",0],PARAMETER[\"central_meridian\",36],PARAMET");
          594  +        "of_origin\",0],PARAMETER[\"central_meridian\",36],PARAME");
   595    595       add_srs_wkt (p, 10,
   596         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",12500");
          596  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",1250");
   597    597       add_srs_wkt (p, 11,
   598         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          598  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   599    599       add_srs_wkt (p, 12,
   600         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          600  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   601    601       add_srs_wkt (p, 13,
   602    602           ",EAST],AUTHORITY[\"EPSG\",\"5575\"]]");
   603    603       p = add_epsg_def_ex (filter, first, last, 5576, "epsg", 5576,
   604    604           "UCS-2000 / 3-degree Gauss-Kruger zone 13 (deprecated)", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Ukraine_2000", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=13500000 +y_0=0");
   610    610       add_proj4text (p, 1,
   611         -        " +ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +uni");
          611  +        " +ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +un");
   612    612       add_proj4text (p, 2,
   613         -        "ts=m +no_defs");
          613  +        "its=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger zone 13 (depre");
   616    616       add_srs_wkt (p, 1,
   617    617           "cated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHE");
   618    618       add_srs_wkt (p, 2,
   619    619           "ROID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   620    620       add_srs_wkt (p, 3,
   621         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
          621  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
   622    622       add_srs_wkt (p, 4,
   623         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
          623  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   624    624       add_srs_wkt (p, 5,
   625         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
          625  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   626    626       add_srs_wkt (p, 6,
   627         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
          627  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   628    628       add_srs_wkt (p, 7,
   629         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
          629  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
   630    630       add_srs_wkt (p, 8,
   631         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
          631  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   632    632       add_srs_wkt (p, 9,
   633         -        "f_origin\",0],PARAMETER[\"central_meridian\",39],PARAMET");
          633  +        "of_origin\",0],PARAMETER[\"central_meridian\",39],PARAME");
   634    634       add_srs_wkt (p, 10,
   635         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",13500");
          635  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",1350");
   636    636       add_srs_wkt (p, 11,
   637         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
          637  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   638    638       add_srs_wkt (p, 12,
   639         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          639  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   640    640       add_srs_wkt (p, 13,
   641    641           ",EAST],AUTHORITY[\"EPSG\",\"5576\"]]");
   642    642       p = add_epsg_def_ex (filter, first, last, 5577, "epsg", 5577,
   643    643           "UCS-2000 / 3-degree Gauss-Kruger CM 21E (deprecated)", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Ukraine_2000", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
   649    649       add_proj4text (p, 1,
   650         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          650  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   651    651       add_proj4text (p, 2,
   652         -        "=m +no_defs");
          652  +        "s=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 21E (deprec");
   655    655       add_srs_wkt (p, 1,
   656    656           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   657    657       add_srs_wkt (p, 2,
   658    658           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   659    659       add_srs_wkt (p, 3,
   660         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   661         -    add_srs_wkt (p, 4,
   662         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   663         -    add_srs_wkt (p, 5,
   664         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   665         -    add_srs_wkt (p, 6,
   666         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   667         -    add_srs_wkt (p, 7,
   668         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   669         -    add_srs_wkt (p, 8,
   670         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   671         -    add_srs_wkt (p, 9,
   672         -        "f_origin\",0],PARAMETER[\"central_meridian\",21],PARAMET");
   673         -    add_srs_wkt (p, 10,
   674         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   675         -    add_srs_wkt (p, 11,
   676         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   677         -    add_srs_wkt (p, 12,
   678         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   679         -    add_srs_wkt (p, 13,
   680         -        "AST],AUTHORITY[\"EPSG\",\"5577\"]]");
          660  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          661  +    add_srs_wkt (p, 4,
          662  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          663  +    add_srs_wkt (p, 5,
          664  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          665  +    add_srs_wkt (p, 6,
          666  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          667  +    add_srs_wkt (p, 7,
          668  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          669  +    add_srs_wkt (p, 8,
          670  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          671  +    add_srs_wkt (p, 9,
          672  +        "of_origin\",0],PARAMETER[\"central_meridian\",21],PARAME");
          673  +    add_srs_wkt (p, 10,
          674  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          675  +    add_srs_wkt (p, 11,
          676  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          677  +    add_srs_wkt (p, 12,
          678  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          679  +    add_srs_wkt (p, 13,
          680  +        "EAST],AUTHORITY[\"EPSG\",\"5577\"]]");
   681    681       p = add_epsg_def_ex (filter, first, last, 5578, "epsg", 5578,
   682    682           "UCS-2000 / 3-degree Gauss-Kruger CM 24E (deprecated)", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Ukraine_2000", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=500000 +y_0=0 +");
   688    688       add_proj4text (p, 1,
   689         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          689  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   690    690       add_proj4text (p, 2,
   691         -        "=m +no_defs");
          691  +        "s=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 24E (deprec");
   694    694       add_srs_wkt (p, 1,
   695    695           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   696    696       add_srs_wkt (p, 2,
   697    697           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   698    698       add_srs_wkt (p, 3,
   699         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   700         -    add_srs_wkt (p, 4,
   701         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   702         -    add_srs_wkt (p, 5,
   703         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   704         -    add_srs_wkt (p, 6,
   705         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   706         -    add_srs_wkt (p, 7,
   707         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   708         -    add_srs_wkt (p, 8,
   709         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   710         -    add_srs_wkt (p, 9,
   711         -        "f_origin\",0],PARAMETER[\"central_meridian\",24],PARAMET");
   712         -    add_srs_wkt (p, 10,
   713         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   714         -    add_srs_wkt (p, 11,
   715         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   716         -    add_srs_wkt (p, 12,
   717         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   718         -    add_srs_wkt (p, 13,
   719         -        "AST],AUTHORITY[\"EPSG\",\"5578\"]]");
          699  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          700  +    add_srs_wkt (p, 4,
          701  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          702  +    add_srs_wkt (p, 5,
          703  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          704  +    add_srs_wkt (p, 6,
          705  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          706  +    add_srs_wkt (p, 7,
          707  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          708  +    add_srs_wkt (p, 8,
          709  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          710  +    add_srs_wkt (p, 9,
          711  +        "of_origin\",0],PARAMETER[\"central_meridian\",24],PARAME");
          712  +    add_srs_wkt (p, 10,
          713  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          714  +    add_srs_wkt (p, 11,
          715  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          716  +    add_srs_wkt (p, 12,
          717  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          718  +    add_srs_wkt (p, 13,
          719  +        "EAST],AUTHORITY[\"EPSG\",\"5578\"]]");
   720    720       p = add_epsg_def_ex (filter, first, last, 5579, "epsg", 5579,
   721    721           "UCS-2000 / 3-degree Gauss-Kruger CM 27E (deprecated)", 0, 1,
   722    722           "Krassowsky 1940", "Greenwich",
   723    723           "Ukraine_2000", "Transverse_Mercator", "metre",
   724    724           "X", "North", "Y", "East");
   725    725       add_proj4text (p, 0,
   726    726           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
   727    727       add_proj4text (p, 1,
   728         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          728  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   729    729       add_proj4text (p, 2,
   730         -        "=m +no_defs");
          730  +        "s=m +no_defs");
   731    731       add_srs_wkt (p, 0,
   732    732           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 27E (deprec");
   733    733       add_srs_wkt (p, 1,
   734    734           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   735    735       add_srs_wkt (p, 2,
   736    736           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   737    737       add_srs_wkt (p, 3,
   738         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   739         -    add_srs_wkt (p, 4,
   740         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   741         -    add_srs_wkt (p, 5,
   742         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   743         -    add_srs_wkt (p, 6,
   744         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   745         -    add_srs_wkt (p, 7,
   746         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   747         -    add_srs_wkt (p, 8,
   748         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   749         -    add_srs_wkt (p, 9,
   750         -        "f_origin\",0],PARAMETER[\"central_meridian\",27],PARAMET");
   751         -    add_srs_wkt (p, 10,
   752         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   753         -    add_srs_wkt (p, 11,
   754         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   755         -    add_srs_wkt (p, 12,
   756         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   757         -    add_srs_wkt (p, 13,
   758         -        "AST],AUTHORITY[\"EPSG\",\"5579\"]]");
          738  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          739  +    add_srs_wkt (p, 4,
          740  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          741  +    add_srs_wkt (p, 5,
          742  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          743  +    add_srs_wkt (p, 6,
          744  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          745  +    add_srs_wkt (p, 7,
          746  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          747  +    add_srs_wkt (p, 8,
          748  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          749  +    add_srs_wkt (p, 9,
          750  +        "of_origin\",0],PARAMETER[\"central_meridian\",27],PARAME");
          751  +    add_srs_wkt (p, 10,
          752  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          753  +    add_srs_wkt (p, 11,
          754  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          755  +    add_srs_wkt (p, 12,
          756  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          757  +    add_srs_wkt (p, 13,
          758  +        "EAST],AUTHORITY[\"EPSG\",\"5579\"]]");
   759    759       p = add_epsg_def_ex (filter, first, last, 5580, "epsg", 5580,
   760    760           "UCS-2000 / 3-degree Gauss-Kruger CM 30E (deprecated)", 0, 1,
   761    761           "Krassowsky 1940", "Greenwich",
   762    762           "Ukraine_2000", "Transverse_Mercator", "metre",
   763    763           "X", "North", "Y", "East");
   764    764       add_proj4text (p, 0,
   765    765           "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=500000 +y_0=0 +");
   766    766       add_proj4text (p, 1,
   767         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          767  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   768    768       add_proj4text (p, 2,
   769         -        "=m +no_defs");
          769  +        "s=m +no_defs");
   770    770       add_srs_wkt (p, 0,
   771    771           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 30E (deprec");
   772    772       add_srs_wkt (p, 1,
   773    773           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   774    774       add_srs_wkt (p, 2,
   775    775           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   776    776       add_srs_wkt (p, 3,
   777         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   778         -    add_srs_wkt (p, 4,
   779         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   780         -    add_srs_wkt (p, 5,
   781         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   782         -    add_srs_wkt (p, 6,
   783         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   784         -    add_srs_wkt (p, 7,
   785         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   786         -    add_srs_wkt (p, 8,
   787         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   788         -    add_srs_wkt (p, 9,
   789         -        "f_origin\",0],PARAMETER[\"central_meridian\",30],PARAMET");
   790         -    add_srs_wkt (p, 10,
   791         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   792         -    add_srs_wkt (p, 11,
   793         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   794         -    add_srs_wkt (p, 12,
   795         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   796         -    add_srs_wkt (p, 13,
   797         -        "AST],AUTHORITY[\"EPSG\",\"5580\"]]");
          777  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          778  +    add_srs_wkt (p, 4,
          779  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          780  +    add_srs_wkt (p, 5,
          781  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          782  +    add_srs_wkt (p, 6,
          783  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          784  +    add_srs_wkt (p, 7,
          785  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          786  +    add_srs_wkt (p, 8,
          787  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          788  +    add_srs_wkt (p, 9,
          789  +        "of_origin\",0],PARAMETER[\"central_meridian\",30],PARAME");
          790  +    add_srs_wkt (p, 10,
          791  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          792  +    add_srs_wkt (p, 11,
          793  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          794  +    add_srs_wkt (p, 12,
          795  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          796  +    add_srs_wkt (p, 13,
          797  +        "EAST],AUTHORITY[\"EPSG\",\"5580\"]]");
   798    798       p = add_epsg_def_ex (filter, first, last, 5581, "epsg", 5581,
   799    799           "UCS-2000 / 3-degree Gauss-Kruger CM 33E (deprecated)", 0, 1,
   800    800           "Krassowsky 1940", "Greenwich",
   801    801           "Ukraine_2000", "Transverse_Mercator", "metre",
   802    802           "X", "North", "Y", "East");
   803    803       add_proj4text (p, 0,
   804    804           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
   805    805       add_proj4text (p, 1,
   806         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          806  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   807    807       add_proj4text (p, 2,
   808         -        "=m +no_defs");
          808  +        "s=m +no_defs");
   809    809       add_srs_wkt (p, 0,
   810    810           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 33E (deprec");
   811    811       add_srs_wkt (p, 1,
   812    812           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   813    813       add_srs_wkt (p, 2,
   814    814           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   815    815       add_srs_wkt (p, 3,
   816         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   817         -    add_srs_wkt (p, 4,
   818         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   819         -    add_srs_wkt (p, 5,
   820         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   821         -    add_srs_wkt (p, 6,
   822         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   823         -    add_srs_wkt (p, 7,
   824         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   825         -    add_srs_wkt (p, 8,
   826         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   827         -    add_srs_wkt (p, 9,
   828         -        "f_origin\",0],PARAMETER[\"central_meridian\",33],PARAMET");
   829         -    add_srs_wkt (p, 10,
   830         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   831         -    add_srs_wkt (p, 11,
   832         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   833         -    add_srs_wkt (p, 12,
   834         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   835         -    add_srs_wkt (p, 13,
   836         -        "AST],AUTHORITY[\"EPSG\",\"5581\"]]");
          816  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          817  +    add_srs_wkt (p, 4,
          818  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          819  +    add_srs_wkt (p, 5,
          820  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          821  +    add_srs_wkt (p, 6,
          822  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          823  +    add_srs_wkt (p, 7,
          824  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          825  +    add_srs_wkt (p, 8,
          826  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          827  +    add_srs_wkt (p, 9,
          828  +        "of_origin\",0],PARAMETER[\"central_meridian\",33],PARAME");
          829  +    add_srs_wkt (p, 10,
          830  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          831  +    add_srs_wkt (p, 11,
          832  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          833  +    add_srs_wkt (p, 12,
          834  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          835  +    add_srs_wkt (p, 13,
          836  +        "EAST],AUTHORITY[\"EPSG\",\"5581\"]]");
   837    837       p = add_epsg_def_ex (filter, first, last, 5582, "epsg", 5582,
   838    838           "UCS-2000 / 3-degree Gauss-Kruger CM 36E (deprecated)", 0, 1,
   839    839           "Krassowsky 1940", "Greenwich",
   840    840           "Ukraine_2000", "Transverse_Mercator", "metre",
   841    841           "X", "North", "Y", "East");
   842    842       add_proj4text (p, 0,
   843    843           "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=500000 +y_0=0 +");
   844    844       add_proj4text (p, 1,
   845         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          845  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   846    846       add_proj4text (p, 2,
   847         -        "=m +no_defs");
          847  +        "s=m +no_defs");
   848    848       add_srs_wkt (p, 0,
   849    849           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 36E (deprec");
   850    850       add_srs_wkt (p, 1,
   851    851           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   852    852       add_srs_wkt (p, 2,
   853    853           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   854    854       add_srs_wkt (p, 3,
   855         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   856         -    add_srs_wkt (p, 4,
   857         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   858         -    add_srs_wkt (p, 5,
   859         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   860         -    add_srs_wkt (p, 6,
   861         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   862         -    add_srs_wkt (p, 7,
   863         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   864         -    add_srs_wkt (p, 8,
   865         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   866         -    add_srs_wkt (p, 9,
   867         -        "f_origin\",0],PARAMETER[\"central_meridian\",36],PARAMET");
   868         -    add_srs_wkt (p, 10,
   869         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   870         -    add_srs_wkt (p, 11,
   871         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   872         -    add_srs_wkt (p, 12,
   873         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   874         -    add_srs_wkt (p, 13,
   875         -        "AST],AUTHORITY[\"EPSG\",\"5582\"]]");
          855  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          856  +    add_srs_wkt (p, 4,
          857  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          858  +    add_srs_wkt (p, 5,
          859  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          860  +    add_srs_wkt (p, 6,
          861  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          862  +    add_srs_wkt (p, 7,
          863  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          864  +    add_srs_wkt (p, 8,
          865  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          866  +    add_srs_wkt (p, 9,
          867  +        "of_origin\",0],PARAMETER[\"central_meridian\",36],PARAME");
          868  +    add_srs_wkt (p, 10,
          869  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          870  +    add_srs_wkt (p, 11,
          871  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          872  +    add_srs_wkt (p, 12,
          873  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          874  +    add_srs_wkt (p, 13,
          875  +        "EAST],AUTHORITY[\"EPSG\",\"5582\"]]");
   876    876       p = add_epsg_def_ex (filter, first, last, 5583, "epsg", 5583,
   877    877           "UCS-2000 / 3-degree Gauss-Kruger CM 39E (deprecated)", 0, 1,
   878    878           "Krassowsky 1940", "Greenwich",
   879    879           "Ukraine_2000", "Transverse_Mercator", "metre",
   880    880           "X", "North", "Y", "East");
   881    881       add_proj4text (p, 0,
   882    882           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
   883    883       add_proj4text (p, 1,
   884         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          884  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   885    885       add_proj4text (p, 2,
   886         -        "=m +no_defs");
          886  +        "s=m +no_defs");
   887    887       add_srs_wkt (p, 0,
   888    888           "PROJCS[\"UCS-2000 / 3-degree Gauss-Kruger CM 39E (deprec");
   889    889       add_srs_wkt (p, 1,
   890    890           "ated)\",GEOGCS[\"UCS-2000\",DATUM[\"Ukraine_2000\",SPHER");
   891    891       add_srs_wkt (p, 2,
   892    892           "OID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\"");
   893    893       add_srs_wkt (p, 3,
   894         -        ",\"7024\"]],TOWGS84[25,-141,-78.5,0,0.35,0.736,0],AUTHOR");
   895         -    add_srs_wkt (p, 4,
   896         -        "ITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORITY");
   897         -    add_srs_wkt (p, 5,
   898         -        "[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,");
   899         -    add_srs_wkt (p, 6,
   900         -        "AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],A");
   901         -    add_srs_wkt (p, 7,
   902         -        "XIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],PR");
   903         -    add_srs_wkt (p, 8,
   904         -        "OJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_o");
   905         -    add_srs_wkt (p, 9,
   906         -        "f_origin\",0],PARAMETER[\"central_meridian\",39],PARAMET");
   907         -    add_srs_wkt (p, 10,
   908         -        "ER[\"scale_factor\",1],PARAMETER[\"false_easting\",50000");
   909         -    add_srs_wkt (p, 11,
   910         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
   911         -    add_srs_wkt (p, 12,
   912         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
   913         -    add_srs_wkt (p, 13,
   914         -        "AST],AUTHORITY[\"EPSG\",\"5583\"]]");
          894  +        ",\"7024\"]],TOWGS84[25,-141,-78.5,-0,0.35,0.736,0],AUTHO");
          895  +    add_srs_wkt (p, 4,
          896  +        "RITY[\"EPSG\",\"1077\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
          897  +    add_srs_wkt (p, 5,
          898  +        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
          899  +    add_srs_wkt (p, 6,
          900  +        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
          901  +    add_srs_wkt (p, 7,
          902  +        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"5561\"]],P");
          903  +    add_srs_wkt (p, 8,
          904  +        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
          905  +    add_srs_wkt (p, 9,
          906  +        "of_origin\",0],PARAMETER[\"central_meridian\",39],PARAME");
          907  +    add_srs_wkt (p, 10,
          908  +        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
          909  +    add_srs_wkt (p, 11,
          910  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
          911  +    add_srs_wkt (p, 12,
          912  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
          913  +    add_srs_wkt (p, 13,
          914  +        "EAST],AUTHORITY[\"EPSG\",\"5583\"]]");
   915    915       p = add_epsg_def_ex (filter, first, last, 5588, "epsg", 5588,
   916    916           "NAD27 / New Brunswick Stereographic (NAD27)", 0, 1,
   917    917           "Clarke 1866", "Greenwich",
   918    918           "North_American_Datum_1927", "Oblique_Stereographic", "foot",
   919    919           "Northing", "North", "Easting", "East");
   920    920       add_proj4text (p, 0,
   921    921           "+proj=sterea +lat_0=46.5 +lon_0=-66.5 +k=0.999912 +x_0=3");
................................................................................
   922    922       add_proj4text (p, 1,
   923    923           "04800 +y_0=304800 +datum=NAD27 +units=ft +no_defs");
   924    924       add_srs_wkt (p, 0,
   925    925           "PROJCS[\"NAD27 / New Brunswick Stereographic (NAD27)\",G");
   926    926       add_srs_wkt (p, 1,
   927    927           "EOGCS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHE");
   928    928       add_srs_wkt (p, 2,
   929         -        "ROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORI");
          929  +        "ROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORI");
   930    930       add_srs_wkt (p, 3,
   931    931           "TY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRI");
   932    932       add_srs_wkt (p, 4,
   933    933           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
   934    934       add_srs_wkt (p, 5,
   935    935           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
   936    936       add_srs_wkt (p, 6,
................................................................................
   963    963       add_proj4text (p, 3,
   964    964           "654 +no_defs");
   965    965       add_srs_wkt (p, 0,
   966    966           "PROJCS[\"Sibun Gorge 1922 / Colony Grid\",GEOGCS[\"Sibun");
   967    967       add_srs_wkt (p, 1,
   968    968           " Gorge 1922\",DATUM[\"Sibun_Gorge_1922\",SPHEROID[\"Clar");
   969    969       add_srs_wkt (p, 2,
   970         -        "ke 1858\",6378293.645208759,294.2606763692606,AUTHORITY[");
          970  +        "ke 1858\",6378293.645208759,294.2606763692569,AUTHORITY[");
   971    971       add_srs_wkt (p, 3,
   972    972           "\"EPSG\",\"7007\"]],AUTHORITY[\"EPSG\",\"1071\"]],PRIMEM");
   973    973       add_srs_wkt (p, 4,
   974    974           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   975    975       add_srs_wkt (p, 5,
   976    976           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   977    977       add_srs_wkt (p, 6,
................................................................................
  1115   1115       add_proj4text (p, 2,
  1116   1116           "ts=us-ft +no_defs");
  1117   1117       add_srs_wkt (p, 0,
  1118   1118           "PROJCS[\"NAD27 / Michigan East\",GEOGCS[\"NAD27\",DATUM[");
  1119   1119       add_srs_wkt (p, 1,
  1120   1120           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  1121   1121       add_srs_wkt (p, 2,
  1122         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         1122  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  1123   1123       add_srs_wkt (p, 3,
  1124   1124           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  1125   1125       add_srs_wkt (p, 4,
  1126   1126           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1127   1127       add_srs_wkt (p, 5,
  1128   1128           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  1129   1129       add_srs_wkt (p, 6,
................................................................................
  1154   1154       add_proj4text (p, 2,
  1155   1155           "_defs");
  1156   1156       add_srs_wkt (p, 0,
  1157   1157           "PROJCS[\"NAD27 / Michigan Old Central\",GEOGCS[\"NAD27\"");
  1158   1158       add_srs_wkt (p, 1,
  1159   1159           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  1160   1160       add_srs_wkt (p, 2,
  1161         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         1161  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  1162   1162       add_srs_wkt (p, 3,
  1163   1163           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  1164   1164       add_srs_wkt (p, 4,
  1165   1165           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1166   1166       add_srs_wkt (p, 5,
  1167   1167           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1168   1168       add_srs_wkt (p, 6,
................................................................................
  1193   1193       add_proj4text (p, 2,
  1194   1194           "_defs");
  1195   1195       add_srs_wkt (p, 0,
  1196   1196           "PROJCS[\"NAD27 / Michigan West\",GEOGCS[\"NAD27\",DATUM[");
  1197   1197       add_srs_wkt (p, 1,
  1198   1198           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  1199   1199       add_srs_wkt (p, 2,
  1200         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         1200  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  1201   1201       add_srs_wkt (p, 3,
  1202   1202           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  1203   1203       add_srs_wkt (p, 4,
  1204   1204           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1205   1205       add_srs_wkt (p, 5,
  1206   1206           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  1207   1207       add_srs_wkt (p, 6,
................................................................................
  1294   1294           "28\"]]");
  1295   1295       p = add_epsg_def_ex (filter, first, last, 5629, "epsg", 5629,
  1296   1296           "Moznet / UTM zone 38S", 0, 0,
  1297   1297           "WGS 84", "Greenwich",
  1298   1298           "Moznet_ITRF94", "Transverse_Mercator", "metre",
  1299   1299           "Easting", "East", "Northing", "North");
  1300   1300       add_proj4text (p, 0,
  1301         -        "+proj=utm +zone=38 +south +ellps=WGS84 +towgs84=0,0,0,0,");
         1301  +        "+proj=utm +zone=38 +south +ellps=WGS84 +towgs84=0,0,0,-0");
  1302   1302       add_proj4text (p, 1,
  1303         -        "0,0,0 +units=m +no_defs");
         1303  +        ",-0,-0,0 +units=m +no_defs");
  1304   1304       add_srs_wkt (p, 0,
  1305   1305           "PROJCS[\"Moznet / UTM zone 38S\",GEOGCS[\"Moznet\",DATUM");
  1306   1306       add_srs_wkt (p, 1,
  1307   1307           "[\"Moznet_ITRF94\",SPHEROID[\"WGS 84\",6378137,298.25722");
  1308   1308       add_srs_wkt (p, 2,
  1309         -        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0");
  1310         -    add_srs_wkt (p, 3,
  1311         -        "],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",0,A");
  1312         -    add_srs_wkt (p, 4,
  1313         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1314         -    add_srs_wkt (p, 5,
  1315         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1316         -    add_srs_wkt (p, 6,
  1317         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"413");
  1318         -    add_srs_wkt (p, 7,
  1319         -        "0\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
  1320         -    add_srs_wkt (p, 8,
  1321         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",45]");
  1322         -    add_srs_wkt (p, 9,
  1323         -        ",PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_ea");
  1324         -    add_srs_wkt (p, 10,
  1325         -        "sting\",500000],PARAMETER[\"false_northing\",10000000],U");
  1326         -    add_srs_wkt (p, 11,
  1327         -        "NIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eas");
  1328         -    add_srs_wkt (p, 12,
  1329         -        "ting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\"");
  1330         -    add_srs_wkt (p, 13,
  1331         -        ",\"5629\"]]");
         1309  +        "3563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,-0,-0,-");
         1310  +    add_srs_wkt (p, 3,
         1311  +        "0,0],AUTHORITY[\"EPSG\",\"6130\"]],PRIMEM[\"Greenwich\",");
         1312  +    add_srs_wkt (p, 4,
         1313  +        "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
         1314  +    add_srs_wkt (p, 5,
         1315  +        "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
         1316  +    add_srs_wkt (p, 6,
         1317  +        "\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"");
         1318  +    add_srs_wkt (p, 7,
         1319  +        "4130\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"");
         1320  +    add_srs_wkt (p, 8,
         1321  +        "latitude_of_origin\",0],PARAMETER[\"central_meridian\",4");
         1322  +    add_srs_wkt (p, 9,
         1323  +        "5],PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_");
         1324  +    add_srs_wkt (p, 10,
         1325  +        "easting\",500000],PARAMETER[\"false_northing\",10000000]");
         1326  +    add_srs_wkt (p, 11,
         1327  +        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"E");
         1328  +    add_srs_wkt (p, 12,
         1329  +        "asting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG");
         1330  +    add_srs_wkt (p, 13,
         1331  +        "\",\"5629\"]]");
  1332   1332       p = add_epsg_def_ex (filter, first, last, 5631, "epsg", 5631,
  1333   1333           "Pulkovo 1942(58) / Gauss-Kruger zone 2 (E-N)", 0, 0,
  1334   1334           "Krassowsky 1940", "Greenwich",
  1335   1335           "Pulkovo_1942_58", "Transverse_Mercator", "metre",
  1336   1336           "Easting", "East", "Northing", "North");
  1337   1337       add_proj4text (p, 0,
  1338   1338           "+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=2500000 +y_0=0 +");
................................................................................
  3186   3186       add_srs_wkt (p, 1,
  3187   3187           "ht\",PROJCS[\"NTF (Paris) / Lambert zone I\",GEOGCS[\"NT");
  3188   3188       add_srs_wkt (p, 2,
  3189   3189           "F (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Par");
  3190   3190       add_srs_wkt (p, 3,
  3191   3191           "is\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.466021");
  3192   3192       add_srs_wkt (p, 4,
  3193         -        "2936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
         3193  +        "2936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
  3194   3194       add_srs_wkt (p, 5,
  3195   3195           "20,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris");
  3196   3196       add_srs_wkt (p, 6,
  3197   3197           "\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\"");
  3198   3198       add_srs_wkt (p, 7,
  3199   3199           ",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[");
  3200   3200       add_srs_wkt (p, 8,
................................................................................
  3239   3239       add_srs_wkt (p, 1,
  3240   3240           "ght\",PROJCS[\"NTF (Paris) / Lambert zone IV\",GEOGCS[\"");
  3241   3241       add_srs_wkt (p, 2,
  3242   3242           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  3243   3243       add_srs_wkt (p, 3,
  3244   3244           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  3245   3245       add_srs_wkt (p, 4,
  3246         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         3246  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  3247   3247       add_srs_wkt (p, 5,
  3248   3248           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  3249   3249       add_srs_wkt (p, 6,
  3250   3250           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  3251   3251       add_srs_wkt (p, 7,
  3252   3252           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  3253   3253       add_srs_wkt (p, 8,

Changes to src/srsinit/epsg_inlined_28.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   534    534       add_srs_wkt (p, 0,
   535    535           "PROJCS[\"JAXA Snow Depth Polar Stereographic North\",GEO");
   536    536       add_srs_wkt (p, 1,
   537    537           "GCS[\"Unspecified datum based upon the Hughes 1980 ellip");
   538    538       add_srs_wkt (p, 2,
   539    539           "soid\",DATUM[\"Not_specified_based_on_Hughes_1980_ellips");
   540    540       add_srs_wkt (p, 3,
   541         -        "oid\",SPHEROID[\"Hughes 1980\",6378273,298.279411123064,");
          541  +        "oid\",SPHEROID[\"Hughes 1980\",6378273,298.279411123061,");
   542    542       add_srs_wkt (p, 4,
   543    543           "AUTHORITY[\"EPSG\",\"7058\"]],AUTHORITY[\"EPSG\",\"6054\"");
   544    544       add_srs_wkt (p, 5,
   545    545           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
   546    546       add_srs_wkt (p, 6,
   547    547           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
   548    548       add_srs_wkt (p, 7,
................................................................................
  3261   3261           "GR96 / EPSG Arctic zone 5-41", 0, 0,
  3262   3262           "GRS 1980", "Greenwich",
  3263   3263           "Greenland_1996", "Lambert_Conformal_Conic_2SP", "metre",
  3264   3264           "Easting", "East", "Northing", "North");
  3265   3265       add_proj4text (p, 0,
  3266   3266           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  3267   3267       add_proj4text (p, 1,
  3268         -        "333 +lat_0=72.02500919444444 +lon_0=-62 +x_0=41500000 +y");
         3268  +        "333 +lat_0=72.02500919444445 +lon_0=-62 +x_0=41500000 +y");
  3269   3269       add_proj4text (p, 2,
  3270   3270           "_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m ");
  3271   3271       add_proj4text (p, 3,
  3272   3272           "+no_defs");
  3273   3273       add_srs_wkt (p, 0,
  3274   3274           "PROJCS[\"GR96 / EPSG Arctic zone 5-41\",GEOGCS[\"GR96\",");
  3275   3275       add_srs_wkt (p, 1,
................................................................................
  3287   3287       add_srs_wkt (p, 7,
  3288   3288           "\",\"4747\"]],PROJECTION[\"Lambert_Conformal_Conic_2SP\"");
  3289   3289       add_srs_wkt (p, 8,
  3290   3290           "],PARAMETER[\"standard_parallel_1\",73.66666666666667],P");
  3291   3291       add_srs_wkt (p, 9,
  3292   3292           "ARAMETER[\"standard_parallel_2\",70.33333333333333],PARA");
  3293   3293       add_srs_wkt (p, 10,
  3294         -        "METER[\"latitude_of_origin\",72.02500919444444],PARAMETE");
         3294  +        "METER[\"latitude_of_origin\",72.02500919444445],PARAMETE");
  3295   3295       add_srs_wkt (p, 11,
  3296   3296           "R[\"central_meridian\",-62],PARAMETER[\"false_easting\",");
  3297   3297       add_srs_wkt (p, 12,
  3298   3298           "41500000],PARAMETER[\"false_northing\",5500000],UNIT[\"m");
  3299   3299       add_srs_wkt (p, 13,
  3300   3300           "etre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",");
  3301   3301       add_srs_wkt (p, 14,
................................................................................
  3306   3306           "GR96 / EPSG Arctic zone 5-43", 0, 0,
  3307   3307           "GRS 1980", "Greenwich",
  3308   3308           "Greenland_1996", "Lambert_Conformal_Conic_2SP", "metre",
  3309   3309           "Easting", "East", "Northing", "North");
  3310   3310       add_proj4text (p, 0,
  3311   3311           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  3312   3312       add_proj4text (p, 1,
  3313         -        "333 +lat_0=72.02500919444444 +lon_0=-42 +x_0=43500000 +y");
         3313  +        "333 +lat_0=72.02500919444445 +lon_0=-42 +x_0=43500000 +y");
  3314   3314       add_proj4text (p, 2,
  3315   3315           "_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m ");
  3316   3316       add_proj4text (p, 3,
  3317   3317           "+no_defs");
  3318   3318       add_srs_wkt (p, 0,
  3319   3319           "PROJCS[\"GR96 / EPSG Arctic zone 5-43\",GEOGCS[\"GR96\",");
  3320   3320       add_srs_wkt (p, 1,
................................................................................
  3332   3332       add_srs_wkt (p, 7,
  3333   3333           "\",\"4747\"]],PROJECTION[\"Lambert_Conformal_Conic_2SP\"");
  3334   3334       add_srs_wkt (p, 8,
  3335   3335           "],PARAMETER[\"standard_parallel_1\",73.66666666666667],P");
  3336   3336       add_srs_wkt (p, 9,
  3337   3337           "ARAMETER[\"standard_parallel_2\",70.33333333333333],PARA");
  3338   3338       add_srs_wkt (p, 10,
  3339         -        "METER[\"latitude_of_origin\",72.02500919444444],PARAMETE");
         3339  +        "METER[\"latitude_of_origin\",72.02500919444445],PARAMETE");
  3340   3340       add_srs_wkt (p, 11,
  3341   3341           "R[\"central_meridian\",-42],PARAMETER[\"false_easting\",");
  3342   3342       add_srs_wkt (p, 12,
  3343   3343           "43500000],PARAMETER[\"false_northing\",5500000],UNIT[\"m");
  3344   3344       add_srs_wkt (p, 13,
  3345   3345           "etre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",");
  3346   3346       add_srs_wkt (p, 14,
................................................................................
  3351   3351           "GR96 / EPSG Arctic zone 5-45", 0, 0,
  3352   3352           "GRS 1980", "Greenwich",
  3353   3353           "Greenland_1996", "Lambert_Conformal_Conic_2SP", "metre",
  3354   3354           "Easting", "East", "Northing", "North");
  3355   3355       add_proj4text (p, 0,
  3356   3356           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  3357   3357       add_proj4text (p, 1,
  3358         -        "333 +lat_0=72.02500919444444 +lon_0=-22 +x_0=45500000 +y");
         3358  +        "333 +lat_0=72.02500919444445 +lon_0=-22 +x_0=45500000 +y");
  3359   3359       add_proj4text (p, 2,
  3360   3360           "_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m ");
  3361   3361       add_proj4text (p, 3,
  3362   3362           "+no_defs");
  3363   3363       add_srs_wkt (p, 0,
  3364   3364           "PROJCS[\"GR96 / EPSG Arctic zone 5-45\",GEOGCS[\"GR96\",");
  3365   3365       add_srs_wkt (p, 1,
................................................................................
  3377   3377       add_srs_wkt (p, 7,
  3378   3378           "\",\"4747\"]],PROJECTION[\"Lambert_Conformal_Conic_2SP\"");
  3379   3379       add_srs_wkt (p, 8,
  3380   3380           "],PARAMETER[\"standard_parallel_1\",73.66666666666667],P");
  3381   3381       add_srs_wkt (p, 9,
  3382   3382           "ARAMETER[\"standard_parallel_2\",70.33333333333333],PARA");
  3383   3383       add_srs_wkt (p, 10,
  3384         -        "METER[\"latitude_of_origin\",72.02500919444444],PARAMETE");
         3384  +        "METER[\"latitude_of_origin\",72.02500919444445],PARAMETE");
  3385   3385       add_srs_wkt (p, 11,
  3386   3386           "R[\"central_meridian\",-22],PARAMETER[\"false_easting\",");
  3387   3387       add_srs_wkt (p, 12,
  3388   3388           "45500000],PARAMETER[\"false_northing\",5500000],UNIT[\"m");
  3389   3389       add_srs_wkt (p, 13,
  3390   3390           "etre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",");
  3391   3391       add_srs_wkt (p, 14,
................................................................................
  3865   3865           "ETRS89 / EPSG Arctic zone 5-11", 0, 0,
  3866   3866           "GRS 1980", "Greenwich",
  3867   3867           "European_Terrestrial_Reference_System_1989", "Lambert_Conformal_Conic_2SP", "metre",
  3868   3868           "Easting", "East", "Northing", "North");
  3869   3869       add_proj4text (p, 0,
  3870   3870           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  3871   3871       add_proj4text (p, 1,
  3872         -        "333 +lat_0=72.02500919444444 +lon_0=14 +x_0=11500000 +y_");
         3872  +        "333 +lat_0=72.02500919444445 +lon_0=14 +x_0=11500000 +y_");
  3873   3873       add_proj4text (p, 2,
  3874   3874           "0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +");
  3875   3875       add_proj4text (p, 3,
  3876   3876           "no_defs");
  3877   3877       add_srs_wkt (p, 0,
  3878   3878           "PROJCS[\"ETRS89 / EPSG Arctic zone 5-11\",GEOGCS[\"ETRS8");
  3879   3879       add_srs_wkt (p, 1,
................................................................................
  3893   3893       add_srs_wkt (p, 8,
  3894   3894           "\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_pa");
  3895   3895       add_srs_wkt (p, 9,
  3896   3896           "rallel_1\",73.66666666666667],PARAMETER[\"standard_paral");
  3897   3897       add_srs_wkt (p, 10,
  3898   3898           "lel_2\",70.33333333333333],PARAMETER[\"latitude_of_origi");
  3899   3899       add_srs_wkt (p, 11,
  3900         -        "n\",72.02500919444444],PARAMETER[\"central_meridian\",14");
         3900  +        "n\",72.02500919444445],PARAMETER[\"central_meridian\",14");
  3901   3901       add_srs_wkt (p, 12,
  3902   3902           "],PARAMETER[\"false_easting\",11500000],PARAMETER[\"fals");
  3903   3903       add_srs_wkt (p, 13,
  3904   3904           "e_northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\"");
  3905   3905       add_srs_wkt (p, 14,
  3906   3906           ",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NOR");
  3907   3907       add_srs_wkt (p, 15,
................................................................................
  3910   3910           "ETRS89 / EPSG Arctic zone 5-13", 0, 0,
  3911   3911           "GRS 1980", "Greenwich",
  3912   3912           "European_Terrestrial_Reference_System_1989", "Lambert_Conformal_Conic_2SP", "metre",
  3913   3913           "Easting", "East", "Northing", "North");
  3914   3914       add_proj4text (p, 0,
  3915   3915           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  3916   3916       add_proj4text (p, 1,
  3917         -        "333 +lat_0=72.02500919444444 +lon_0=34 +x_0=13500000 +y_");
         3917  +        "333 +lat_0=72.02500919444445 +lon_0=34 +x_0=13500000 +y_");
  3918   3918       add_proj4text (p, 2,
  3919   3919           "0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +");
  3920   3920       add_proj4text (p, 3,
  3921   3921           "no_defs");
  3922   3922       add_srs_wkt (p, 0,
  3923   3923           "PROJCS[\"ETRS89 / EPSG Arctic zone 5-13\",GEOGCS[\"ETRS8");
  3924   3924       add_srs_wkt (p, 1,
................................................................................
  3938   3938       add_srs_wkt (p, 8,
  3939   3939           "\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_pa");
  3940   3940       add_srs_wkt (p, 9,
  3941   3941           "rallel_1\",73.66666666666667],PARAMETER[\"standard_paral");
  3942   3942       add_srs_wkt (p, 10,
  3943   3943           "lel_2\",70.33333333333333],PARAMETER[\"latitude_of_origi");
  3944   3944       add_srs_wkt (p, 11,
  3945         -        "n\",72.02500919444444],PARAMETER[\"central_meridian\",34");
         3945  +        "n\",72.02500919444445],PARAMETER[\"central_meridian\",34");
  3946   3946       add_srs_wkt (p, 12,
  3947   3947           "],PARAMETER[\"false_easting\",13500000],PARAMETER[\"fals");
  3948   3948       add_srs_wkt (p, 13,
  3949   3949           "e_northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\"");
  3950   3950       add_srs_wkt (p, 14,
  3951   3951           ",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NOR");
  3952   3952       add_srs_wkt (p, 15,

Changes to src/srsinit/epsg_inlined_29.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   140    140           "WGS 84 / EPSG Arctic zone 5-15", 0, 0,
   141    141           "WGS 84", "Greenwich",
   142    142           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   143    143           "Easting", "East", "Northing", "North");
   144    144       add_proj4text (p, 0,
   145    145           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   146    146       add_proj4text (p, 1,
   147         -        "333 +lat_0=72.02500919444444 +lon_0=54 +x_0=15500000 +y_");
          147  +        "333 +lat_0=72.02500919444445 +lon_0=54 +x_0=15500000 +y_");
   148    148       add_proj4text (p, 2,
   149    149           "0=5500000 +datum=WGS84 +units=m +no_defs");
   150    150       add_srs_wkt (p, 0,
   151    151           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-15\",GEOGCS[\"WGS 8");
   152    152       add_srs_wkt (p, 1,
   153    153           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   154    154       add_srs_wkt (p, 2,
................................................................................
   164    164       add_srs_wkt (p, 7,
   165    165           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   166    166       add_srs_wkt (p, 8,
   167    167           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   168    168       add_srs_wkt (p, 9,
   169    169           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   170    170       add_srs_wkt (p, 10,
   171         -        ",72.02500919444444],PARAMETER[\"central_meridian\",54],P");
          171  +        ",72.02500919444445],PARAMETER[\"central_meridian\",54],P");
   172    172       add_srs_wkt (p, 11,
   173    173           "ARAMETER[\"false_easting\",15500000],PARAMETER[\"false_n");
   174    174       add_srs_wkt (p, 12,
   175    175           "orthing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"");
   176    176       add_srs_wkt (p, 13,
   177    177           "9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH]");
   178    178       add_srs_wkt (p, 14,
................................................................................
   181    181           "WGS 84 / EPSG Arctic zone 5-17", 0, 0,
   182    182           "WGS 84", "Greenwich",
   183    183           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   184    184           "Easting", "East", "Northing", "North");
   185    185       add_proj4text (p, 0,
   186    186           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   187    187       add_proj4text (p, 1,
   188         -        "333 +lat_0=72.02500919444444 +lon_0=74 +x_0=17500000 +y_");
          188  +        "333 +lat_0=72.02500919444445 +lon_0=74 +x_0=17500000 +y_");
   189    189       add_proj4text (p, 2,
   190    190           "0=5500000 +datum=WGS84 +units=m +no_defs");
   191    191       add_srs_wkt (p, 0,
   192    192           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-17\",GEOGCS[\"WGS 8");
   193    193       add_srs_wkt (p, 1,
   194    194           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   195    195       add_srs_wkt (p, 2,
................................................................................
   205    205       add_srs_wkt (p, 7,
   206    206           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   207    207       add_srs_wkt (p, 8,
   208    208           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   209    209       add_srs_wkt (p, 9,
   210    210           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   211    211       add_srs_wkt (p, 10,
   212         -        ",72.02500919444444],PARAMETER[\"central_meridian\",74],P");
          212  +        ",72.02500919444445],PARAMETER[\"central_meridian\",74],P");
   213    213       add_srs_wkt (p, 11,
   214    214           "ARAMETER[\"false_easting\",17500000],PARAMETER[\"false_n");
   215    215       add_srs_wkt (p, 12,
   216    216           "orthing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"");
   217    217       add_srs_wkt (p, 13,
   218    218           "9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH]");
   219    219       add_srs_wkt (p, 14,
................................................................................
   222    222           "WGS 84 / EPSG Arctic zone 5-19", 0, 0,
   223    223           "WGS 84", "Greenwich",
   224    224           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   225    225           "Easting", "East", "Northing", "North");
   226    226       add_proj4text (p, 0,
   227    227           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   228    228       add_proj4text (p, 1,
   229         -        "333 +lat_0=72.02500919444444 +lon_0=95 +x_0=19500000 +y_");
          229  +        "333 +lat_0=72.02500919444445 +lon_0=95 +x_0=19500000 +y_");
   230    230       add_proj4text (p, 2,
   231    231           "0=5500000 +datum=WGS84 +units=m +no_defs");
   232    232       add_srs_wkt (p, 0,
   233    233           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-19\",GEOGCS[\"WGS 8");
   234    234       add_srs_wkt (p, 1,
   235    235           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   236    236       add_srs_wkt (p, 2,
................................................................................
   246    246       add_srs_wkt (p, 7,
   247    247           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   248    248       add_srs_wkt (p, 8,
   249    249           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   250    250       add_srs_wkt (p, 9,
   251    251           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   252    252       add_srs_wkt (p, 10,
   253         -        ",72.02500919444444],PARAMETER[\"central_meridian\",95],P");
          253  +        ",72.02500919444445],PARAMETER[\"central_meridian\",95],P");
   254    254       add_srs_wkt (p, 11,
   255    255           "ARAMETER[\"false_easting\",19500000],PARAMETER[\"false_n");
   256    256       add_srs_wkt (p, 12,
   257    257           "orthing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"");
   258    258       add_srs_wkt (p, 13,
   259    259           "9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH]");
   260    260       add_srs_wkt (p, 14,
................................................................................
   263    263           "WGS 84 / EPSG Arctic zone 5-21", 0, 0,
   264    264           "WGS 84", "Greenwich",
   265    265           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   266    266           "Easting", "East", "Northing", "North");
   267    267       add_proj4text (p, 0,
   268    268           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   269    269       add_proj4text (p, 1,
   270         -        "333 +lat_0=72.02500919444444 +lon_0=116 +x_0=21500000 +y");
          270  +        "333 +lat_0=72.02500919444445 +lon_0=116 +x_0=21500000 +y");
   271    271       add_proj4text (p, 2,
   272    272           "_0=5500000 +datum=WGS84 +units=m +no_defs");
   273    273       add_srs_wkt (p, 0,
   274    274           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-21\",GEOGCS[\"WGS 8");
   275    275       add_srs_wkt (p, 1,
   276    276           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   277    277       add_srs_wkt (p, 2,
................................................................................
   287    287       add_srs_wkt (p, 7,
   288    288           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   289    289       add_srs_wkt (p, 8,
   290    290           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   291    291       add_srs_wkt (p, 9,
   292    292           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   293    293       add_srs_wkt (p, 10,
   294         -        ",72.02500919444444],PARAMETER[\"central_meridian\",116],");
          294  +        ",72.02500919444445],PARAMETER[\"central_meridian\",116],");
   295    295       add_srs_wkt (p, 11,
   296    296           "PARAMETER[\"false_easting\",21500000],PARAMETER[\"false_");
   297    297       add_srs_wkt (p, 12,
   298    298           "northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",");
   299    299       add_srs_wkt (p, 13,
   300    300           "\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORT");
   301    301       add_srs_wkt (p, 14,
................................................................................
   304    304           "WGS 84 / EPSG Arctic zone 5-23", 0, 0,
   305    305           "WGS 84", "Greenwich",
   306    306           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   307    307           "Easting", "East", "Northing", "North");
   308    308       add_proj4text (p, 0,
   309    309           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   310    310       add_proj4text (p, 1,
   311         -        "333 +lat_0=72.02500919444444 +lon_0=137 +x_0=23500000 +y");
          311  +        "333 +lat_0=72.02500919444445 +lon_0=137 +x_0=23500000 +y");
   312    312       add_proj4text (p, 2,
   313    313           "_0=5500000 +datum=WGS84 +units=m +no_defs");
   314    314       add_srs_wkt (p, 0,
   315    315           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-23\",GEOGCS[\"WGS 8");
   316    316       add_srs_wkt (p, 1,
   317    317           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   318    318       add_srs_wkt (p, 2,
................................................................................
   328    328       add_srs_wkt (p, 7,
   329    329           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   330    330       add_srs_wkt (p, 8,
   331    331           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   332    332       add_srs_wkt (p, 9,
   333    333           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   334    334       add_srs_wkt (p, 10,
   335         -        ",72.02500919444444],PARAMETER[\"central_meridian\",137],");
          335  +        ",72.02500919444445],PARAMETER[\"central_meridian\",137],");
   336    336       add_srs_wkt (p, 11,
   337    337           "PARAMETER[\"false_easting\",23500000],PARAMETER[\"false_");
   338    338       add_srs_wkt (p, 12,
   339    339           "northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",");
   340    340       add_srs_wkt (p, 13,
   341    341           "\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORT");
   342    342       add_srs_wkt (p, 14,
................................................................................
   345    345           "WGS 84 / EPSG Arctic zone 5-25", 0, 0,
   346    346           "WGS 84", "Greenwich",
   347    347           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   348    348           "Easting", "East", "Northing", "North");
   349    349       add_proj4text (p, 0,
   350    350           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   351    351       add_proj4text (p, 1,
   352         -        "333 +lat_0=72.02500919444444 +lon_0=158 +x_0=25500000 +y");
          352  +        "333 +lat_0=72.02500919444445 +lon_0=158 +x_0=25500000 +y");
   353    353       add_proj4text (p, 2,
   354    354           "_0=5500000 +datum=WGS84 +units=m +no_defs");
   355    355       add_srs_wkt (p, 0,
   356    356           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-25\",GEOGCS[\"WGS 8");
   357    357       add_srs_wkt (p, 1,
   358    358           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   359    359       add_srs_wkt (p, 2,
................................................................................
   369    369       add_srs_wkt (p, 7,
   370    370           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   371    371       add_srs_wkt (p, 8,
   372    372           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   373    373       add_srs_wkt (p, 9,
   374    374           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   375    375       add_srs_wkt (p, 10,
   376         -        ",72.02500919444444],PARAMETER[\"central_meridian\",158],");
          376  +        ",72.02500919444445],PARAMETER[\"central_meridian\",158],");
   377    377       add_srs_wkt (p, 11,
   378    378           "PARAMETER[\"false_easting\",25500000],PARAMETER[\"false_");
   379    379       add_srs_wkt (p, 12,
   380    380           "northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",");
   381    381       add_srs_wkt (p, 13,
   382    382           "\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORT");
   383    383       add_srs_wkt (p, 14,
................................................................................
   386    386           "WGS 84 / EPSG Arctic zone 5-27", 0, 0,
   387    387           "WGS 84", "Greenwich",
   388    388           "WGS_1984", "Lambert_Conformal_Conic_2SP", "metre",
   389    389           "Easting", "East", "Northing", "North");
   390    390       add_proj4text (p, 0,
   391    391           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   392    392       add_proj4text (p, 1,
   393         -        "333 +lat_0=72.02500919444444 +lon_0=179 +x_0=27500000 +y");
          393  +        "333 +lat_0=72.02500919444445 +lon_0=179 +x_0=27500000 +y");
   394    394       add_proj4text (p, 2,
   395    395           "_0=5500000 +datum=WGS84 +units=m +no_defs");
   396    396       add_srs_wkt (p, 0,
   397    397           "PROJCS[\"WGS 84 / EPSG Arctic zone 5-27\",GEOGCS[\"WGS 8");
   398    398       add_srs_wkt (p, 1,
   399    399           "4\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.2");
   400    400       add_srs_wkt (p, 2,
................................................................................
   410    410       add_srs_wkt (p, 7,
   411    411           "ambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_paral");
   412    412       add_srs_wkt (p, 8,
   413    413           "lel_1\",73.66666666666667],PARAMETER[\"standard_parallel");
   414    414       add_srs_wkt (p, 9,
   415    415           "_2\",70.33333333333333],PARAMETER[\"latitude_of_origin\"");
   416    416       add_srs_wkt (p, 10,
   417         -        ",72.02500919444444],PARAMETER[\"central_meridian\",179],");
          417  +        ",72.02500919444445],PARAMETER[\"central_meridian\",179],");
   418    418       add_srs_wkt (p, 11,
   419    419           "PARAMETER[\"false_easting\",27500000],PARAMETER[\"false_");
   420    420       add_srs_wkt (p, 12,
   421    421           "northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",");
   422    422       add_srs_wkt (p, 13,
   423    423           "\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORT");
   424    424       add_srs_wkt (p, 14,
................................................................................
   427    427           "NAD83(NSRS2007) / EPSG Arctic zone 5-29", 0, 0,
   428    428           "GRS 1980", "Greenwich",
   429    429           "NAD83_National_Spatial_Reference_System_2007", "Lambert_Conformal_Conic_2SP", "metre",
   430    430           "Easting", "East", "Northing", "North");
   431    431       add_proj4text (p, 0,
   432    432           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   433    433       add_proj4text (p, 1,
   434         -        "333 +lat_0=72.02500919444444 +lon_0=-163 +x_0=29500000 +");
          434  +        "333 +lat_0=72.02500919444445 +lon_0=-163 +x_0=29500000 +");
   435    435       add_proj4text (p, 2,
   436    436           "y_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m");
   437    437       add_proj4text (p, 3,
   438    438           " +no_defs");
   439    439       add_srs_wkt (p, 0,
   440    440           "PROJCS[\"NAD83(NSRS2007) / EPSG Arctic zone 5-29\",GEOGC");
   441    441       add_srs_wkt (p, 1,
................................................................................
   455    455       add_srs_wkt (p, 8,
   456    456           "4759\"]],PROJECTION[\"Lambert_Conformal_Conic_2SP\"],PAR");
   457    457       add_srs_wkt (p, 9,
   458    458           "AMETER[\"standard_parallel_1\",73.66666666666667],PARAME");
   459    459       add_srs_wkt (p, 10,
   460    460           "TER[\"standard_parallel_2\",70.33333333333333],PARAMETER");
   461    461       add_srs_wkt (p, 11,
   462         -        "[\"latitude_of_origin\",72.02500919444444],PARAMETER[\"c");
          462  +        "[\"latitude_of_origin\",72.02500919444445],PARAMETER[\"c");
   463    463       add_srs_wkt (p, 12,
   464    464           "entral_meridian\",-163],PARAMETER[\"false_easting\",2950");
   465    465       add_srs_wkt (p, 13,
   466    466           "0000],PARAMETER[\"false_northing\",5500000],UNIT[\"metre");
   467    467       add_srs_wkt (p, 14,
   468    468           "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST");
   469    469       add_srs_wkt (p, 15,
................................................................................
   472    472           "NAD83(NSRS2007) / EPSG Arctic zone 5-31", 0, 0,
   473    473           "GRS 1980", "Greenwich",
   474    474           "NAD83_National_Spatial_Reference_System_2007", "Lambert_Conformal_Conic_2SP", "metre",
   475    475           "Easting", "East", "Northing", "North");
   476    476       add_proj4text (p, 0,
   477    477           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   478    478       add_proj4text (p, 1,
   479         -        "333 +lat_0=72.02500919444444 +lon_0=-147 +x_0=31500000 +");
          479  +        "333 +lat_0=72.02500919444445 +lon_0=-147 +x_0=31500000 +");
   480    480       add_proj4text (p, 2,
   481    481           "y_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m");
   482    482       add_proj4text (p, 3,
   483    483           " +no_defs");
   484    484       add_srs_wkt (p, 0,
   485    485           "PROJCS[\"NAD83(NSRS2007) / EPSG Arctic zone 5-31\",GEOGC");
   486    486       add_srs_wkt (p, 1,
................................................................................
   500    500       add_srs_wkt (p, 8,
   501    501           "4759\"]],PROJECTION[\"Lambert_Conformal_Conic_2SP\"],PAR");
   502    502       add_srs_wkt (p, 9,
   503    503           "AMETER[\"standard_parallel_1\",73.66666666666667],PARAME");
   504    504       add_srs_wkt (p, 10,
   505    505           "TER[\"standard_parallel_2\",70.33333333333333],PARAMETER");
   506    506       add_srs_wkt (p, 11,
   507         -        "[\"latitude_of_origin\",72.02500919444444],PARAMETER[\"c");
          507  +        "[\"latitude_of_origin\",72.02500919444445],PARAMETER[\"c");
   508    508       add_srs_wkt (p, 12,
   509    509           "entral_meridian\",-147],PARAMETER[\"false_easting\",3150");
   510    510       add_srs_wkt (p, 13,
   511    511           "0000],PARAMETER[\"false_northing\",5500000],UNIT[\"metre");
   512    512       add_srs_wkt (p, 14,
   513    513           "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST");
   514    514       add_srs_wkt (p, 15,
................................................................................
   994    994           "NAD83(CSRS) / EPSG Arctic zone 5-33", 0, 0,
   995    995           "GRS 1980", "Greenwich",
   996    996           "NAD83_Canadian_Spatial_Reference_System", "Lambert_Conformal_Conic_2SP", "metre",
   997    997           "Easting", "East", "Northing", "North");
   998    998       add_proj4text (p, 0,
   999    999           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  1000   1000       add_proj4text (p, 1,
  1001         -        "333 +lat_0=72.02500919444444 +lon_0=-131 +x_0=33500000 +");
         1001  +        "333 +lat_0=72.02500919444445 +lon_0=-131 +x_0=33500000 +");
  1002   1002       add_proj4text (p, 2,
  1003   1003           "y_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m");
  1004   1004       add_proj4text (p, 3,
  1005   1005           " +no_defs");
  1006   1006       add_srs_wkt (p, 0,
  1007   1007           "PROJCS[\"NAD83(CSRS) / EPSG Arctic zone 5-33\",GEOGCS[\"");
  1008   1008       add_srs_wkt (p, 1,
................................................................................
  1022   1022       add_srs_wkt (p, 8,
  1023   1023           "JECTION[\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"sta");
  1024   1024       add_srs_wkt (p, 9,
  1025   1025           "ndard_parallel_1\",73.66666666666667],PARAMETER[\"standa");
  1026   1026       add_srs_wkt (p, 10,
  1027   1027           "rd_parallel_2\",70.33333333333333],PARAMETER[\"latitude_");
  1028   1028       add_srs_wkt (p, 11,
  1029         -        "of_origin\",72.02500919444444],PARAMETER[\"central_merid");
         1029  +        "of_origin\",72.02500919444445],PARAMETER[\"central_merid");
  1030   1030       add_srs_wkt (p, 12,
  1031   1031           "ian\",-131],PARAMETER[\"false_easting\",33500000],PARAME");
  1032   1032       add_srs_wkt (p, 13,
  1033   1033           "TER[\"false_northing\",5500000],UNIT[\"metre\",1,AUTHORI");
  1034   1034       add_srs_wkt (p, 14,
  1035   1035           "TY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Nor");
  1036   1036       add_srs_wkt (p, 15,
................................................................................
  1039   1039           "NAD83(CSRS) / EPSG Arctic zone 5-35", 0, 0,
  1040   1040           "GRS 1980", "Greenwich",
  1041   1041           "NAD83_Canadian_Spatial_Reference_System", "Lambert_Conformal_Conic_2SP", "metre",
  1042   1042           "Easting", "East", "Northing", "North");
  1043   1043       add_proj4text (p, 0,
  1044   1044           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  1045   1045       add_proj4text (p, 1,
  1046         -        "333 +lat_0=72.02500919444444 +lon_0=-111 +x_0=35500000 +");
         1046  +        "333 +lat_0=72.02500919444445 +lon_0=-111 +x_0=35500000 +");
  1047   1047       add_proj4text (p, 2,
  1048   1048           "y_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m");
  1049   1049       add_proj4text (p, 3,
  1050   1050           " +no_defs");
  1051   1051       add_srs_wkt (p, 0,
  1052   1052           "PROJCS[\"NAD83(CSRS) / EPSG Arctic zone 5-35\",GEOGCS[\"");
  1053   1053       add_srs_wkt (p, 1,
................................................................................
  1067   1067       add_srs_wkt (p, 8,
  1068   1068           "JECTION[\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"sta");
  1069   1069       add_srs_wkt (p, 9,
  1070   1070           "ndard_parallel_1\",73.66666666666667],PARAMETER[\"standa");
  1071   1071       add_srs_wkt (p, 10,
  1072   1072           "rd_parallel_2\",70.33333333333333],PARAMETER[\"latitude_");
  1073   1073       add_srs_wkt (p, 11,
  1074         -        "of_origin\",72.02500919444444],PARAMETER[\"central_merid");
         1074  +        "of_origin\",72.02500919444445],PARAMETER[\"central_merid");
  1075   1075       add_srs_wkt (p, 12,
  1076   1076           "ian\",-111],PARAMETER[\"false_easting\",35500000],PARAME");
  1077   1077       add_srs_wkt (p, 13,
  1078   1078           "TER[\"false_northing\",5500000],UNIT[\"metre\",1,AUTHORI");
  1079   1079       add_srs_wkt (p, 14,
  1080   1080           "TY[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Nor");
  1081   1081       add_srs_wkt (p, 15,
................................................................................
  1084   1084           "NAD83(CSRS) / EPSG Arctic zone 5-37", 0, 0,
  1085   1085           "GRS 1980", "Greenwich",
  1086   1086           "NAD83_Canadian_Spatial_Reference_System", "Lambert_Conformal_Conic_2SP", "metre",
  1087   1087           "Easting", "East", "Northing", "North");
  1088   1088       add_proj4text (p, 0,
  1089   1089           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  1090   1090       add_proj4text (p, 1,
  1091         -        "333 +lat_0=72.02500919444444 +lon_0=-91 +x_0=37500000 +y");
         1091  +        "333 +lat_0=72.02500919444445 +lon_0=-91 +x_0=37500000 +y");
  1092   1092       add_proj4text (p, 2,
  1093   1093           "_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m ");
  1094   1094       add_proj4text (p, 3,
  1095   1095           "+no_defs");
  1096   1096       add_srs_wkt (p, 0,
  1097   1097           "PROJCS[\"NAD83(CSRS) / EPSG Arctic zone 5-37\",GEOGCS[\"");
  1098   1098       add_srs_wkt (p, 1,
................................................................................
  1112   1112       add_srs_wkt (p, 8,
  1113   1113           "JECTION[\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"sta");
  1114   1114       add_srs_wkt (p, 9,
  1115   1115           "ndard_parallel_1\",73.66666666666667],PARAMETER[\"standa");
  1116   1116       add_srs_wkt (p, 10,
  1117   1117           "rd_parallel_2\",70.33333333333333],PARAMETER[\"latitude_");
  1118   1118       add_srs_wkt (p, 11,
  1119         -        "of_origin\",72.02500919444444],PARAMETER[\"central_merid");
         1119  +        "of_origin\",72.02500919444445],PARAMETER[\"central_merid");
  1120   1120       add_srs_wkt (p, 12,
  1121   1121           "ian\",-91],PARAMETER[\"false_easting\",37500000],PARAMET");
  1122   1122       add_srs_wkt (p, 13,
  1123   1123           "ER[\"false_northing\",5500000],UNIT[\"metre\",1,AUTHORIT");
  1124   1124       add_srs_wkt (p, 14,
  1125   1125           "Y[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Nort");
  1126   1126       add_srs_wkt (p, 15,
................................................................................
  1129   1129           "NAD83(CSRS) / EPSG Arctic zone 5-39", 0, 0,
  1130   1130           "GRS 1980", "Greenwich",
  1131   1131           "NAD83_Canadian_Spatial_Reference_System", "Lambert_Conformal_Conic_2SP", "metre",
  1132   1132           "Easting", "East", "Northing", "North");
  1133   1133       add_proj4text (p, 0,
  1134   1134           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  1135   1135       add_proj4text (p, 1,
  1136         -        "333 +lat_0=72.02500919444444 +lon_0=-71 +x_0=39500000 +y");
         1136  +        "333 +lat_0=72.02500919444445 +lon_0=-71 +x_0=39500000 +y");
  1137   1137       add_proj4text (p, 2,
  1138   1138           "_0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m ");
  1139   1139       add_proj4text (p, 3,
  1140   1140           "+no_defs");
  1141   1141       add_srs_wkt (p, 0,
  1142   1142           "PROJCS[\"NAD83(CSRS) / EPSG Arctic zone 5-39\",GEOGCS[\"");
  1143   1143       add_srs_wkt (p, 1,
................................................................................
  1157   1157       add_srs_wkt (p, 8,
  1158   1158           "JECTION[\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"sta");
  1159   1159       add_srs_wkt (p, 9,
  1160   1160           "ndard_parallel_1\",73.66666666666667],PARAMETER[\"standa");
  1161   1161       add_srs_wkt (p, 10,
  1162   1162           "rd_parallel_2\",70.33333333333333],PARAMETER[\"latitude_");
  1163   1163       add_srs_wkt (p, 11,
  1164         -        "of_origin\",72.02500919444444],PARAMETER[\"central_merid");
         1164  +        "of_origin\",72.02500919444445],PARAMETER[\"central_merid");
  1165   1165       add_srs_wkt (p, 12,
  1166   1166           "ian\",-71],PARAMETER[\"false_easting\",39500000],PARAMET");
  1167   1167       add_srs_wkt (p, 13,
  1168   1168           "ER[\"false_northing\",5500000],UNIT[\"metre\",1,AUTHORIT");
  1169   1169       add_srs_wkt (p, 14,
  1170   1170           "Y[\"EPSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Nort");
  1171   1171       add_srs_wkt (p, 15,
................................................................................
  1756   1756           "ETRS89 / EPSG Arctic zone 5-47", 0, 0,
  1757   1757           "GRS 1980", "Greenwich",
  1758   1758           "European_Terrestrial_Reference_System_1989", "Lambert_Conformal_Conic_2SP", "metre",
  1759   1759           "Easting", "East", "Northing", "North");
  1760   1760       add_proj4text (p, 0,
  1761   1761           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
  1762   1762       add_proj4text (p, 1,
  1763         -        "333 +lat_0=72.02500919444444 +lon_0=-5 +x_0=47500000 +y_");
         1763  +        "333 +lat_0=72.02500919444445 +lon_0=-5 +x_0=47500000 +y_");
  1764   1764       add_proj4text (p, 2,
  1765   1765           "0=5500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +");
  1766   1766       add_proj4text (p, 3,
  1767   1767           "no_defs");
  1768   1768       add_srs_wkt (p, 0,
  1769   1769           "PROJCS[\"ETRS89 / EPSG Arctic zone 5-47\",GEOGCS[\"ETRS8");
  1770   1770       add_srs_wkt (p, 1,
................................................................................
  1784   1784       add_srs_wkt (p, 8,
  1785   1785           "\"Lambert_Conformal_Conic_2SP\"],PARAMETER[\"standard_pa");
  1786   1786       add_srs_wkt (p, 9,
  1787   1787           "rallel_1\",73.66666666666667],PARAMETER[\"standard_paral");
  1788   1788       add_srs_wkt (p, 10,
  1789   1789           "lel_2\",70.33333333333333],PARAMETER[\"latitude_of_origi");
  1790   1790       add_srs_wkt (p, 11,
  1791         -        "n\",72.02500919444444],PARAMETER[\"central_meridian\",-5");
         1791  +        "n\",72.02500919444445],PARAMETER[\"central_meridian\",-5");
  1792   1792       add_srs_wkt (p, 12,
  1793   1793           "],PARAMETER[\"false_easting\",47500000],PARAMETER[\"fals");
  1794   1794       add_srs_wkt (p, 13,
  1795   1795           "e_northing\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\"");
  1796   1796       add_srs_wkt (p, 14,
  1797   1797           ",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NOR");
  1798   1798       add_srs_wkt (p, 15,
................................................................................
  1807   1807       add_proj4text (p, 1,
  1808   1808           "79,-27.584,-7.862,8.163,6.042,-13.925 +units=ft +no_defs");
  1809   1809       add_srs_wkt (p, 0,
  1810   1810           "PROJCS[\"Grand Cayman National Grid 1959\",GEOGCS[\"GCGD");
  1811   1811       add_srs_wkt (p, 1,
  1812   1812           "59\",DATUM[\"Grand_Cayman_Geodetic_Datum_1959\",SPHEROID");
  1813   1813       add_srs_wkt (p, 2,
  1814         -        "[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         1814  +        "[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  1815   1815       add_srs_wkt (p, 3,
  1816   1816           "EPSG\",\"7008\"]],TOWGS84[-179.483,-69.379,-27.584,-7.86");
  1817   1817       add_srs_wkt (p, 4,
  1818   1818           "2,8.163,6.042,-13.925],AUTHORITY[\"EPSG\",\"6723\"]],PRI");
  1819   1819       add_srs_wkt (p, 5,
  1820   1820           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1821   1821       add_srs_wkt (p, 6,
................................................................................
  1846   1846       add_proj4text (p, 1,
  1847   1847           "180.304,-0.393,-2.323,2.96,-24.081 +units=ft +no_defs");
  1848   1848       add_srs_wkt (p, 0,
  1849   1849           "PROJCS[\"Sister Islands National Grid 1961\",GEOGCS[\"SI");
  1850   1850       add_srs_wkt (p, 1,
  1851   1851           "GD61\",DATUM[\"Sister_Islands_Geodetic_Datum_1961\",SPHE");
  1852   1852       add_srs_wkt (p, 2,
  1853         -        "ROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORI");
         1853  +        "ROID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORI");
  1854   1854       add_srs_wkt (p, 3,
  1855   1855           "TY[\"EPSG\",\"7008\"]],TOWGS84[8.853,-52.644,180.304,-0.");
  1856   1856       add_srs_wkt (p, 4,
  1857   1857           "393,-2.323,2.96,-24.081],AUTHORITY[\"EPSG\",\"6726\"]],P");
  1858   1858       add_srs_wkt (p, 5,
  1859   1859           "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
  1860   1860       add_srs_wkt (p, 6,
................................................................................
  3538   3538           "Reseau_National_Belge_1972", "Lambert_Conformal_Conic_2SP", "metre",
  3539   3539           "X", "East", "Y", "North");
  3540   3540       add_proj4text (p, 0,
  3541   3541           "+proj=lcc +lat_1=51.16666723333333 +lat_2=49.8333339 +la");
  3542   3542       add_proj4text (p, 1,
  3543   3543           "t_0=90 +lon_0=4.367486666666666 +x_0=150000.013 +y_0=540");
  3544   3544       add_proj4text (p, 2,
  3545         -        "0088.438 +ellps=intl +towgs84=-106.8686,52.2978,-103.723");
         3545  +        "0088.438 +ellps=intl +towgs84=-106.869,52.2978,-103.724,");
  3546   3546       add_proj4text (p, 3,
  3547         -        "9,0.3366,-0.457,1.8422,-1.2747 +units=m +vunits=m +no_de");
  3548         -    add_proj4text (p, 4,
  3549         -        "fs");
         3547  +        "0.3366,-0.457,1.8422,-1.2747 +units=m +vunits=m +no_defs");
  3550   3548       add_srs_wkt (p, 0,
  3551   3549           "COMPD_CS[\"Belge 1972 / Belgian Lambert 72 + Ostend heig");
  3552   3550       add_srs_wkt (p, 1,
  3553   3551           "ht\",PROJCS[\"Belge 1972 / Belgian Lambert 72\",GEOGCS[\"");
  3554   3552       add_srs_wkt (p, 2,
  3555   3553           "Belge 1972\",DATUM[\"Reseau_National_Belge_1972\",SPHERO");
  3556   3554       add_srs_wkt (p, 3,
  3557   3555           "ID[\"International 1924\",6378388,297,AUTHORITY[\"EPSG\"");
  3558   3556       add_srs_wkt (p, 4,
  3559         -        ",\"7022\"]],TOWGS84[-106.8686,52.2978,-103.7239,0.3366,-");
         3557  +        ",\"7022\"]],TOWGS84[-106.869,52.2978,-103.724,0.3366,-0.");
  3560   3558       add_srs_wkt (p, 5,
  3561         -        "0.457,1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIM");
         3559  +        "457,1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIMEM");
  3562   3560       add_srs_wkt (p, 6,
  3563         -        "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
         3561  +        "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  3564   3562       add_srs_wkt (p, 7,
  3565         -        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
         3563  +        "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  3566   3564       add_srs_wkt (p, 8,
  3567         -        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
         3565  +        "AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHOR");
  3568   3566       add_srs_wkt (p, 9,
  3569         -        "ORITY[\"EPSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal");
         3567  +        "ITY[\"EPSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal_C");
  3570   3568       add_srs_wkt (p, 10,
  3571         -        "_Conic_2SP\"],PARAMETER[\"standard_parallel_1\",51.16666");
         3569  +        "onic_2SP\"],PARAMETER[\"standard_parallel_1\",51.1666672");
  3572   3570       add_srs_wkt (p, 11,
  3573         -        "723333333],PARAMETER[\"standard_parallel_2\",49.8333339]");
         3571  +        "3333333],PARAMETER[\"standard_parallel_2\",49.8333339],P");
  3574   3572       add_srs_wkt (p, 12,
  3575         -        ",PARAMETER[\"latitude_of_origin\",90],PARAMETER[\"centra");
         3573  +        "ARAMETER[\"latitude_of_origin\",90],PARAMETER[\"central_");
  3576   3574       add_srs_wkt (p, 13,
  3577         -        "l_meridian\",4.367486666666666],PARAMETER[\"false_eastin");
         3575  +        "meridian\",4.367486666666666],PARAMETER[\"false_easting\"");
  3578   3576       add_srs_wkt (p, 14,
  3579         -        "g\",150000.013],PARAMETER[\"false_northing\",5400088.438");
         3577  +        ",150000.013],PARAMETER[\"false_northing\",5400088.438],U");
  3580   3578       add_srs_wkt (p, 15,
  3581         -        "],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"");
         3579  +        "NIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\"");
  3582   3580       add_srs_wkt (p, 16,
  3583         -        "X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"31370\"");
         3581  +        ",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"31370\"]],");
  3584   3582       add_srs_wkt (p, 17,
  3585         -        "]],VERT_CS[\"Ostend height\",VERT_DATUM[\"Ostend\",2005,");
         3583  +        "VERT_CS[\"Ostend height\",VERT_DATUM[\"Ostend\",2005,AUT");
  3586   3584       add_srs_wkt (p, 18,
  3587         -        "AUTHORITY[\"EPSG\",\"5110\"]],UNIT[\"metre\",1,AUTHORITY");
         3585  +        "HORITY[\"EPSG\",\"5110\"]],UNIT[\"metre\",1,AUTHORITY[\"");
  3588   3586       add_srs_wkt (p, 19,
  3589         -        "[\"EPSG\",\"9001\"]],AXIS[\"Up\",UP],AUTHORITY[\"EPSG\",");
         3587  +        "EPSG\",\"9001\"]],AXIS[\"Up\",UP],AUTHORITY[\"EPSG\",\"5");
  3590   3588       add_srs_wkt (p, 20,
  3591         -        "\"5710\"]],AUTHORITY[\"EPSG\",\"6190\"]]");
         3589  +        "710\"]],AUTHORITY[\"EPSG\",\"6190\"]]");
  3592   3590       p = add_epsg_def_ex (filter, first, last, 6204, "epsg", 6204,
  3593   3591           "Macedonian State Coordinate System", 0, 0,
  3594   3592           "Bessel 1841", "Greenwich",
  3595   3593           "MGI_1901", "Transverse_Mercator", "metre",
  3596   3594           "Y", "East", "X", "North");
  3597   3595       add_proj4text (p, 0,
  3598   3596           "+proj=tmerc +lat_0=0 +lon_0=21 +k=0.9999 +x_0=500000 +y_");
................................................................................
  3630   3628           "SG\",\"6204\"]]");
  3631   3629       p = add_epsg_def_ex (filter, first, last, 6207, "epsg", 6207,
  3632   3630           "Nepal 1981", 1, 1,
  3633   3631           "Everest 1830 (1937 Adjustment)", "Greenwich",
  3634   3632           "Nepal_1981", "none", "degree",
  3635   3633           "Latitude", "North", "Longitude", "East");
  3636   3634       add_proj4text (p, 0,
  3637         -        "+proj=longlat +a=6377276.345 +b=6356075.413140239 +towgs");
         3635  +        "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs8");
  3638   3636       add_proj4text (p, 1,
  3639         -        "84=293.17,726.18,245.36,0,0,0,0 +no_defs");
         3637  +        "4=293.17,726.18,245.36,0,0,0,0 +no_defs");
  3640   3638       add_srs_wkt (p, 0,
  3641   3639           "GEOGCS[\"Nepal 1981\",DATUM[\"Nepal_1981\",SPHEROID[\"Ev");
  3642   3640       add_srs_wkt (p, 1,
  3643   3641           "erest 1830 (1937 Adjustment)\",6377276.345,300.8017,AUTH");
  3644   3642       add_srs_wkt (p, 2,
  3645   3643           "ORITY[\"EPSG\",\"7015\"]],TOWGS84[293.17,726.18,245.36,0");
  3646   3644       add_srs_wkt (p, 3,

Changes to src/srsinit/epsg_inlined_30.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   383    383           "NAD83(2011) / EPSG Arctic zone 5-29", 0, 0,
   384    384           "GRS 1980", "Greenwich",
   385    385           "NAD83_National_Spatial_Reference_System_2011", "Lambert_Conformal_Conic_2SP", "metre",
   386    386           "Easting", "East", "Northing", "North");
   387    387       add_proj4text (p, 0,
   388    388           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   389    389       add_proj4text (p, 1,
   390         -        "333 +lat_0=72.02500919444444 +lon_0=-163 +x_0=29500000 +");
          390  +        "333 +lat_0=72.02500919444445 +lon_0=-163 +x_0=29500000 +");
   391    391       add_proj4text (p, 2,
   392    392           "y_0=5500000 +ellps=GRS80 +units=m +no_defs");
   393    393       add_srs_wkt (p, 0,
   394    394           "PROJCS[\"NAD83(2011) / EPSG Arctic zone 5-29\",GEOGCS[\"");
   395    395       add_srs_wkt (p, 1,
   396    396           "NAD83(2011)\",DATUM[\"NAD83_National_Spatial_Reference_S");
   397    397       add_srs_wkt (p, 2,
................................................................................
   409    409       add_srs_wkt (p, 8,
   410    410           "Conformal_Conic_2SP\"],PARAMETER[\"standard_parallel_1\"");
   411    411       add_srs_wkt (p, 9,
   412    412           ",73.66666666666667],PARAMETER[\"standard_parallel_2\",70");
   413    413       add_srs_wkt (p, 10,
   414    414           ".33333333333333],PARAMETER[\"latitude_of_origin\",72.025");
   415    415       add_srs_wkt (p, 11,
   416         -        "00919444444],PARAMETER[\"central_meridian\",-163],PARAME");
          416  +        "00919444445],PARAMETER[\"central_meridian\",-163],PARAME");
   417    417       add_srs_wkt (p, 12,
   418    418           "TER[\"false_easting\",29500000],PARAMETER[\"false_northi");
   419    419       add_srs_wkt (p, 13,
   420    420           "ng\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
   421    421       add_srs_wkt (p, 14,
   422    422           "\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUT");
   423    423       add_srs_wkt (p, 15,
................................................................................
   426    426           "NAD83(2011) / EPSG Arctic zone 5-31", 0, 0,
   427    427           "GRS 1980", "Greenwich",
   428    428           "NAD83_National_Spatial_Reference_System_2011", "Lambert_Conformal_Conic_2SP", "metre",
   429    429           "Easting", "East", "Northing", "North");
   430    430       add_proj4text (p, 0,
   431    431           "+proj=lcc +lat_1=73.66666666666667 +lat_2=70.33333333333");
   432    432       add_proj4text (p, 1,
   433         -        "333 +lat_0=72.02500919444444 +lon_0=-147 +x_0=31500000 +");
          433  +        "333 +lat_0=72.02500919444445 +lon_0=-147 +x_0=31500000 +");
   434    434       add_proj4text (p, 2,
   435    435           "y_0=5500000 +ellps=GRS80 +units=m +no_defs");
   436    436       add_srs_wkt (p, 0,
   437    437           "PROJCS[\"NAD83(2011) / EPSG Arctic zone 5-31\",GEOGCS[\"");
   438    438       add_srs_wkt (p, 1,
   439    439           "NAD83(2011)\",DATUM[\"NAD83_National_Spatial_Reference_S");
   440    440       add_srs_wkt (p, 2,
................................................................................
   452    452       add_srs_wkt (p, 8,
   453    453           "Conformal_Conic_2SP\"],PARAMETER[\"standard_parallel_1\"");
   454    454       add_srs_wkt (p, 9,
   455    455           ",73.66666666666667],PARAMETER[\"standard_parallel_2\",70");
   456    456       add_srs_wkt (p, 10,
   457    457           ".33333333333333],PARAMETER[\"latitude_of_origin\",72.025");
   458    458       add_srs_wkt (p, 11,
   459         -        "00919444444],PARAMETER[\"central_meridian\",-147],PARAME");
          459  +        "00919444445],PARAMETER[\"central_meridian\",-147],PARAME");
   460    460       add_srs_wkt (p, 12,
   461    461           "TER[\"false_easting\",31500000],PARAMETER[\"false_northi");
   462    462       add_srs_wkt (p, 13,
   463    463           "ng\",5500000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
   464    464       add_srs_wkt (p, 14,
   465    465           "\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUT");
   466    466       add_srs_wkt (p, 15,
................................................................................
   956    956           "UCS-2000 / Ukraine TM zone 7", 0, 1,
   957    957           "Krassowsky 1940", "Greenwich",
   958    958           "Ukraine_2000", "Transverse_Mercator", "metre",
   959    959           "X", "North", "Y", "East");
   960    960       add_proj4text (p, 0,
   961    961           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=300000 +y_0=0 +");
   962    962       add_proj4text (p, 1,
   963         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
          963  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
   964    964       add_proj4text (p, 2,
   965         -        "=m +no_defs");
          965  +        "s=m +no_defs");
   966    966       add_srs_wkt (p, 0,
   967    967           "PROJCS[\"UCS-2000 / Ukraine TM zone 7\",GEOGCS[\"UCS-200");
   968    968       add_srs_wkt (p, 1,
   969    969           "0\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\",");
   970    970       add_srs_wkt (p, 2,
   971    971           "6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,-");
   972    972       add_srs_wkt (p, 3,
   973         -        "141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]],");
   974         -    add_srs_wkt (p, 4,
   975         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   976         -    add_srs_wkt (p, 5,
   977         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   978         -    add_srs_wkt (p, 6,
   979         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
   980         -    add_srs_wkt (p, 7,
   981         -        "AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_Me");
   982         -    add_srs_wkt (p, 8,
   983         -        "rcator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[");
   984         -    add_srs_wkt (p, 9,
   985         -        "\"central_meridian\",21],PARAMETER[\"scale_factor\",1],P");
   986         -    add_srs_wkt (p, 10,
   987         -        "ARAMETER[\"false_easting\",300000],PARAMETER[\"false_nor");
   988         -    add_srs_wkt (p, 11,
   989         -        "thing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
   990         -    add_srs_wkt (p, 12,
   991         -        "],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",");
   992         -    add_srs_wkt (p, 13,
   993         -        "\"6381\"]]");
          973  +        "141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
          974  +    add_srs_wkt (p, 4,
          975  +        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
          976  +    add_srs_wkt (p, 5,
          977  +        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
          978  +    add_srs_wkt (p, 6,
          979  +        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
          980  +    add_srs_wkt (p, 7,
          981  +        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
          982  +    add_srs_wkt (p, 8,
          983  +        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
          984  +    add_srs_wkt (p, 9,
          985  +        "[\"central_meridian\",21],PARAMETER[\"scale_factor\",1],");
          986  +    add_srs_wkt (p, 10,
          987  +        "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
          988  +    add_srs_wkt (p, 11,
          989  +        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
          990  +    add_srs_wkt (p, 12,
          991  +        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
          992  +    add_srs_wkt (p, 13,
          993  +        ",\"6381\"]]");
   994    994       p = add_epsg_def_ex (filter, first, last, 6382, "epsg", 6382,
   995    995           "UCS-2000 / Ukraine TM zone 8", 0, 1,
   996    996           "Krassowsky 1940", "Greenwich",
   997    997           "Ukraine_2000", "Transverse_Mercator", "metre",
   998    998           "X", "North", "Y", "East");
   999    999       add_proj4text (p, 0,
  1000   1000           "+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=300000 +y_0=0 +");
  1001   1001       add_proj4text (p, 1,
  1002         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
         1002  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
  1003   1003       add_proj4text (p, 2,
  1004         -        "=m +no_defs");
         1004  +        "s=m +no_defs");
  1005   1005       add_srs_wkt (p, 0,
  1006   1006           "PROJCS[\"UCS-2000 / Ukraine TM zone 8\",GEOGCS[\"UCS-200");
  1007   1007       add_srs_wkt (p, 1,
  1008   1008           "0\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\",");
  1009   1009       add_srs_wkt (p, 2,
  1010   1010           "6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,-");
  1011   1011       add_srs_wkt (p, 3,
  1012         -        "141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]],");
  1013         -    add_srs_wkt (p, 4,
  1014         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
  1015         -    add_srs_wkt (p, 5,
  1016         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
  1017         -    add_srs_wkt (p, 6,
  1018         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
  1019         -    add_srs_wkt (p, 7,
  1020         -        "AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_Me");
  1021         -    add_srs_wkt (p, 8,
  1022         -        "rcator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[");
  1023         -    add_srs_wkt (p, 9,
  1024         -        "\"central_meridian\",24],PARAMETER[\"scale_factor\",1],P");
  1025         -    add_srs_wkt (p, 10,
  1026         -        "ARAMETER[\"false_easting\",300000],PARAMETER[\"false_nor");
  1027         -    add_srs_wkt (p, 11,
  1028         -        "thing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
  1029         -    add_srs_wkt (p, 12,
  1030         -        "],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",");
  1031         -    add_srs_wkt (p, 13,
  1032         -        "\"6382\"]]");
         1012  +        "141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
         1013  +    add_srs_wkt (p, 4,
         1014  +        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
         1015  +    add_srs_wkt (p, 5,
         1016  +        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
         1017  +    add_srs_wkt (p, 6,
         1018  +        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
         1019  +    add_srs_wkt (p, 7,
         1020  +        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
         1021  +    add_srs_wkt (p, 8,
         1022  +        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
         1023  +    add_srs_wkt (p, 9,
         1024  +        "[\"central_meridian\",24],PARAMETER[\"scale_factor\",1],");
         1025  +    add_srs_wkt (p, 10,
         1026  +        "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
         1027  +    add_srs_wkt (p, 11,
         1028  +        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
         1029  +    add_srs_wkt (p, 12,
         1030  +        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
         1031  +    add_srs_wkt (p, 13,
         1032  +        ",\"6382\"]]");
  1033   1033       p = add_epsg_def_ex (filter, first, last, 6383, "epsg", 6383,
  1034   1034           "UCS-2000 / Ukraine TM zone 9", 0, 1,
  1035   1035           "Krassowsky 1940", "Greenwich",
  1036   1036           "Ukraine_2000", "Transverse_Mercator", "metre",
  1037   1037           "X", "North", "Y", "East");
  1038   1038       add_proj4text (p, 0,
  1039   1039           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=300000 +y_0=0 +");
  1040   1040       add_proj4text (p, 1,
  1041         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
         1041  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
  1042   1042       add_proj4text (p, 2,
  1043         -        "=m +no_defs");
         1043  +        "s=m +no_defs");
  1044   1044       add_srs_wkt (p, 0,
  1045   1045           "PROJCS[\"UCS-2000 / Ukraine TM zone 9\",GEOGCS[\"UCS-200");
  1046   1046       add_srs_wkt (p, 1,
  1047   1047           "0\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\",");
  1048   1048       add_srs_wkt (p, 2,
  1049   1049           "6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,-");
  1050   1050       add_srs_wkt (p, 3,
  1051         -        "141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]],");
  1052         -    add_srs_wkt (p, 4,
  1053         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
  1054         -    add_srs_wkt (p, 5,
  1055         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
  1056         -    add_srs_wkt (p, 6,
  1057         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
  1058         -    add_srs_wkt (p, 7,
  1059         -        "AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_Me");
  1060         -    add_srs_wkt (p, 8,
  1061         -        "rcator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[");
  1062         -    add_srs_wkt (p, 9,
  1063         -        "\"central_meridian\",27],PARAMETER[\"scale_factor\",1],P");
  1064         -    add_srs_wkt (p, 10,
  1065         -        "ARAMETER[\"false_easting\",300000],PARAMETER[\"false_nor");
  1066         -    add_srs_wkt (p, 11,
  1067         -        "thing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
  1068         -    add_srs_wkt (p, 12,
  1069         -        "],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\",");
  1070         -    add_srs_wkt (p, 13,
  1071         -        "\"6383\"]]");
  1072         -    p = add_epsg_def_ex (filter, first, last, 6384, "epsg", 6384,
  1073         -        "UCS-2000 / Ukraine TM zone 10", 0, 1,
  1074         -        "Krassowsky 1940", "Greenwich",
  1075         -        "Ukraine_2000", "Transverse_Mercator", "metre",
  1076         -        "X", "North", "Y", "East");
  1077         -    add_proj4text (p, 0,
  1078         -        "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=300000 +y_0=0 +");
  1079         -    add_proj4text (p, 1,
  1080         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
  1081         -    add_proj4text (p, 2,
  1082         -        "=m +no_defs");
  1083         -    add_srs_wkt (p, 0,
  1084         -        "PROJCS[\"UCS-2000 / Ukraine TM zone 10\",GEOGCS[\"UCS-20");
  1085         -    add_srs_wkt (p, 1,
  1086         -        "00\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
  1087         -    add_srs_wkt (p, 2,
  1088         -        ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
  1089         -    add_srs_wkt (p, 3,
  1090         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
         1051  +        "141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
  1091   1052       add_srs_wkt (p, 4,
  1092   1053           ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
  1093   1054       add_srs_wkt (p, 5,
  1094   1055           "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
  1095   1056       add_srs_wkt (p, 6,
  1096   1057           "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
  1097   1058       add_srs_wkt (p, 7,
  1098   1059           ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
  1099   1060       add_srs_wkt (p, 8,
  1100   1061           "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
  1101   1062       add_srs_wkt (p, 9,
  1102         -        "[\"central_meridian\",30],PARAMETER[\"scale_factor\",1],");
         1063  +        "[\"central_meridian\",27],PARAMETER[\"scale_factor\",1],");
  1103   1064       add_srs_wkt (p, 10,
  1104   1065           "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
  1105   1066       add_srs_wkt (p, 11,
  1106   1067           "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
  1107   1068       add_srs_wkt (p, 12,
         1069  +        "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
         1070  +    add_srs_wkt (p, 13,
         1071  +        ",\"6383\"]]");
         1072  +    p = add_epsg_def_ex (filter, first, last, 6384, "epsg", 6384,
         1073  +        "UCS-2000 / Ukraine TM zone 10", 0, 1,
         1074  +        "Krassowsky 1940", "Greenwich",
         1075  +        "Ukraine_2000", "Transverse_Mercator", "metre",
         1076  +        "X", "North", "Y", "East");
         1077  +    add_proj4text (p, 0,
         1078  +        "+proj=tmerc +lat_0=0 +lon_0=30 +k=1 +x_0=300000 +y_0=0 +");
         1079  +    add_proj4text (p, 1,
         1080  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
         1081  +    add_proj4text (p, 2,
         1082  +        "s=m +no_defs");
         1083  +    add_srs_wkt (p, 0,
         1084  +        "PROJCS[\"UCS-2000 / Ukraine TM zone 10\",GEOGCS[\"UCS-20");
         1085  +    add_srs_wkt (p, 1,
         1086  +        "00\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
         1087  +    add_srs_wkt (p, 2,
         1088  +        ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
         1089  +    add_srs_wkt (p, 3,
         1090  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
         1091  +    add_srs_wkt (p, 4,
         1092  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
         1093  +    add_srs_wkt (p, 5,
         1094  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
         1095  +    add_srs_wkt (p, 6,
         1096  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
         1097  +    add_srs_wkt (p, 7,
         1098  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
         1099  +    add_srs_wkt (p, 8,
         1100  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
         1101  +    add_srs_wkt (p, 9,
         1102  +        "R[\"central_meridian\",30],PARAMETER[\"scale_factor\",1]");
         1103  +    add_srs_wkt (p, 10,
         1104  +        ",PARAMETER[\"false_easting\",300000],PARAMETER[\"false_n");
         1105  +    add_srs_wkt (p, 11,
         1106  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
         1107  +    add_srs_wkt (p, 12,
  1108   1108           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
  1109   1109       add_srs_wkt (p, 13,
  1110   1110           ",\"6384\"]]");
  1111   1111       p = add_epsg_def_ex (filter, first, last, 6385, "epsg", 6385,
  1112   1112           "UCS-2000 / Ukraine TM zone 11", 0, 1,
  1113   1113           "Krassowsky 1940", "Greenwich",
  1114   1114           "Ukraine_2000", "Transverse_Mercator", "metre",
  1115   1115           "X", "North", "Y", "East");
  1116   1116       add_proj4text (p, 0,
  1117   1117           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=300000 +y_0=0 +");
  1118   1118       add_proj4text (p, 1,
  1119         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
         1119  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
  1120   1120       add_proj4text (p, 2,
  1121         -        "=m +no_defs");
         1121  +        "s=m +no_defs");
  1122   1122       add_srs_wkt (p, 0,
  1123   1123           "PROJCS[\"UCS-2000 / Ukraine TM zone 11\",GEOGCS[\"UCS-20");
  1124   1124       add_srs_wkt (p, 1,
  1125   1125           "00\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
  1126   1126       add_srs_wkt (p, 2,
  1127   1127           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
  1128   1128       add_srs_wkt (p, 3,
  1129         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
         1129  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
  1130   1130       add_srs_wkt (p, 4,
  1131         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
         1131  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  1132   1132       add_srs_wkt (p, 5,
  1133         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
         1133  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  1134   1134       add_srs_wkt (p, 6,
  1135         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
         1135  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
  1136   1136       add_srs_wkt (p, 7,
  1137         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
         1137  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
  1138   1138       add_srs_wkt (p, 8,
  1139         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
         1139  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
  1140   1140       add_srs_wkt (p, 9,
  1141         -        "[\"central_meridian\",33],PARAMETER[\"scale_factor\",1],");
         1141  +        "R[\"central_meridian\",33],PARAMETER[\"scale_factor\",1]");
  1142   1142       add_srs_wkt (p, 10,
  1143         -        "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
         1143  +        ",PARAMETER[\"false_easting\",300000],PARAMETER[\"false_n");
  1144   1144       add_srs_wkt (p, 11,
  1145         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
         1145  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
  1146   1146       add_srs_wkt (p, 12,
  1147   1147           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
  1148   1148       add_srs_wkt (p, 13,
  1149   1149           ",\"6385\"]]");
  1150   1150       p = add_epsg_def_ex (filter, first, last, 6386, "epsg", 6386,
  1151   1151           "UCS-2000 / Ukraine TM zone 12", 0, 1,
  1152   1152           "Krassowsky 1940", "Greenwich",
  1153   1153           "Ukraine_2000", "Transverse_Mercator", "metre",
  1154   1154           "X", "North", "Y", "East");
  1155   1155       add_proj4text (p, 0,
  1156   1156           "+proj=tmerc +lat_0=0 +lon_0=36 +k=1 +x_0=300000 +y_0=0 +");
  1157   1157       add_proj4text (p, 1,
  1158         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
         1158  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
  1159   1159       add_proj4text (p, 2,
  1160         -        "=m +no_defs");
         1160  +        "s=m +no_defs");
  1161   1161       add_srs_wkt (p, 0,
  1162   1162           "PROJCS[\"UCS-2000 / Ukraine TM zone 12\",GEOGCS[\"UCS-20");
  1163   1163       add_srs_wkt (p, 1,
  1164   1164           "00\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
  1165   1165       add_srs_wkt (p, 2,
  1166   1166           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
  1167   1167       add_srs_wkt (p, 3,
  1168         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
         1168  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
  1169   1169       add_srs_wkt (p, 4,
  1170         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
         1170  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  1171   1171       add_srs_wkt (p, 5,
  1172         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
         1172  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  1173   1173       add_srs_wkt (p, 6,
  1174         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
         1174  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
  1175   1175       add_srs_wkt (p, 7,
  1176         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
         1176  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
  1177   1177       add_srs_wkt (p, 8,
  1178         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
         1178  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
  1179   1179       add_srs_wkt (p, 9,
  1180         -        "[\"central_meridian\",36],PARAMETER[\"scale_factor\",1],");
         1180  +        "R[\"central_meridian\",36],PARAMETER[\"scale_factor\",1]");
  1181   1181       add_srs_wkt (p, 10,
  1182         -        "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
         1182  +        ",PARAMETER[\"false_easting\",300000],PARAMETER[\"false_n");
  1183   1183       add_srs_wkt (p, 11,
  1184         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
         1184  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
  1185   1185       add_srs_wkt (p, 12,
  1186   1186           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
  1187   1187       add_srs_wkt (p, 13,
  1188   1188           ",\"6386\"]]");
  1189   1189       p = add_epsg_def_ex (filter, first, last, 6387, "epsg", 6387,
  1190   1190           "UCS-2000 / Ukraine TM zone 13", 0, 1,
  1191   1191           "Krassowsky 1940", "Greenwich",
  1192   1192           "Ukraine_2000", "Transverse_Mercator", "metre",
  1193   1193           "X", "North", "Y", "East");
  1194   1194       add_proj4text (p, 0,
  1195   1195           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=300000 +y_0=0 +");
  1196   1196       add_proj4text (p, 1,
  1197         -        "ellps=krass +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units");
         1197  +        "ellps=krass +towgs84=25,-141,-78.5,-0,0.35,0.736,0 +unit");
  1198   1198       add_proj4text (p, 2,
  1199         -        "=m +no_defs");
         1199  +        "s=m +no_defs");
  1200   1200       add_srs_wkt (p, 0,
  1201   1201           "PROJCS[\"UCS-2000 / Ukraine TM zone 13\",GEOGCS[\"UCS-20");
  1202   1202       add_srs_wkt (p, 1,
  1203   1203           "00\",DATUM[\"Ukraine_2000\",SPHEROID[\"Krassowsky 1940\"");
  1204   1204       add_srs_wkt (p, 2,
  1205   1205           ",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TOWGS84[25,");
  1206   1206       add_srs_wkt (p, 3,
  1207         -        "-141,-78.5,0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]]");
         1207  +        "-141,-78.5,-0,0.35,0.736,0],AUTHORITY[\"EPSG\",\"1077\"]");
  1208   1208       add_srs_wkt (p, 4,
  1209         -        ",PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UN");
         1209  +        "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  1210   1210       add_srs_wkt (p, 5,
  1211         -        "IT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"91");
         1211  +        "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  1212   1212       add_srs_wkt (p, 6,
  1213         -        "22\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]");
         1213  +        "122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST");
  1214   1214       add_srs_wkt (p, 7,
  1215         -        ",AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_M");
         1215  +        "],AUTHORITY[\"EPSG\",\"5561\"]],PROJECTION[\"Transverse_");
  1216   1216       add_srs_wkt (p, 8,
  1217         -        "ercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER");
         1217  +        "Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETE");
  1218   1218       add_srs_wkt (p, 9,
  1219         -        "[\"central_meridian\",39],PARAMETER[\"scale_factor\",1],");
         1219  +        "R[\"central_meridian\",39],PARAMETER[\"scale_factor\",1]");
  1220   1220       add_srs_wkt (p, 10,
  1221         -        "PARAMETER[\"false_easting\",300000],PARAMETER[\"false_no");
         1221  +        ",PARAMETER[\"false_easting\",300000],PARAMETER[\"false_n");
  1222   1222       add_srs_wkt (p, 11,
  1223         -        "rthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
         1223  +        "orthing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"");
  1224   1224       add_srs_wkt (p, 12,
  1225   1225           "]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],AUTHORITY[\"EPSG\"");
  1226   1226       add_srs_wkt (p, 13,
  1227   1227           ",\"6387\"]]");
  1228   1228       p = add_epsg_def_ex (filter, first, last, 6391, "epsg", 6391,
  1229   1229           "Cayman Islands National Grid 2011", 0, 0,
  1230   1230           "GRS 1980", "Greenwich",

Changes to src/srsinit/epsg_inlined_31.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_32.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_33.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1865   1865       add_srs_wkt (p, 0,
  1866   1866           "COMPD_CS[\"NTF (Paris) + NGF IGN69 height\",GEOGCS[\"NTF");
  1867   1867       add_srs_wkt (p, 1,
  1868   1868           " (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Pari");
  1869   1869       add_srs_wkt (p, 2,
  1870   1870           "s\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212");
  1871   1871       add_srs_wkt (p, 3,
  1872         -        "936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
         1872  +        "936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
  1873   1873       add_srs_wkt (p, 4,
  1874   1874           "0,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\"");
  1875   1875       add_srs_wkt (p, 5,
  1876   1876           ",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",");
  1877   1877       add_srs_wkt (p, 6,
  1878   1878           "0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"");
  1879   1879       add_srs_wkt (p, 7,
................................................................................
  1906   1906       add_srs_wkt (p, 1,
  1907   1907           "JCS[\"NTF (Paris) / France II (deprecated)\",GEOGCS[\"NT");
  1908   1908       add_srs_wkt (p, 2,
  1909   1909           "F (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Par");
  1910   1910       add_srs_wkt (p, 3,
  1911   1911           "is\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.466021");
  1912   1912       add_srs_wkt (p, 4,
  1913         -        "2936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
         1913  +        "2936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
  1914   1914       add_srs_wkt (p, 5,
  1915   1915           "20,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris");
  1916   1916       add_srs_wkt (p, 6,
  1917   1917           "\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\"");
  1918   1918       add_srs_wkt (p, 7,
  1919   1919           ",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[");
  1920   1920       add_srs_wkt (p, 8,
................................................................................
  1959   1959       add_srs_wkt (p, 1,
  1960   1960           "\"NTF (Paris) / France II (deprecated)\",GEOGCS[\"NTF (P");
  1961   1961       add_srs_wkt (p, 2,
  1962   1962           "aris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\"");
  1963   1963       add_srs_wkt (p, 3,
  1964   1964           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1965   1965       add_srs_wkt (p, 4,
  1966         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         1966  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  1967   1967       add_srs_wkt (p, 5,
  1968   1968           ",0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2");
  1969   1969       add_srs_wkt (p, 6,
  1970   1970           ".33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.");
  1971   1971       add_srs_wkt (p, 7,
  1972   1972           "01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"L");
  1973   1973       add_srs_wkt (p, 8,
................................................................................
  2012   2012       add_srs_wkt (p, 1,
  2013   2013           "[\"NTF (Paris) / France III (deprecated)\",GEOGCS[\"NTF ");
  2014   2014       add_srs_wkt (p, 2,
  2015   2015           "(Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris");
  2016   2016       add_srs_wkt (p, 3,
  2017   2017           "\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602129");
  2018   2018       add_srs_wkt (p, 4,
  2019         -        "36269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320");
         2019  +        "36265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320");
  2020   2020       add_srs_wkt (p, 5,
  2021   2021           ",0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\"");
  2022   2022       add_srs_wkt (p, 6,
  2023   2023           ",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",");
  2024   2024       add_srs_wkt (p, 7,
  2025   2025           "0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"");
  2026   2026       add_srs_wkt (p, 8,
................................................................................
  2141   2141       add_proj4text (p, 0,
  2142   2142           "+proj=longlat +datum=NAD27 +vunits=us-ft +no_defs");
  2143   2143       add_srs_wkt (p, 0,
  2144   2144           "COMPD_CS[\"NAD27 + NGVD29 height\",GEOGCS[\"NAD27\",DATU");
  2145   2145       add_srs_wkt (p, 1,
  2146   2146           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  2147   2147       add_srs_wkt (p, 2,
  2148         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         2148  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  2149   2149       add_srs_wkt (p, 3,
  2150   2150           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  2151   2151       add_srs_wkt (p, 4,
  2152   2152           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2153   2153       add_srs_wkt (p, 5,
  2154   2154           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2155   2155       add_srs_wkt (p, 6,
................................................................................
  2178   2178       add_srs_wkt (p, 0,
  2179   2179           "COMPD_CS[\"NAD27 / Texas North + NGVD29 height\",PROJCS[");
  2180   2180       add_srs_wkt (p, 1,
  2181   2181           "\"NAD27 / Texas North\",GEOGCS[\"NAD27\",DATUM[\"North_A");
  2182   2182       add_srs_wkt (p, 2,
  2183   2183           "merican_Datum_1927\",SPHEROID[\"Clarke 1866\",6378206.4,");
  2184   2184       add_srs_wkt (p, 3,
  2185         -        "294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORIT");
         2185  +        "294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORIT");
  2186   2186       add_srs_wkt (p, 4,
  2187   2187           "Y[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  2188   2188       add_srs_wkt (p, 5,
  2189   2189           "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  2190   2190       add_srs_wkt (p, 6,
  2191   2191           "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
  2192   2192       add_srs_wkt (p, 7,
................................................................................
  2219   2219           "07\"]]");
  2220   2220       p = add_epsg_def_ex (filter, first, last, 7408, "epsg", 7408,
  2221   2221           "Amersfoort", 1, 1,
  2222   2222           "Bessel 1841", "Greenwich",
  2223   2223           "Amersfoort", "none", "degree",
  2224   2224           "Latitude", "North", "Longitude", "East");
  2225   2225       add_proj4text (p, 0,
  2226         -        "+proj=longlat +ellps=bessel +towgs84=565.4171,50.3319,46");
         2226  +        "+proj=longlat +ellps=bessel +towgs84=565.417,50.3319,465");
  2227   2227       add_proj4text (p, 1,
  2228         -        "5.5524,-0.398957388243134,0.343987817378283,-1.877401639");
         2228  +        ".552,-0.398957,0.343988,-1.8774,4.0725 +vunits=m +no_def");
  2229   2229       add_proj4text (p, 2,
  2230         -        "98045,4.0725 +vunits=m +no_defs");
         2230  +        "s");
  2231   2231       add_srs_wkt (p, 0,
  2232   2232           "COMPD_CS[\"RD/NAP\",GEOGCS[\"Amersfoort\",DATUM[\"Amersf");
  2233   2233       add_srs_wkt (p, 1,
  2234   2234           "oort\",SPHEROID[\"Bessel 1841\",6377397.155,299.1528128,");
  2235   2235       add_srs_wkt (p, 2,
  2236         -        "AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.4171,50.3319,4");
         2236  +        "AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.417,50.3319,46");
  2237   2237       add_srs_wkt (p, 3,
  2238         -        "65.5524,-0.398957388243134,0.343987817378283,-1.87740163");
         2238  +        "5.552,-0.398957,0.343988,-1.8774,4.0725],AUTHORITY[\"EPS");
  2239   2239       add_srs_wkt (p, 4,
  2240         -        "998045,4.0725],AUTHORITY[\"EPSG\",\"6289\"]],PRIMEM[\"Gr");
         2240  +        "G\",\"6289\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2241   2241       add_srs_wkt (p, 5,
  2242         -        "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
         2242  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  2243   2243       add_srs_wkt (p, 6,
  2244         -        ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
         2244  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
  2245   2245       add_srs_wkt (p, 7,
  2246         -        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
         2246  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4289\"]],VERT_CS[\"N");
  2247   2247       add_srs_wkt (p, 8,
  2248         -        "PSG\",\"4289\"]],VERT_CS[\"NAP height\",VERT_DATUM[\"Nor");
         2248  +        "AP height\",VERT_DATUM[\"Normaal Amsterdams Peil\",2005,");
  2249   2249       add_srs_wkt (p, 9,
  2250         -        "maal Amsterdams Peil\",2005,AUTHORITY[\"EPSG\",\"5109\"]");
         2250  +        "AUTHORITY[\"EPSG\",\"5109\"]],UNIT[\"metre\",1,AUTHORITY");
  2251   2251       add_srs_wkt (p, 10,
  2252         -        "],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"");
         2252  +        "[\"EPSG\",\"9001\"]],AXIS[\"Up\",UP],AUTHORITY[\"EPSG\",");
  2253   2253       add_srs_wkt (p, 11,
  2254         -        "Up\",UP],AUTHORITY[\"EPSG\",\"5709\"]],AUTHORITY[\"EPSG\"");
  2255         -    add_srs_wkt (p, 12,
  2256         -        ",\"7408\"]]");
         2254  +        "\"5709\"]],AUTHORITY[\"EPSG\",\"7408\"]]");
  2257   2255       p = add_epsg_def_ex (filter, first, last, 7409, "epsg", 7409,
  2258   2256           "ETRS89", 1, 1,
  2259   2257           "GRS 1980", "Greenwich",
  2260   2258           "European_Terrestrial_Reference_System_1989", "none", "degree",
  2261   2259           "Latitude", "North", "Longitude", "East");
  2262   2260       add_proj4text (p, 0,
  2263   2261           "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +vunit");
................................................................................
  2293   2291           "PSD93", 1, 1,
  2294   2292           "Clarke 1880 (RGS)", "Greenwich",
  2295   2293           "PDO_Survey_Datum_1993", "none", "degree",
  2296   2294           "Latitude", "North", "Longitude", "East");
  2297   2295       add_proj4text (p, 0,
  2298   2296           "+proj=longlat +ellps=clrk80 +towgs84=-180.624,-225.516,1");
  2299   2297       add_proj4text (p, 1,
  2300         -        "73.919,-0.81,-1.898,8.336,16.71006 +vunits=m +no_defs");
         2298  +        "73.919,-0.81,-1.898,8.336,16.7101 +vunits=m +no_defs");
  2301   2299       add_srs_wkt (p, 0,
  2302   2300           "COMPD_CS[\"PSHD93\",GEOGCS[\"PSD93\",DATUM[\"PDO_Survey_");
  2303   2301       add_srs_wkt (p, 1,
  2304   2302           "Datum_1993\",SPHEROID[\"Clarke 1880 (RGS)\",6378249.145,");
  2305   2303       add_srs_wkt (p, 2,
  2306   2304           "293.465,AUTHORITY[\"EPSG\",\"7012\"]],TOWGS84[-180.624,-");
  2307   2305       add_srs_wkt (p, 3,
  2308         -        "225.516,173.919,-0.81,-1.898,8.336,16.71006],AUTHORITY[\"");
         2306  +        "225.516,173.919,-0.81,-1.898,8.336,16.7101],AUTHORITY[\"");
  2309   2307       add_srs_wkt (p, 4,
  2310   2308           "EPSG\",\"6134\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2311   2309       add_srs_wkt (p, 5,
  2312   2310           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2313   2311       add_srs_wkt (p, 6,
  2314   2312           "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2315   2313       add_srs_wkt (p, 7,
................................................................................
  2340   2338       add_srs_wkt (p, 1,
  2341   2339           " height\",PROJCS[\"NTF (Paris) / Lambert zone II\",GEOGC");
  2342   2340       add_srs_wkt (p, 2,
  2343   2341           "S[\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francai");
  2344   2342       add_srs_wkt (p, 3,
  2345   2343           "se_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.");
  2346   2344       add_srs_wkt (p, 4,
  2347         -        "4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168");
         2345  +        "4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168");
  2348   2346       add_srs_wkt (p, 5,
  2349   2347           ",-60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"");
  2350   2348       add_srs_wkt (p, 6,
  2351   2349           "Paris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"");
  2352   2350       add_srs_wkt (p, 7,
  2353   2351           "grad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]]");
  2354   2352       add_srs_wkt (p, 8,
................................................................................
  2393   2391       add_srs_wkt (p, 1,
  2394   2392           "ROJCS[\"NTF (Paris) / Lambert zone II\",GEOGCS[\"NTF (Pa");
  2395   2393       add_srs_wkt (p, 2,
  2396   2394           "ris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\",");
  2397   2395       add_srs_wkt (p, 3,
  2398   2396           "SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602129362");
  2399   2397       add_srs_wkt (p, 4,
  2400         -        "69,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,");
         2398  +        "65,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,");
  2401   2399       add_srs_wkt (p, 5,
  2402   2400           "0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2.");
  2403   2401       add_srs_wkt (p, 6,
  2404   2402           "33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.0");
  2405   2403       add_srs_wkt (p, 7,
  2406   2404           "1570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"La");
  2407   2405       add_srs_wkt (p, 8,
................................................................................
  2446   2444       add_srs_wkt (p, 1,
  2447   2445           "PROJCS[\"NTF (Paris) / Lambert zone III\",GEOGCS[\"NTF (");
  2448   2446       add_srs_wkt (p, 2,
  2449   2447           "Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\"");
  2450   2448       add_srs_wkt (p, 3,
  2451   2449           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  2452   2450       add_srs_wkt (p, 4,
  2453         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         2451  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  2454   2452       add_srs_wkt (p, 5,
  2455   2453           ",0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2");
  2456   2454       add_srs_wkt (p, 6,
  2457   2455           ".33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.");
  2458   2456       add_srs_wkt (p, 7,
  2459   2457           "01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"L");
  2460   2458       add_srs_wkt (p, 8,
................................................................................
  2520   2518           "Amersfoort", "Oblique_Stereographic", "metre",
  2521   2519           "X", "East", "Y", "North");
  2522   2520       add_proj4text (p, 0,
  2523   2521           "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.387638888");
  2524   2522       add_proj4text (p, 1,
  2525   2523           "88889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel");
  2526   2524       add_proj4text (p, 2,
  2527         -        " +towgs84=565.4171,50.3319,465.5524,-0.398957388243134,0");
         2525  +        " +towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.");
  2528   2526       add_proj4text (p, 3,
  2529         -        ".343987817378283,-1.87740163998045,4.0725 +units=m +vuni");
  2530         -    add_proj4text (p, 4,
  2531         -        "ts=m +no_defs");
         2527  +        "8774,4.0725 +units=m +vunits=m +no_defs");
  2532   2528       add_srs_wkt (p, 0,
  2533   2529           "COMPD_CS[\"Amersfoort / RD New + NAP height\",PROJCS[\"A");
  2534   2530       add_srs_wkt (p, 1,
  2535   2531           "mersfoort / RD New\",GEOGCS[\"Amersfoort\",DATUM[\"Amers");
  2536   2532       add_srs_wkt (p, 2,
  2537   2533           "foort\",SPHEROID[\"Bessel 1841\",6377397.155,299.1528128");
  2538   2534       add_srs_wkt (p, 3,
  2539         -        ",AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.4171,50.3319,");
  2540         -    add_srs_wkt (p, 4,
  2541         -        "465.5524,-0.398957388243134,0.343987817378283,-1.8774016");
  2542         -    add_srs_wkt (p, 5,
  2543         -        "3998045,4.0725],AUTHORITY[\"EPSG\",\"6289\"]],PRIMEM[\"G");
  2544         -    add_srs_wkt (p, 6,
  2545         -        "reenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree");
  2546         -    add_srs_wkt (p, 7,
  2547         -        "\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS");
  2548         -    add_srs_wkt (p, 8,
  2549         -        "[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[");
  2550         -    add_srs_wkt (p, 9,
  2551         -        "\"EPSG\",\"4289\"]],PROJECTION[\"Oblique_Stereographic\"");
  2552         -    add_srs_wkt (p, 10,
  2553         -        "],PARAMETER[\"latitude_of_origin\",52.15616055555555],PA");
  2554         -    add_srs_wkt (p, 11,
  2555         -        "RAMETER[\"central_meridian\",5.38763888888889],PARAMETER");
  2556         -    add_srs_wkt (p, 12,
  2557         -        "[\"scale_factor\",0.9999079],PARAMETER[\"false_easting\"");
  2558         -    add_srs_wkt (p, 13,
  2559         -        ",155000],PARAMETER[\"false_northing\",463000],UNIT[\"met");
         2535  +        ",AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.417,50.3319,4");
         2536  +    add_srs_wkt (p, 4,
         2537  +        "65.552,-0.398957,0.343988,-1.8774,4.0725],AUTHORITY[\"EP");
         2538  +    add_srs_wkt (p, 5,
         2539  +        "SG\",\"6289\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
         2540  +    add_srs_wkt (p, 6,
         2541  +        ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
         2542  +    add_srs_wkt (p, 7,
         2543  +        "[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Lon");
         2544  +    add_srs_wkt (p, 8,
         2545  +        "gitude\",EAST],AUTHORITY[\"EPSG\",\"4289\"]],PROJECTION[");
         2546  +    add_srs_wkt (p, 9,
         2547  +        "\"Oblique_Stereographic\"],PARAMETER[\"latitude_of_origi");
         2548  +    add_srs_wkt (p, 10,
         2549  +        "n\",52.15616055555555],PARAMETER[\"central_meridian\",5.");
         2550  +    add_srs_wkt (p, 11,
         2551  +        "38763888888889],PARAMETER[\"scale_factor\",0.9999079],PA");
         2552  +    add_srs_wkt (p, 12,
         2553  +        "RAMETER[\"false_easting\",155000],PARAMETER[\"false_nort");
         2554  +    add_srs_wkt (p, 13,
         2555  +        "hing\",463000],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"900");
  2560   2556       add_srs_wkt (p, 14,
  2561         -        "re\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AX");
         2557  +        "1\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPS");
  2562   2558       add_srs_wkt (p, 15,
  2563         -        "IS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"28992\"]],VERT_CS[\"");
         2559  +        "G\",\"28992\"]],VERT_CS[\"NAP height\",VERT_DATUM[\"Norm");
  2564   2560       add_srs_wkt (p, 16,
  2565         -        "NAP height\",VERT_DATUM[\"Normaal Amsterdams Peil\",2005");
         2561  +        "aal Amsterdams Peil\",2005,AUTHORITY[\"EPSG\",\"5109\"]]");
  2566   2562       add_srs_wkt (p, 17,
  2567         -        ",AUTHORITY[\"EPSG\",\"5109\"]],UNIT[\"metre\",1,AUTHORIT");
         2563  +        ",UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"U");
  2568   2564       add_srs_wkt (p, 18,
  2569         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"Up\",UP],AUTHORITY[\"EPSG\"");
         2565  +        "p\",UP],AUTHORITY[\"EPSG\",\"5709\"]],AUTHORITY[\"EPSG\"");
  2570   2566       add_srs_wkt (p, 19,
  2571         -        ",\"5709\"]],AUTHORITY[\"EPSG\",\"7415\"]]");
         2567  +        ",\"7415\"]]");
  2572   2568       p = add_epsg_def_ex (filter, first, last, 7416, "epsg", 7416,
  2573   2569           "ETRS89 / UTM zone 32N", 0, 0,
  2574   2570           "GRS 1980", "Greenwich",
  2575   2571           "European_Terrestrial_Reference_System_1989", "Transverse_Mercator", "metre",
  2576   2572           "Easting", "East", "Northing", "North");
  2577   2573       add_proj4text (p, 0,
  2578   2574           "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +");
................................................................................
  2828   2824       add_srs_wkt (p, 1,
  2829   2825           "ght\",PROJCS[\"NTF (Paris) / Lambert zone II\",GEOGCS[\"");
  2830   2826       add_srs_wkt (p, 2,
  2831   2827           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  2832   2828       add_srs_wkt (p, 3,
  2833   2829           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  2834   2830       add_srs_wkt (p, 4,
  2835         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         2831  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  2836   2832       add_srs_wkt (p, 5,
  2837   2833           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  2838   2834       add_srs_wkt (p, 6,
  2839   2835           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  2840   2836       add_srs_wkt (p, 7,
  2841   2837           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  2842   2838       add_srs_wkt (p, 8,
................................................................................
  2881   2877       add_srs_wkt (p, 1,
  2882   2878           "ight\",PROJCS[\"NTF (Paris) / Lambert zone III\",GEOGCS[");
  2883   2879       add_srs_wkt (p, 2,
  2884   2880           "\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise");
  2885   2881       add_srs_wkt (p, 3,
  2886   2882           "_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46");
  2887   2883       add_srs_wkt (p, 4,
  2888         -        "60212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
         2884  +        "60212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
  2889   2885       add_srs_wkt (p, 5,
  2890   2886           "60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"P");
  2891   2887       add_srs_wkt (p, 6,
  2892   2888           "aris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"g");
  2893   2889       add_srs_wkt (p, 7,
  2894   2890           "rad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],");
  2895   2891       add_srs_wkt (p, 8,
................................................................................
  2955   2951           "Pulkovo 1995 / Gauss-Kruger zone 4", 0, 1,
  2956   2952           "Krassowsky 1940", "Greenwich",
  2957   2953           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2958   2954           "X", "North", "Y", "East");
  2959   2955       add_proj4text (p, 0,
  2960   2956           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=4500000 +y_0=0 ");
  2961   2957       add_proj4text (p, 1,
  2962         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2958  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  2963   2959       add_proj4text (p, 2,
  2964         -        "2 +units=m +no_defs");
         2960  +        ".22 +units=m +no_defs");
  2965   2961       add_srs_wkt (p, 0,
  2966   2962           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 4\",GEOGCS[\"P");
  2967   2963       add_srs_wkt (p, 1,
  2968   2964           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  2969   2965       add_srs_wkt (p, 2,
  2970   2966           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2971   2967       add_srs_wkt (p, 3,
  2972         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  2973         -    add_srs_wkt (p, 4,
  2974         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  2975         -    add_srs_wkt (p, 5,
  2976         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  2977         -    add_srs_wkt (p, 6,
  2978         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  2979         -    add_srs_wkt (p, 7,
  2980         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  2981         -    add_srs_wkt (p, 8,
  2982         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  2983         -    add_srs_wkt (p, 9,
  2984         -        "n\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"sc");
  2985         -    add_srs_wkt (p, 10,
  2986         -        "ale_factor\",1],PARAMETER[\"false_easting\",4500000],PAR");
  2987         -    add_srs_wkt (p, 11,
  2988         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  2989         -    add_srs_wkt (p, 12,
  2990         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  2991         -    add_srs_wkt (p, 13,
  2992         -        "UTHORITY[\"EPSG\",\"20004\"]]");
         2968  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         2969  +    add_srs_wkt (p, 4,
         2970  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         2971  +    add_srs_wkt (p, 5,
         2972  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         2973  +    add_srs_wkt (p, 6,
         2974  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         2975  +    add_srs_wkt (p, 7,
         2976  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         2977  +    add_srs_wkt (p, 8,
         2978  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         2979  +    add_srs_wkt (p, 9,
         2980  +        "in\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"s");
         2981  +    add_srs_wkt (p, 10,
         2982  +        "cale_factor\",1],PARAMETER[\"false_easting\",4500000],PA");
         2983  +    add_srs_wkt (p, 11,
         2984  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         2985  +    add_srs_wkt (p, 12,
         2986  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         2987  +    add_srs_wkt (p, 13,
         2988  +        "AUTHORITY[\"EPSG\",\"20004\"]]");
  2993   2989       p = add_epsg_def_ex (filter, first, last, 20005, "epsg", 20005,
  2994   2990           "Pulkovo 1995 / Gauss-Kruger zone 5", 0, 1,
  2995   2991           "Krassowsky 1940", "Greenwich",
  2996   2992           "Pulkovo_1995", "Transverse_Mercator", "metre",
  2997   2993           "X", "North", "Y", "East");
  2998   2994       add_proj4text (p, 0,
  2999   2995           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=5500000 +y_0=0 ");
  3000   2996       add_proj4text (p, 1,
  3001         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         2997  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3002   2998       add_proj4text (p, 2,
  3003         -        "2 +units=m +no_defs");
         2999  +        ".22 +units=m +no_defs");
  3004   3000       add_srs_wkt (p, 0,
  3005   3001           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 5\",GEOGCS[\"P");
  3006   3002       add_srs_wkt (p, 1,
  3007   3003           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  3008   3004       add_srs_wkt (p, 2,
  3009   3005           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3010   3006       add_srs_wkt (p, 3,
  3011         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  3012         -    add_srs_wkt (p, 4,
  3013         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  3014         -    add_srs_wkt (p, 5,
  3015         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  3016         -    add_srs_wkt (p, 6,
  3017         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  3018         -    add_srs_wkt (p, 7,
  3019         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  3020         -    add_srs_wkt (p, 8,
  3021         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  3022         -    add_srs_wkt (p, 9,
  3023         -        "n\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"sc");
  3024         -    add_srs_wkt (p, 10,
  3025         -        "ale_factor\",1],PARAMETER[\"false_easting\",5500000],PAR");
  3026         -    add_srs_wkt (p, 11,
  3027         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3028         -    add_srs_wkt (p, 12,
  3029         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3030         -    add_srs_wkt (p, 13,
  3031         -        "UTHORITY[\"EPSG\",\"20005\"]]");
         3007  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         3008  +    add_srs_wkt (p, 4,
         3009  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3010  +    add_srs_wkt (p, 5,
         3011  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3012  +    add_srs_wkt (p, 6,
         3013  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3014  +    add_srs_wkt (p, 7,
         3015  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3016  +    add_srs_wkt (p, 8,
         3017  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3018  +    add_srs_wkt (p, 9,
         3019  +        "in\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"s");
         3020  +    add_srs_wkt (p, 10,
         3021  +        "cale_factor\",1],PARAMETER[\"false_easting\",5500000],PA");
         3022  +    add_srs_wkt (p, 11,
         3023  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3024  +    add_srs_wkt (p, 12,
         3025  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3026  +    add_srs_wkt (p, 13,
         3027  +        "AUTHORITY[\"EPSG\",\"20005\"]]");
  3032   3028       p = add_epsg_def_ex (filter, first, last, 20006, "epsg", 20006,
  3033   3029           "Pulkovo 1995 / Gauss-Kruger zone 6", 0, 1,
  3034   3030           "Krassowsky 1940", "Greenwich",
  3035   3031           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3036   3032           "X", "North", "Y", "East");
  3037   3033       add_proj4text (p, 0,
  3038   3034           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=6500000 +y_0=0 ");
  3039   3035       add_proj4text (p, 1,
  3040         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3036  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3041   3037       add_proj4text (p, 2,
  3042         -        "2 +units=m +no_defs");
         3038  +        ".22 +units=m +no_defs");
  3043   3039       add_srs_wkt (p, 0,
  3044   3040           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 6\",GEOGCS[\"P");
  3045   3041       add_srs_wkt (p, 1,
  3046   3042           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  3047   3043       add_srs_wkt (p, 2,
  3048   3044           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3049   3045       add_srs_wkt (p, 3,
  3050         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  3051         -    add_srs_wkt (p, 4,
  3052         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  3053         -    add_srs_wkt (p, 5,
  3054         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  3055         -    add_srs_wkt (p, 6,
  3056         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  3057         -    add_srs_wkt (p, 7,
  3058         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  3059         -    add_srs_wkt (p, 8,
  3060         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  3061         -    add_srs_wkt (p, 9,
  3062         -        "n\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"sc");
  3063         -    add_srs_wkt (p, 10,
  3064         -        "ale_factor\",1],PARAMETER[\"false_easting\",6500000],PAR");
  3065         -    add_srs_wkt (p, 11,
  3066         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3067         -    add_srs_wkt (p, 12,
  3068         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3069         -    add_srs_wkt (p, 13,
  3070         -        "UTHORITY[\"EPSG\",\"20006\"]]");
         3046  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         3047  +    add_srs_wkt (p, 4,
         3048  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3049  +    add_srs_wkt (p, 5,
         3050  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3051  +    add_srs_wkt (p, 6,
         3052  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3053  +    add_srs_wkt (p, 7,
         3054  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3055  +    add_srs_wkt (p, 8,
         3056  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3057  +    add_srs_wkt (p, 9,
         3058  +        "in\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"s");
         3059  +    add_srs_wkt (p, 10,
         3060  +        "cale_factor\",1],PARAMETER[\"false_easting\",6500000],PA");
         3061  +    add_srs_wkt (p, 11,
         3062  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3063  +    add_srs_wkt (p, 12,
         3064  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3065  +    add_srs_wkt (p, 13,
         3066  +        "AUTHORITY[\"EPSG\",\"20006\"]]");
  3071   3067       p = add_epsg_def_ex (filter, first, last, 20007, "epsg", 20007,
  3072   3068           "Pulkovo 1995 / Gauss-Kruger zone 7", 0, 1,
  3073   3069           "Krassowsky 1940", "Greenwich",
  3074   3070           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3075   3071           "X", "North", "Y", "East");
  3076   3072       add_proj4text (p, 0,
  3077   3073           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=7500000 +y_0=0 ");
  3078   3074       add_proj4text (p, 1,
  3079         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3075  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3080   3076       add_proj4text (p, 2,
  3081         -        "2 +units=m +no_defs");
         3077  +        ".22 +units=m +no_defs");
  3082   3078       add_srs_wkt (p, 0,
  3083   3079           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 7\",GEOGCS[\"P");
  3084   3080       add_srs_wkt (p, 1,
  3085   3081           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  3086   3082       add_srs_wkt (p, 2,
  3087   3083           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3088   3084       add_srs_wkt (p, 3,
  3089         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  3090         -    add_srs_wkt (p, 4,
  3091         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  3092         -    add_srs_wkt (p, 5,
  3093         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  3094         -    add_srs_wkt (p, 6,
  3095         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  3096         -    add_srs_wkt (p, 7,
  3097         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  3098         -    add_srs_wkt (p, 8,
  3099         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  3100         -    add_srs_wkt (p, 9,
  3101         -        "n\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"sc");
  3102         -    add_srs_wkt (p, 10,
  3103         -        "ale_factor\",1],PARAMETER[\"false_easting\",7500000],PAR");
  3104         -    add_srs_wkt (p, 11,
  3105         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3106         -    add_srs_wkt (p, 12,
  3107         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3108         -    add_srs_wkt (p, 13,
  3109         -        "UTHORITY[\"EPSG\",\"20007\"]]");
         3085  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         3086  +    add_srs_wkt (p, 4,
         3087  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3088  +    add_srs_wkt (p, 5,
         3089  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3090  +    add_srs_wkt (p, 6,
         3091  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3092  +    add_srs_wkt (p, 7,
         3093  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3094  +    add_srs_wkt (p, 8,
         3095  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3096  +    add_srs_wkt (p, 9,
         3097  +        "in\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"s");
         3098  +    add_srs_wkt (p, 10,
         3099  +        "cale_factor\",1],PARAMETER[\"false_easting\",7500000],PA");
         3100  +    add_srs_wkt (p, 11,
         3101  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3102  +    add_srs_wkt (p, 12,
         3103  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3104  +    add_srs_wkt (p, 13,
         3105  +        "AUTHORITY[\"EPSG\",\"20007\"]]");
  3110   3106       p = add_epsg_def_ex (filter, first, last, 20008, "epsg", 20008,
  3111   3107           "Pulkovo 1995 / Gauss-Kruger zone 8", 0, 1,
  3112   3108           "Krassowsky 1940", "Greenwich",
  3113   3109           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3114   3110           "X", "North", "Y", "East");
  3115   3111       add_proj4text (p, 0,
  3116   3112           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=8500000 +y_0=0 ");
  3117   3113       add_proj4text (p, 1,
  3118         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3114  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3119   3115       add_proj4text (p, 2,
  3120         -        "2 +units=m +no_defs");
         3116  +        ".22 +units=m +no_defs");
  3121   3117       add_srs_wkt (p, 0,
  3122   3118           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 8\",GEOGCS[\"P");
  3123   3119       add_srs_wkt (p, 1,
  3124   3120           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  3125   3121       add_srs_wkt (p, 2,
  3126   3122           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3127   3123       add_srs_wkt (p, 3,
  3128         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  3129         -    add_srs_wkt (p, 4,
  3130         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  3131         -    add_srs_wkt (p, 5,
  3132         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  3133         -    add_srs_wkt (p, 6,
  3134         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  3135         -    add_srs_wkt (p, 7,
  3136         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  3137         -    add_srs_wkt (p, 8,
  3138         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  3139         -    add_srs_wkt (p, 9,
  3140         -        "n\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"sc");
  3141         -    add_srs_wkt (p, 10,
  3142         -        "ale_factor\",1],PARAMETER[\"false_easting\",8500000],PAR");
  3143         -    add_srs_wkt (p, 11,
  3144         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3145         -    add_srs_wkt (p, 12,
  3146         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3147         -    add_srs_wkt (p, 13,
  3148         -        "UTHORITY[\"EPSG\",\"20008\"]]");
         3124  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
         3125  +    add_srs_wkt (p, 4,
         3126  +        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3127  +    add_srs_wkt (p, 5,
         3128  +        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3129  +    add_srs_wkt (p, 6,
         3130  +        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3131  +    add_srs_wkt (p, 7,
         3132  +        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3133  +    add_srs_wkt (p, 8,
         3134  +        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3135  +    add_srs_wkt (p, 9,
         3136  +        "in\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"s");
         3137  +    add_srs_wkt (p, 10,
         3138  +        "cale_factor\",1],PARAMETER[\"false_easting\",8500000],PA");
         3139  +    add_srs_wkt (p, 11,
         3140  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3141  +    add_srs_wkt (p, 12,
         3142  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3143  +    add_srs_wkt (p, 13,
         3144  +        "AUTHORITY[\"EPSG\",\"20008\"]]");
  3149   3145       p = add_epsg_def_ex (filter, first, last, 20009, "epsg", 20009,
  3150   3146           "Pulkovo 1995 / Gauss-Kruger zone 9", 0, 1,
  3151   3147           "Krassowsky 1940", "Greenwich",
  3152   3148           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3153   3149           "X", "North", "Y", "East");
  3154   3150       add_proj4text (p, 0,
  3155   3151           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=9500000 +y_0=0 ");
  3156   3152       add_proj4text (p, 1,
  3157         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         3153  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  3158   3154       add_proj4text (p, 2,
  3159         -        "2 +units=m +no_defs");
         3155  +        ".22 +units=m +no_defs");
  3160   3156       add_srs_wkt (p, 0,
  3161   3157           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 9\",GEOGCS[\"P");
  3162   3158       add_srs_wkt (p, 1,
  3163   3159           "ulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassows");
  3164   3160       add_srs_wkt (p, 2,
  3165   3161           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  3166   3162       add_srs_wkt (p, 3,
  3167         -        "WGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"E");
  3168         -    add_srs_wkt (p, 4,
  3169         -        "PSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  3170         -    add_srs_wkt (p, 5,
  3171         -        "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  3172         -    add_srs_wkt (p, 6,
  3173         -        "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  3174         -    add_srs_wkt (p, 7,
  3175         -        "ongitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTIO");
  3176         -    add_srs_wkt (p, 8,
  3177         -        "N[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origi");
  3178         -    add_srs_wkt (p, 9,
  3179         -        "n\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"sc");
  3180         -    add_srs_wkt (p, 10,
  3181         -        "ale_factor\",1],PARAMETER[\"false_easting\",9500000],PAR");
  3182         -    add_srs_wkt (p, 11,
  3183         -        "AMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[");
  3184         -    add_srs_wkt (p, 12,
  3185         -        "\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],A");
  3186         -    add_srs_wkt (p, 13,
  3187         -        "UTHORITY[\"EPSG\",\"20009\"]]");
  3188         -    p = add_epsg_def_ex (filter, first, last, 20010, "epsg", 20010,
  3189         -        "Pulkovo 1995 / Gauss-Kruger zone 10", 0, 1,
  3190         -        "Krassowsky 1940", "Greenwich",
  3191         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
  3192         -        "X", "North", "Y", "East");
  3193         -    add_proj4text (p, 0,
  3194         -        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=10500000 +y_0=0");
  3195         -    add_proj4text (p, 1,
  3196         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
  3197         -    add_proj4text (p, 2,
  3198         -        "22 +units=m +no_defs");
  3199         -    add_srs_wkt (p, 0,
  3200         -        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 10\",GEOGCS[\"");
  3201         -    add_srs_wkt (p, 1,
  3202         -        "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3203         -    add_srs_wkt (p, 2,
  3204         -        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3205         -    add_srs_wkt (p, 3,
  3206         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3163  +        "WGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[\"");
  3207   3164       add_srs_wkt (p, 4,
  3208   3165           "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3209   3166       add_srs_wkt (p, 5,
  3210   3167           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3211   3168       add_srs_wkt (p, 6,
  3212   3169           "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3213   3170       add_srs_wkt (p, 7,
  3214   3171           "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3215   3172       add_srs_wkt (p, 8,
  3216   3173           "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3217   3174       add_srs_wkt (p, 9,
  3218         -        "in\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"s");
  3219         -    add_srs_wkt (p, 10,
  3220         -        "cale_factor\",1],PARAMETER[\"false_easting\",10500000],P");
  3221         -    add_srs_wkt (p, 11,
  3222         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3223         -    add_srs_wkt (p, 12,
  3224         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3225         -    add_srs_wkt (p, 13,
  3226         -        ",AUTHORITY[\"EPSG\",\"20010\"]]");
         3175  +        "in\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"s");
         3176  +    add_srs_wkt (p, 10,
         3177  +        "cale_factor\",1],PARAMETER[\"false_easting\",9500000],PA");
         3178  +    add_srs_wkt (p, 11,
         3179  +        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
         3180  +    add_srs_wkt (p, 12,
         3181  +        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
         3182  +    add_srs_wkt (p, 13,
         3183  +        "AUTHORITY[\"EPSG\",\"20009\"]]");
         3184  +    p = add_epsg_def_ex (filter, first, last, 20010, "epsg", 20010,
         3185  +        "Pulkovo 1995 / Gauss-Kruger zone 10", 0, 1,
         3186  +        "Krassowsky 1940", "Greenwich",
         3187  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
         3188  +        "X", "North", "Y", "East");
         3189  +    add_proj4text (p, 0,
         3190  +        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=10500000 +y_0=0");
         3191  +    add_proj4text (p, 1,
         3192  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
         3193  +    add_proj4text (p, 2,
         3194  +        "0.22 +units=m +no_defs");
         3195  +    add_srs_wkt (p, 0,
         3196  +        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 10\",GEOGCS[\"");
         3197  +    add_srs_wkt (p, 1,
         3198  +        "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
         3199  +    add_srs_wkt (p, 2,
         3200  +        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
         3201  +    add_srs_wkt (p, 3,
         3202  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3203  +    add_srs_wkt (p, 4,
         3204  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3205  +    add_srs_wkt (p, 5,
         3206  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3207  +    add_srs_wkt (p, 6,
         3208  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3209  +    add_srs_wkt (p, 7,
         3210  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3211  +    add_srs_wkt (p, 8,
         3212  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3213  +    add_srs_wkt (p, 9,
         3214  +        "igin\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"");
         3215  +    add_srs_wkt (p, 10,
         3216  +        "scale_factor\",1],PARAMETER[\"false_easting\",10500000],");
         3217  +    add_srs_wkt (p, 11,
         3218  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3219  +    add_srs_wkt (p, 12,
         3220  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3221  +    add_srs_wkt (p, 13,
         3222  +        "],AUTHORITY[\"EPSG\",\"20010\"]]");
  3227   3223       p = add_epsg_def_ex (filter, first, last, 20011, "epsg", 20011,
  3228   3224           "Pulkovo 1995 / Gauss-Kruger zone 11", 0, 1,
  3229   3225           "Krassowsky 1940", "Greenwich",
  3230   3226           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3231   3227           "X", "North", "Y", "East");
  3232   3228       add_proj4text (p, 0,
  3233   3229           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=11500000 +y_0=0");
  3234   3230       add_proj4text (p, 1,
  3235         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3231  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3236   3232       add_proj4text (p, 2,
  3237         -        "22 +units=m +no_defs");
         3233  +        "0.22 +units=m +no_defs");
  3238   3234       add_srs_wkt (p, 0,
  3239   3235           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 11\",GEOGCS[\"");
  3240   3236       add_srs_wkt (p, 1,
  3241   3237           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3242   3238       add_srs_wkt (p, 2,
  3243   3239           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3244   3240       add_srs_wkt (p, 3,
  3245         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3246         -    add_srs_wkt (p, 4,
  3247         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3248         -    add_srs_wkt (p, 5,
  3249         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3250         -    add_srs_wkt (p, 6,
  3251         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3252         -    add_srs_wkt (p, 7,
  3253         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3254         -    add_srs_wkt (p, 8,
  3255         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3256         -    add_srs_wkt (p, 9,
  3257         -        "in\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"s");
  3258         -    add_srs_wkt (p, 10,
  3259         -        "cale_factor\",1],PARAMETER[\"false_easting\",11500000],P");
  3260         -    add_srs_wkt (p, 11,
  3261         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3262         -    add_srs_wkt (p, 12,
  3263         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3264         -    add_srs_wkt (p, 13,
  3265         -        ",AUTHORITY[\"EPSG\",\"20011\"]]");
         3241  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3242  +    add_srs_wkt (p, 4,
         3243  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3244  +    add_srs_wkt (p, 5,
         3245  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3246  +    add_srs_wkt (p, 6,
         3247  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3248  +    add_srs_wkt (p, 7,
         3249  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3250  +    add_srs_wkt (p, 8,
         3251  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3252  +    add_srs_wkt (p, 9,
         3253  +        "igin\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"");
         3254  +    add_srs_wkt (p, 10,
         3255  +        "scale_factor\",1],PARAMETER[\"false_easting\",11500000],");
         3256  +    add_srs_wkt (p, 11,
         3257  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3258  +    add_srs_wkt (p, 12,
         3259  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3260  +    add_srs_wkt (p, 13,
         3261  +        "],AUTHORITY[\"EPSG\",\"20011\"]]");
  3266   3262       p = add_epsg_def_ex (filter, first, last, 20012, "epsg", 20012,
  3267   3263           "Pulkovo 1995 / Gauss-Kruger zone 12", 0, 1,
  3268   3264           "Krassowsky 1940", "Greenwich",
  3269   3265           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3270   3266           "X", "North", "Y", "East");
  3271   3267       add_proj4text (p, 0,
  3272   3268           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=12500000 +y_0=0");
  3273   3269       add_proj4text (p, 1,
  3274         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3270  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3275   3271       add_proj4text (p, 2,
  3276         -        "22 +units=m +no_defs");
         3272  +        "0.22 +units=m +no_defs");
  3277   3273       add_srs_wkt (p, 0,
  3278   3274           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 12\",GEOGCS[\"");
  3279   3275       add_srs_wkt (p, 1,
  3280   3276           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3281   3277       add_srs_wkt (p, 2,
  3282   3278           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3283   3279       add_srs_wkt (p, 3,
  3284         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3285         -    add_srs_wkt (p, 4,
  3286         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3287         -    add_srs_wkt (p, 5,
  3288         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3289         -    add_srs_wkt (p, 6,
  3290         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3291         -    add_srs_wkt (p, 7,
  3292         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3293         -    add_srs_wkt (p, 8,
  3294         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3295         -    add_srs_wkt (p, 9,
  3296         -        "in\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"s");
  3297         -    add_srs_wkt (p, 10,
  3298         -        "cale_factor\",1],PARAMETER[\"false_easting\",12500000],P");
  3299         -    add_srs_wkt (p, 11,
  3300         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3301         -    add_srs_wkt (p, 12,
  3302         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3303         -    add_srs_wkt (p, 13,
  3304         -        ",AUTHORITY[\"EPSG\",\"20012\"]]");
         3280  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3281  +    add_srs_wkt (p, 4,
         3282  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3283  +    add_srs_wkt (p, 5,
         3284  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3285  +    add_srs_wkt (p, 6,
         3286  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3287  +    add_srs_wkt (p, 7,
         3288  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3289  +    add_srs_wkt (p, 8,
         3290  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3291  +    add_srs_wkt (p, 9,
         3292  +        "igin\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"");
         3293  +    add_srs_wkt (p, 10,
         3294  +        "scale_factor\",1],PARAMETER[\"false_easting\",12500000],");
         3295  +    add_srs_wkt (p, 11,
         3296  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3297  +    add_srs_wkt (p, 12,
         3298  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3299  +    add_srs_wkt (p, 13,
         3300  +        "],AUTHORITY[\"EPSG\",\"20012\"]]");
  3305   3301       p = add_epsg_def_ex (filter, first, last, 20013, "epsg", 20013,
  3306   3302           "Pulkovo 1995 / Gauss-Kruger zone 13", 0, 1,
  3307   3303           "Krassowsky 1940", "Greenwich",
  3308   3304           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3309   3305           "X", "North", "Y", "East");
  3310   3306       add_proj4text (p, 0,
  3311   3307           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=13500000 +y_0=0");
  3312   3308       add_proj4text (p, 1,
  3313         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3309  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3314   3310       add_proj4text (p, 2,
  3315         -        "22 +units=m +no_defs");
         3311  +        "0.22 +units=m +no_defs");
  3316   3312       add_srs_wkt (p, 0,
  3317   3313           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 13\",GEOGCS[\"");
  3318   3314       add_srs_wkt (p, 1,
  3319   3315           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3320   3316       add_srs_wkt (p, 2,
  3321   3317           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3322   3318       add_srs_wkt (p, 3,
  3323         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3324         -    add_srs_wkt (p, 4,
  3325         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3326         -    add_srs_wkt (p, 5,
  3327         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3328         -    add_srs_wkt (p, 6,
  3329         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3330         -    add_srs_wkt (p, 7,
  3331         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3332         -    add_srs_wkt (p, 8,
  3333         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3334         -    add_srs_wkt (p, 9,
  3335         -        "in\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"s");
  3336         -    add_srs_wkt (p, 10,
  3337         -        "cale_factor\",1],PARAMETER[\"false_easting\",13500000],P");
  3338         -    add_srs_wkt (p, 11,
  3339         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3340         -    add_srs_wkt (p, 12,
  3341         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3342         -    add_srs_wkt (p, 13,
  3343         -        ",AUTHORITY[\"EPSG\",\"20013\"]]");
         3319  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3320  +    add_srs_wkt (p, 4,
         3321  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3322  +    add_srs_wkt (p, 5,
         3323  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3324  +    add_srs_wkt (p, 6,
         3325  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3326  +    add_srs_wkt (p, 7,
         3327  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3328  +    add_srs_wkt (p, 8,
         3329  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3330  +    add_srs_wkt (p, 9,
         3331  +        "igin\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"");
         3332  +    add_srs_wkt (p, 10,
         3333  +        "scale_factor\",1],PARAMETER[\"false_easting\",13500000],");
         3334  +    add_srs_wkt (p, 11,
         3335  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3336  +    add_srs_wkt (p, 12,
         3337  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3338  +    add_srs_wkt (p, 13,
         3339  +        "],AUTHORITY[\"EPSG\",\"20013\"]]");
  3344   3340       p = add_epsg_def_ex (filter, first, last, 20014, "epsg", 20014,
  3345   3341           "Pulkovo 1995 / Gauss-Kruger zone 14", 0, 1,
  3346   3342           "Krassowsky 1940", "Greenwich",
  3347   3343           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3348   3344           "X", "North", "Y", "East");
  3349   3345       add_proj4text (p, 0,
  3350   3346           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=14500000 +y_0=0");
  3351   3347       add_proj4text (p, 1,
  3352         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3348  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3353   3349       add_proj4text (p, 2,
  3354         -        "22 +units=m +no_defs");
         3350  +        "0.22 +units=m +no_defs");
  3355   3351       add_srs_wkt (p, 0,
  3356   3352           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 14\",GEOGCS[\"");
  3357   3353       add_srs_wkt (p, 1,
  3358   3354           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3359   3355       add_srs_wkt (p, 2,
  3360   3356           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3361   3357       add_srs_wkt (p, 3,
  3362         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3363         -    add_srs_wkt (p, 4,
  3364         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3365         -    add_srs_wkt (p, 5,
  3366         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3367         -    add_srs_wkt (p, 6,
  3368         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3369         -    add_srs_wkt (p, 7,
  3370         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3371         -    add_srs_wkt (p, 8,
  3372         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3373         -    add_srs_wkt (p, 9,
  3374         -        "in\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"s");
  3375         -    add_srs_wkt (p, 10,
  3376         -        "cale_factor\",1],PARAMETER[\"false_easting\",14500000],P");
  3377         -    add_srs_wkt (p, 11,
  3378         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3379         -    add_srs_wkt (p, 12,
  3380         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3381         -    add_srs_wkt (p, 13,
  3382         -        ",AUTHORITY[\"EPSG\",\"20014\"]]");
         3358  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3359  +    add_srs_wkt (p, 4,
         3360  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3361  +    add_srs_wkt (p, 5,
         3362  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3363  +    add_srs_wkt (p, 6,
         3364  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3365  +    add_srs_wkt (p, 7,
         3366  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3367  +    add_srs_wkt (p, 8,
         3368  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3369  +    add_srs_wkt (p, 9,
         3370  +        "igin\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"");
         3371  +    add_srs_wkt (p, 10,
         3372  +        "scale_factor\",1],PARAMETER[\"false_easting\",14500000],");
         3373  +    add_srs_wkt (p, 11,
         3374  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3375  +    add_srs_wkt (p, 12,
         3376  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3377  +    add_srs_wkt (p, 13,
         3378  +        "],AUTHORITY[\"EPSG\",\"20014\"]]");
  3383   3379       p = add_epsg_def_ex (filter, first, last, 20015, "epsg", 20015,
  3384   3380           "Pulkovo 1995 / Gauss-Kruger zone 15", 0, 1,
  3385   3381           "Krassowsky 1940", "Greenwich",
  3386   3382           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3387   3383           "X", "North", "Y", "East");
  3388   3384       add_proj4text (p, 0,
  3389   3385           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=15500000 +y_0=0");
  3390   3386       add_proj4text (p, 1,
  3391         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3387  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3392   3388       add_proj4text (p, 2,
  3393         -        "22 +units=m +no_defs");
         3389  +        "0.22 +units=m +no_defs");
  3394   3390       add_srs_wkt (p, 0,
  3395   3391           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 15\",GEOGCS[\"");
  3396   3392       add_srs_wkt (p, 1,
  3397   3393           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3398   3394       add_srs_wkt (p, 2,
  3399   3395           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3400   3396       add_srs_wkt (p, 3,
  3401         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3402         -    add_srs_wkt (p, 4,
  3403         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3404         -    add_srs_wkt (p, 5,
  3405         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3406         -    add_srs_wkt (p, 6,
  3407         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3408         -    add_srs_wkt (p, 7,
  3409         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3410         -    add_srs_wkt (p, 8,
  3411         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3412         -    add_srs_wkt (p, 9,
  3413         -        "in\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"s");
  3414         -    add_srs_wkt (p, 10,
  3415         -        "cale_factor\",1],PARAMETER[\"false_easting\",15500000],P");
  3416         -    add_srs_wkt (p, 11,
  3417         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3418         -    add_srs_wkt (p, 12,
  3419         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3420         -    add_srs_wkt (p, 13,
  3421         -        ",AUTHORITY[\"EPSG\",\"20015\"]]");
         3397  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3398  +    add_srs_wkt (p, 4,
         3399  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3400  +    add_srs_wkt (p, 5,
         3401  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3402  +    add_srs_wkt (p, 6,
         3403  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3404  +    add_srs_wkt (p, 7,
         3405  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3406  +    add_srs_wkt (p, 8,
         3407  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3408  +    add_srs_wkt (p, 9,
         3409  +        "igin\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"");
         3410  +    add_srs_wkt (p, 10,
         3411  +        "scale_factor\",1],PARAMETER[\"false_easting\",15500000],");
         3412  +    add_srs_wkt (p, 11,
         3413  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3414  +    add_srs_wkt (p, 12,
         3415  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3416  +    add_srs_wkt (p, 13,
         3417  +        "],AUTHORITY[\"EPSG\",\"20015\"]]");
  3422   3418       p = add_epsg_def_ex (filter, first, last, 20016, "epsg", 20016,
  3423   3419           "Pulkovo 1995 / Gauss-Kruger zone 16", 0, 1,
  3424   3420           "Krassowsky 1940", "Greenwich",
  3425   3421           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3426   3422           "X", "North", "Y", "East");
  3427   3423       add_proj4text (p, 0,
  3428   3424           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=16500000 +y_0=0");
  3429   3425       add_proj4text (p, 1,
  3430         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3426  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3431   3427       add_proj4text (p, 2,
  3432         -        "22 +units=m +no_defs");
         3428  +        "0.22 +units=m +no_defs");
  3433   3429       add_srs_wkt (p, 0,
  3434   3430           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 16\",GEOGCS[\"");
  3435   3431       add_srs_wkt (p, 1,
  3436   3432           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3437   3433       add_srs_wkt (p, 2,
  3438   3434           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3439   3435       add_srs_wkt (p, 3,
  3440         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3441         -    add_srs_wkt (p, 4,
  3442         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3443         -    add_srs_wkt (p, 5,
  3444         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3445         -    add_srs_wkt (p, 6,
  3446         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3447         -    add_srs_wkt (p, 7,
  3448         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3449         -    add_srs_wkt (p, 8,
  3450         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3451         -    add_srs_wkt (p, 9,
  3452         -        "in\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"s");
  3453         -    add_srs_wkt (p, 10,
  3454         -        "cale_factor\",1],PARAMETER[\"false_easting\",16500000],P");
  3455         -    add_srs_wkt (p, 11,
  3456         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3457         -    add_srs_wkt (p, 12,
  3458         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3459         -    add_srs_wkt (p, 13,
  3460         -        ",AUTHORITY[\"EPSG\",\"20016\"]]");
         3436  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3437  +    add_srs_wkt (p, 4,
         3438  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3439  +    add_srs_wkt (p, 5,
         3440  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3441  +    add_srs_wkt (p, 6,
         3442  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3443  +    add_srs_wkt (p, 7,
         3444  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3445  +    add_srs_wkt (p, 8,
         3446  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3447  +    add_srs_wkt (p, 9,
         3448  +        "igin\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"");
         3449  +    add_srs_wkt (p, 10,
         3450  +        "scale_factor\",1],PARAMETER[\"false_easting\",16500000],");
         3451  +    add_srs_wkt (p, 11,
         3452  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3453  +    add_srs_wkt (p, 12,
         3454  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3455  +    add_srs_wkt (p, 13,
         3456  +        "],AUTHORITY[\"EPSG\",\"20016\"]]");
  3461   3457       p = add_epsg_def_ex (filter, first, last, 20017, "epsg", 20017,
  3462   3458           "Pulkovo 1995 / Gauss-Kruger zone 17", 0, 1,
  3463   3459           "Krassowsky 1940", "Greenwich",
  3464   3460           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3465   3461           "X", "North", "Y", "East");
  3466   3462       add_proj4text (p, 0,
  3467   3463           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=17500000 +y_0=0");
  3468   3464       add_proj4text (p, 1,
  3469         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         3465  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  3470   3466       add_proj4text (p, 2,
  3471         -        "22 +units=m +no_defs");
         3467  +        "0.22 +units=m +no_defs");
  3472   3468       add_srs_wkt (p, 0,
  3473   3469           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 17\",GEOGCS[\"");
  3474   3470       add_srs_wkt (p, 1,
  3475   3471           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3476   3472       add_srs_wkt (p, 2,
  3477   3473           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3478   3474       add_srs_wkt (p, 3,
  3479         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3480         -    add_srs_wkt (p, 4,
  3481         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3482         -    add_srs_wkt (p, 5,
  3483         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3484         -    add_srs_wkt (p, 6,
  3485         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3486         -    add_srs_wkt (p, 7,
  3487         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3488         -    add_srs_wkt (p, 8,
  3489         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3490         -    add_srs_wkt (p, 9,
  3491         -        "in\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"s");
  3492         -    add_srs_wkt (p, 10,
  3493         -        "cale_factor\",1],PARAMETER[\"false_easting\",17500000],P");
  3494         -    add_srs_wkt (p, 11,
  3495         -        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
  3496         -    add_srs_wkt (p, 12,
  3497         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
  3498         -    add_srs_wkt (p, 13,
  3499         -        ",AUTHORITY[\"EPSG\",\"20017\"]]");
         3475  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3476  +    add_srs_wkt (p, 4,
         3477  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3478  +    add_srs_wkt (p, 5,
         3479  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3480  +    add_srs_wkt (p, 6,
         3481  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3482  +    add_srs_wkt (p, 7,
         3483  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3484  +    add_srs_wkt (p, 8,
         3485  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3486  +    add_srs_wkt (p, 9,
         3487  +        "igin\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"");
         3488  +    add_srs_wkt (p, 10,
         3489  +        "scale_factor\",1],PARAMETER[\"false_easting\",17500000],");
         3490  +    add_srs_wkt (p, 11,
         3491  +        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3492  +    add_srs_wkt (p, 12,
         3493  +        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3494  +    add_srs_wkt (p, 13,
         3495  +        "],AUTHORITY[\"EPSG\",\"20017\"]]");
  3500   3496       p = add_epsg_def_ex (filter, first, last, 20018, "epsg", 20018,
  3501   3497           "Pulkovo 1995 / Gauss-Kruger zone 18", 0, 1,
  3502   3498           "Krassowsky 1940", "Greenwich",
  3503   3499           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3504   3500           "X", "North", "Y", "East");
  3505   3501       add_proj4text (p, 0,
  3506   3502           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=18500000 +y_0=");
  3507   3503       add_proj4text (p, 1,
  3508         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3504  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3509   3505       add_proj4text (p, 2,
  3510         -        ".22 +units=m +no_defs");
         3506  +        "-0.22 +units=m +no_defs");
  3511   3507       add_srs_wkt (p, 0,
  3512   3508           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 18\",GEOGCS[\"");
  3513   3509       add_srs_wkt (p, 1,
  3514   3510           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3515   3511       add_srs_wkt (p, 2,
  3516   3512           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3517   3513       add_srs_wkt (p, 3,
  3518         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3519         -    add_srs_wkt (p, 4,
  3520         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3521         -    add_srs_wkt (p, 5,
  3522         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3523         -    add_srs_wkt (p, 6,
  3524         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3525         -    add_srs_wkt (p, 7,
  3526         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3527         -    add_srs_wkt (p, 8,
  3528         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3529         -    add_srs_wkt (p, 9,
  3530         -        "in\",0],PARAMETER[\"central_meridian\",105],PARAMETER[\"");
  3531         -    add_srs_wkt (p, 10,
  3532         -        "scale_factor\",1],PARAMETER[\"false_easting\",18500000],");
  3533         -    add_srs_wkt (p, 11,
  3534         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3535         -    add_srs_wkt (p, 12,
  3536         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3537         -    add_srs_wkt (p, 13,
  3538         -        "],AUTHORITY[\"EPSG\",\"20018\"]]");
         3514  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3515  +    add_srs_wkt (p, 4,
         3516  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3517  +    add_srs_wkt (p, 5,
         3518  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3519  +    add_srs_wkt (p, 6,
         3520  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3521  +    add_srs_wkt (p, 7,
         3522  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3523  +    add_srs_wkt (p, 8,
         3524  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3525  +    add_srs_wkt (p, 9,
         3526  +        "igin\",0],PARAMETER[\"central_meridian\",105],PARAMETER[");
         3527  +    add_srs_wkt (p, 10,
         3528  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",18500000");
         3529  +    add_srs_wkt (p, 11,
         3530  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         3531  +    add_srs_wkt (p, 12,
         3532  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         3533  +    add_srs_wkt (p, 13,
         3534  +        "ST],AUTHORITY[\"EPSG\",\"20018\"]]");
  3539   3535       p = add_epsg_def_ex (filter, first, last, 20019, "epsg", 20019,
  3540   3536           "Pulkovo 1995 / Gauss-Kruger zone 19", 0, 1,
  3541   3537           "Krassowsky 1940", "Greenwich",
  3542   3538           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3543   3539           "X", "North", "Y", "East");
  3544   3540       add_proj4text (p, 0,
  3545   3541           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=19500000 +y_0=");
  3546   3542       add_proj4text (p, 1,
  3547         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3543  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3548   3544       add_proj4text (p, 2,
  3549         -        ".22 +units=m +no_defs");
         3545  +        "-0.22 +units=m +no_defs");
  3550   3546       add_srs_wkt (p, 0,
  3551   3547           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 19\",GEOGCS[\"");
  3552   3548       add_srs_wkt (p, 1,
  3553   3549           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3554   3550       add_srs_wkt (p, 2,
  3555   3551           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3556   3552       add_srs_wkt (p, 3,
  3557         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
  3558         -    add_srs_wkt (p, 4,
  3559         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3560         -    add_srs_wkt (p, 5,
  3561         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3562         -    add_srs_wkt (p, 6,
  3563         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  3564         -    add_srs_wkt (p, 7,
  3565         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
  3566         -    add_srs_wkt (p, 8,
  3567         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  3568         -    add_srs_wkt (p, 9,
  3569         -        "in\",0],PARAMETER[\"central_meridian\",111],PARAMETER[\"");
  3570         -    add_srs_wkt (p, 10,
  3571         -        "scale_factor\",1],PARAMETER[\"false_easting\",19500000],");
  3572         -    add_srs_wkt (p, 11,
  3573         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3574         -    add_srs_wkt (p, 12,
  3575         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3576         -    add_srs_wkt (p, 13,
  3577         -        "],AUTHORITY[\"EPSG\",\"20019\"]]");
         3553  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
         3554  +    add_srs_wkt (p, 4,
         3555  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         3556  +    add_srs_wkt (p, 5,
         3557  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         3558  +    add_srs_wkt (p, 6,
         3559  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         3560  +    add_srs_wkt (p, 7,
         3561  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
         3562  +    add_srs_wkt (p, 8,
         3563  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         3564  +    add_srs_wkt (p, 9,
         3565  +        "igin\",0],PARAMETER[\"central_meridian\",111],PARAMETER[");
         3566  +    add_srs_wkt (p, 10,
         3567  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",19500000");
         3568  +    add_srs_wkt (p, 11,
         3569  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         3570  +    add_srs_wkt (p, 12,
         3571  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         3572  +    add_srs_wkt (p, 13,
         3573  +        "ST],AUTHORITY[\"EPSG\",\"20019\"]]");
  3578   3574       p = add_epsg_def_ex (filter, first, last, 20020, "epsg", 20020,
  3579   3575           "Pulkovo 1995 / Gauss-Kruger zone 20", 0, 1,
  3580   3576           "Krassowsky 1940", "Greenwich",
  3581   3577           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3582   3578           "X", "North", "Y", "East");
  3583   3579       add_proj4text (p, 0,
  3584   3580           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=20500000 +y_0=");
  3585   3581       add_proj4text (p, 1,
  3586         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3582  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3587   3583       add_proj4text (p, 2,
  3588         -        ".22 +units=m +no_defs");
         3584  +        "-0.22 +units=m +no_defs");
  3589   3585       add_srs_wkt (p, 0,
  3590   3586           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 20\",GEOGCS[\"");
  3591   3587       add_srs_wkt (p, 1,
  3592   3588           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3593   3589       add_srs_wkt (p, 2,
  3594   3590           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3595   3591       add_srs_wkt (p, 3,
  3596         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3592  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3597   3593       add_srs_wkt (p, 4,
  3598         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3594  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3599   3595       add_srs_wkt (p, 5,
  3600         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3596  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3601   3597       add_srs_wkt (p, 6,
  3602         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3598  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3603   3599       add_srs_wkt (p, 7,
  3604         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3600  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3605   3601       add_srs_wkt (p, 8,
  3606         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3602  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3607   3603       add_srs_wkt (p, 9,
  3608         -        "in\",0],PARAMETER[\"central_meridian\",117],PARAMETER[\"");
         3604  +        "igin\",0],PARAMETER[\"central_meridian\",117],PARAMETER[");
  3609   3605       add_srs_wkt (p, 10,
  3610         -        "scale_factor\",1],PARAMETER[\"false_easting\",20500000],");
         3606  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",20500000");
  3611   3607       add_srs_wkt (p, 11,
  3612         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3608  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3613   3609       add_srs_wkt (p, 12,
  3614         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3610  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3615   3611       add_srs_wkt (p, 13,
  3616         -        "],AUTHORITY[\"EPSG\",\"20020\"]]");
         3612  +        "ST],AUTHORITY[\"EPSG\",\"20020\"]]");
  3617   3613       p = add_epsg_def_ex (filter, first, last, 20021, "epsg", 20021,
  3618   3614           "Pulkovo 1995 / Gauss-Kruger zone 21", 0, 1,
  3619   3615           "Krassowsky 1940", "Greenwich",
  3620   3616           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3621   3617           "X", "North", "Y", "East");
  3622   3618       add_proj4text (p, 0,
  3623   3619           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=21500000 +y_0=");
  3624   3620       add_proj4text (p, 1,
  3625         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3621  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3626   3622       add_proj4text (p, 2,
  3627         -        ".22 +units=m +no_defs");
         3623  +        "-0.22 +units=m +no_defs");
  3628   3624       add_srs_wkt (p, 0,
  3629   3625           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 21\",GEOGCS[\"");
  3630   3626       add_srs_wkt (p, 1,
  3631   3627           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3632   3628       add_srs_wkt (p, 2,
  3633   3629           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3634   3630       add_srs_wkt (p, 3,
  3635         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3631  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3636   3632       add_srs_wkt (p, 4,
  3637         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3633  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3638   3634       add_srs_wkt (p, 5,
  3639         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3635  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3640   3636       add_srs_wkt (p, 6,
  3641         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3637  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3642   3638       add_srs_wkt (p, 7,
  3643         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3639  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3644   3640       add_srs_wkt (p, 8,
  3645         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3641  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3646   3642       add_srs_wkt (p, 9,
  3647         -        "in\",0],PARAMETER[\"central_meridian\",123],PARAMETER[\"");
         3643  +        "igin\",0],PARAMETER[\"central_meridian\",123],PARAMETER[");
  3648   3644       add_srs_wkt (p, 10,
  3649         -        "scale_factor\",1],PARAMETER[\"false_easting\",21500000],");
         3645  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",21500000");
  3650   3646       add_srs_wkt (p, 11,
  3651         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3647  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3652   3648       add_srs_wkt (p, 12,
  3653         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3649  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3654   3650       add_srs_wkt (p, 13,
  3655         -        "],AUTHORITY[\"EPSG\",\"20021\"]]");
         3651  +        "ST],AUTHORITY[\"EPSG\",\"20021\"]]");
  3656   3652       p = add_epsg_def_ex (filter, first, last, 20022, "epsg", 20022,
  3657   3653           "Pulkovo 1995 / Gauss-Kruger zone 22", 0, 1,
  3658   3654           "Krassowsky 1940", "Greenwich",
  3659   3655           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3660   3656           "X", "North", "Y", "East");
  3661   3657       add_proj4text (p, 0,
  3662   3658           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=22500000 +y_0=");
  3663   3659       add_proj4text (p, 1,
  3664         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3660  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3665   3661       add_proj4text (p, 2,
  3666         -        ".22 +units=m +no_defs");
         3662  +        "-0.22 +units=m +no_defs");
  3667   3663       add_srs_wkt (p, 0,
  3668   3664           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 22\",GEOGCS[\"");
  3669   3665       add_srs_wkt (p, 1,
  3670   3666           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3671   3667       add_srs_wkt (p, 2,
  3672   3668           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3673   3669       add_srs_wkt (p, 3,
  3674         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3670  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3675   3671       add_srs_wkt (p, 4,
  3676         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3672  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3677   3673       add_srs_wkt (p, 5,
  3678         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3674  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3679   3675       add_srs_wkt (p, 6,
  3680         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3676  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3681   3677       add_srs_wkt (p, 7,
  3682         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3678  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3683   3679       add_srs_wkt (p, 8,
  3684         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3680  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3685   3681       add_srs_wkt (p, 9,
  3686         -        "in\",0],PARAMETER[\"central_meridian\",129],PARAMETER[\"");
         3682  +        "igin\",0],PARAMETER[\"central_meridian\",129],PARAMETER[");
  3687   3683       add_srs_wkt (p, 10,
  3688         -        "scale_factor\",1],PARAMETER[\"false_easting\",22500000],");
         3684  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",22500000");
  3689   3685       add_srs_wkt (p, 11,
  3690         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3686  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3691   3687       add_srs_wkt (p, 12,
  3692         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3688  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3693   3689       add_srs_wkt (p, 13,
  3694         -        "],AUTHORITY[\"EPSG\",\"20022\"]]");
         3690  +        "ST],AUTHORITY[\"EPSG\",\"20022\"]]");
  3695   3691       p = add_epsg_def_ex (filter, first, last, 20023, "epsg", 20023,
  3696   3692           "Pulkovo 1995 / Gauss-Kruger zone 23", 0, 1,
  3697   3693           "Krassowsky 1940", "Greenwich",
  3698   3694           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3699   3695           "X", "North", "Y", "East");
  3700   3696       add_proj4text (p, 0,
  3701   3697           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=23500000 +y_0=");
  3702   3698       add_proj4text (p, 1,
  3703         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3699  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3704   3700       add_proj4text (p, 2,
  3705         -        ".22 +units=m +no_defs");
         3701  +        "-0.22 +units=m +no_defs");
  3706   3702       add_srs_wkt (p, 0,
  3707   3703           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 23\",GEOGCS[\"");
  3708   3704       add_srs_wkt (p, 1,
  3709   3705           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3710   3706       add_srs_wkt (p, 2,
  3711   3707           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3712   3708       add_srs_wkt (p, 3,
  3713         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3709  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3714   3710       add_srs_wkt (p, 4,
  3715         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3711  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3716   3712       add_srs_wkt (p, 5,
  3717         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3713  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3718   3714       add_srs_wkt (p, 6,
  3719         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3715  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3720   3716       add_srs_wkt (p, 7,
  3721         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3717  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3722   3718       add_srs_wkt (p, 8,
  3723         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3719  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3724   3720       add_srs_wkt (p, 9,
  3725         -        "in\",0],PARAMETER[\"central_meridian\",135],PARAMETER[\"");
         3721  +        "igin\",0],PARAMETER[\"central_meridian\",135],PARAMETER[");
  3726   3722       add_srs_wkt (p, 10,
  3727         -        "scale_factor\",1],PARAMETER[\"false_easting\",23500000],");
         3723  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",23500000");
  3728   3724       add_srs_wkt (p, 11,
  3729         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3725  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3730   3726       add_srs_wkt (p, 12,
  3731         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3727  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3732   3728       add_srs_wkt (p, 13,
  3733         -        "],AUTHORITY[\"EPSG\",\"20023\"]]");
         3729  +        "ST],AUTHORITY[\"EPSG\",\"20023\"]]");
  3734   3730       p = add_epsg_def_ex (filter, first, last, 20024, "epsg", 20024,
  3735   3731           "Pulkovo 1995 / Gauss-Kruger zone 24", 0, 1,
  3736   3732           "Krassowsky 1940", "Greenwich",
  3737   3733           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3738   3734           "X", "North", "Y", "East");
  3739   3735       add_proj4text (p, 0,
  3740   3736           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=24500000 +y_0=");
  3741   3737       add_proj4text (p, 1,
  3742         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3738  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3743   3739       add_proj4text (p, 2,
  3744         -        ".22 +units=m +no_defs");
         3740  +        "-0.22 +units=m +no_defs");
  3745   3741       add_srs_wkt (p, 0,
  3746   3742           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 24\",GEOGCS[\"");
  3747   3743       add_srs_wkt (p, 1,
  3748   3744           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3749   3745       add_srs_wkt (p, 2,
  3750   3746           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3751   3747       add_srs_wkt (p, 3,
  3752         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3748  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3753   3749       add_srs_wkt (p, 4,
  3754         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3750  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3755   3751       add_srs_wkt (p, 5,
  3756         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3752  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3757   3753       add_srs_wkt (p, 6,
  3758         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3754  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3759   3755       add_srs_wkt (p, 7,
  3760         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3756  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3761   3757       add_srs_wkt (p, 8,
  3762         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3758  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3763   3759       add_srs_wkt (p, 9,
  3764         -        "in\",0],PARAMETER[\"central_meridian\",141],PARAMETER[\"");
         3760  +        "igin\",0],PARAMETER[\"central_meridian\",141],PARAMETER[");
  3765   3761       add_srs_wkt (p, 10,
  3766         -        "scale_factor\",1],PARAMETER[\"false_easting\",24500000],");
         3762  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",24500000");
  3767   3763       add_srs_wkt (p, 11,
  3768         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3764  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3769   3765       add_srs_wkt (p, 12,
  3770         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3766  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3771   3767       add_srs_wkt (p, 13,
  3772         -        "],AUTHORITY[\"EPSG\",\"20024\"]]");
         3768  +        "ST],AUTHORITY[\"EPSG\",\"20024\"]]");
  3773   3769       p = add_epsg_def_ex (filter, first, last, 20025, "epsg", 20025,
  3774   3770           "Pulkovo 1995 / Gauss-Kruger zone 25", 0, 1,
  3775   3771           "Krassowsky 1940", "Greenwich",
  3776   3772           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3777   3773           "X", "North", "Y", "East");
  3778   3774       add_proj4text (p, 0,
  3779   3775           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=25500000 +y_0=");
  3780   3776       add_proj4text (p, 1,
  3781         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3777  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3782   3778       add_proj4text (p, 2,
  3783         -        ".22 +units=m +no_defs");
         3779  +        "-0.22 +units=m +no_defs");
  3784   3780       add_srs_wkt (p, 0,
  3785   3781           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 25\",GEOGCS[\"");
  3786   3782       add_srs_wkt (p, 1,
  3787   3783           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3788   3784       add_srs_wkt (p, 2,
  3789   3785           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3790   3786       add_srs_wkt (p, 3,
  3791         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3787  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3792   3788       add_srs_wkt (p, 4,
  3793         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3789  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3794   3790       add_srs_wkt (p, 5,
  3795         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3791  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3796   3792       add_srs_wkt (p, 6,
  3797         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3793  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3798   3794       add_srs_wkt (p, 7,
  3799         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3795  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3800   3796       add_srs_wkt (p, 8,
  3801         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3797  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3802   3798       add_srs_wkt (p, 9,
  3803         -        "in\",0],PARAMETER[\"central_meridian\",147],PARAMETER[\"");
         3799  +        "igin\",0],PARAMETER[\"central_meridian\",147],PARAMETER[");
  3804   3800       add_srs_wkt (p, 10,
  3805         -        "scale_factor\",1],PARAMETER[\"false_easting\",25500000],");
         3801  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",25500000");
  3806   3802       add_srs_wkt (p, 11,
  3807         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3803  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3808   3804       add_srs_wkt (p, 12,
  3809         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3805  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3810   3806       add_srs_wkt (p, 13,
  3811         -        "],AUTHORITY[\"EPSG\",\"20025\"]]");
         3807  +        "ST],AUTHORITY[\"EPSG\",\"20025\"]]");
  3812   3808       p = add_epsg_def_ex (filter, first, last, 20026, "epsg", 20026,
  3813   3809           "Pulkovo 1995 / Gauss-Kruger zone 26", 0, 1,
  3814   3810           "Krassowsky 1940", "Greenwich",
  3815   3811           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3816   3812           "X", "North", "Y", "East");
  3817   3813       add_proj4text (p, 0,
  3818   3814           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=26500000 +y_0=");
  3819   3815       add_proj4text (p, 1,
  3820         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3816  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3821   3817       add_proj4text (p, 2,
  3822         -        ".22 +units=m +no_defs");
         3818  +        "-0.22 +units=m +no_defs");
  3823   3819       add_srs_wkt (p, 0,
  3824   3820           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 26\",GEOGCS[\"");
  3825   3821       add_srs_wkt (p, 1,
  3826   3822           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3827   3823       add_srs_wkt (p, 2,
  3828   3824           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3829   3825       add_srs_wkt (p, 3,
  3830         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3826  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3831   3827       add_srs_wkt (p, 4,
  3832         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3828  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3833   3829       add_srs_wkt (p, 5,
  3834         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3830  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3835   3831       add_srs_wkt (p, 6,
  3836         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3832  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3837   3833       add_srs_wkt (p, 7,
  3838         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3834  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3839   3835       add_srs_wkt (p, 8,
  3840         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3836  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3841   3837       add_srs_wkt (p, 9,
  3842         -        "in\",0],PARAMETER[\"central_meridian\",153],PARAMETER[\"");
         3838  +        "igin\",0],PARAMETER[\"central_meridian\",153],PARAMETER[");
  3843   3839       add_srs_wkt (p, 10,
  3844         -        "scale_factor\",1],PARAMETER[\"false_easting\",26500000],");
         3840  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",26500000");
  3845   3841       add_srs_wkt (p, 11,
  3846         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3842  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3847   3843       add_srs_wkt (p, 12,
  3848         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3844  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3849   3845       add_srs_wkt (p, 13,
  3850         -        "],AUTHORITY[\"EPSG\",\"20026\"]]");
         3846  +        "ST],AUTHORITY[\"EPSG\",\"20026\"]]");
  3851   3847       p = add_epsg_def_ex (filter, first, last, 20027, "epsg", 20027,
  3852   3848           "Pulkovo 1995 / Gauss-Kruger zone 27", 0, 1,
  3853   3849           "Krassowsky 1940", "Greenwich",
  3854   3850           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3855   3851           "X", "North", "Y", "East");
  3856   3852       add_proj4text (p, 0,
  3857   3853           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=27500000 +y_0=");
  3858   3854       add_proj4text (p, 1,
  3859         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3855  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3860   3856       add_proj4text (p, 2,
  3861         -        ".22 +units=m +no_defs");
         3857  +        "-0.22 +units=m +no_defs");
  3862   3858       add_srs_wkt (p, 0,
  3863   3859           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 27\",GEOGCS[\"");
  3864   3860       add_srs_wkt (p, 1,
  3865   3861           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3866   3862       add_srs_wkt (p, 2,
  3867   3863           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3868   3864       add_srs_wkt (p, 3,
  3869         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3865  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3870   3866       add_srs_wkt (p, 4,
  3871         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3867  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3872   3868       add_srs_wkt (p, 5,
  3873         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3869  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3874   3870       add_srs_wkt (p, 6,
  3875         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3871  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3876   3872       add_srs_wkt (p, 7,
  3877         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3873  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3878   3874       add_srs_wkt (p, 8,
  3879         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3875  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3880   3876       add_srs_wkt (p, 9,
  3881         -        "in\",0],PARAMETER[\"central_meridian\",159],PARAMETER[\"");
         3877  +        "igin\",0],PARAMETER[\"central_meridian\",159],PARAMETER[");
  3882   3878       add_srs_wkt (p, 10,
  3883         -        "scale_factor\",1],PARAMETER[\"false_easting\",27500000],");
         3879  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",27500000");
  3884   3880       add_srs_wkt (p, 11,
  3885         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3881  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3886   3882       add_srs_wkt (p, 12,
  3887         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3883  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3888   3884       add_srs_wkt (p, 13,
  3889         -        "],AUTHORITY[\"EPSG\",\"20027\"]]");
         3885  +        "ST],AUTHORITY[\"EPSG\",\"20027\"]]");
  3890   3886       p = add_epsg_def_ex (filter, first, last, 20028, "epsg", 20028,
  3891   3887           "Pulkovo 1995 / Gauss-Kruger zone 28", 0, 1,
  3892   3888           "Krassowsky 1940", "Greenwich",
  3893   3889           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3894   3890           "X", "North", "Y", "East");
  3895   3891       add_proj4text (p, 0,
  3896   3892           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=28500000 +y_0=");
  3897   3893       add_proj4text (p, 1,
  3898         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3894  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3899   3895       add_proj4text (p, 2,
  3900         -        ".22 +units=m +no_defs");
         3896  +        "-0.22 +units=m +no_defs");
  3901   3897       add_srs_wkt (p, 0,
  3902   3898           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 28\",GEOGCS[\"");
  3903   3899       add_srs_wkt (p, 1,
  3904   3900           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3905   3901       add_srs_wkt (p, 2,
  3906   3902           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3907   3903       add_srs_wkt (p, 3,
  3908         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3904  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3909   3905       add_srs_wkt (p, 4,
  3910         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3906  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3911   3907       add_srs_wkt (p, 5,
  3912         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3908  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3913   3909       add_srs_wkt (p, 6,
  3914         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3910  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3915   3911       add_srs_wkt (p, 7,
  3916         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3912  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3917   3913       add_srs_wkt (p, 8,
  3918         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3914  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3919   3915       add_srs_wkt (p, 9,
  3920         -        "in\",0],PARAMETER[\"central_meridian\",165],PARAMETER[\"");
         3916  +        "igin\",0],PARAMETER[\"central_meridian\",165],PARAMETER[");
  3921   3917       add_srs_wkt (p, 10,
  3922         -        "scale_factor\",1],PARAMETER[\"false_easting\",28500000],");
         3918  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",28500000");
  3923   3919       add_srs_wkt (p, 11,
  3924         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3920  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3925   3921       add_srs_wkt (p, 12,
  3926         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3922  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3927   3923       add_srs_wkt (p, 13,
  3928         -        "],AUTHORITY[\"EPSG\",\"20028\"]]");
         3924  +        "ST],AUTHORITY[\"EPSG\",\"20028\"]]");
  3929   3925       p = add_epsg_def_ex (filter, first, last, 20029, "epsg", 20029,
  3930   3926           "Pulkovo 1995 / Gauss-Kruger zone 29", 0, 1,
  3931   3927           "Krassowsky 1940", "Greenwich",
  3932   3928           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3933   3929           "X", "North", "Y", "East");
  3934   3930       add_proj4text (p, 0,
  3935   3931           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=29500000 +y_0=");
  3936   3932       add_proj4text (p, 1,
  3937         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3933  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3938   3934       add_proj4text (p, 2,
  3939         -        ".22 +units=m +no_defs");
         3935  +        "-0.22 +units=m +no_defs");
  3940   3936       add_srs_wkt (p, 0,
  3941   3937           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 29\",GEOGCS[\"");
  3942   3938       add_srs_wkt (p, 1,
  3943   3939           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3944   3940       add_srs_wkt (p, 2,
  3945   3941           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3946   3942       add_srs_wkt (p, 3,
  3947         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3943  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3948   3944       add_srs_wkt (p, 4,
  3949         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3945  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3950   3946       add_srs_wkt (p, 5,
  3951         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3947  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3952   3948       add_srs_wkt (p, 6,
  3953         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3949  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3954   3950       add_srs_wkt (p, 7,
  3955         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3951  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3956   3952       add_srs_wkt (p, 8,
  3957         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3953  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3958   3954       add_srs_wkt (p, 9,
  3959         -        "in\",0],PARAMETER[\"central_meridian\",171],PARAMETER[\"");
         3955  +        "igin\",0],PARAMETER[\"central_meridian\",171],PARAMETER[");
  3960   3956       add_srs_wkt (p, 10,
  3961         -        "scale_factor\",1],PARAMETER[\"false_easting\",29500000],");
         3957  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",29500000");
  3962   3958       add_srs_wkt (p, 11,
  3963         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3959  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3964   3960       add_srs_wkt (p, 12,
  3965         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         3961  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3966   3962       add_srs_wkt (p, 13,
  3967         -        "],AUTHORITY[\"EPSG\",\"20029\"]]");
         3963  +        "ST],AUTHORITY[\"EPSG\",\"20029\"]]");
  3968   3964       p = add_epsg_def_ex (filter, first, last, 20030, "epsg", 20030,
  3969   3965           "Pulkovo 1995 / Gauss-Kruger zone 30", 0, 1,
  3970   3966           "Krassowsky 1940", "Greenwich",
  3971   3967           "Pulkovo_1995", "Transverse_Mercator", "metre",
  3972   3968           "X", "North", "Y", "East");
  3973   3969       add_proj4text (p, 0,
  3974   3970           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=30500000 +y_0=");
  3975   3971       add_proj4text (p, 1,
  3976         -        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0");
         3972  +        "0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,");
  3977   3973       add_proj4text (p, 2,
  3978         -        ".22 +units=m +no_defs");
         3974  +        "-0.22 +units=m +no_defs");
  3979   3975       add_srs_wkt (p, 0,
  3980   3976           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 30\",GEOGCS[\"");
  3981   3977       add_srs_wkt (p, 1,
  3982   3978           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  3983   3979       add_srs_wkt (p, 2,
  3984   3980           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3985   3981       add_srs_wkt (p, 3,
  3986         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         3982  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  3987   3983       add_srs_wkt (p, 4,
  3988         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         3984  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3989   3985       add_srs_wkt (p, 5,
  3990         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         3986  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3991   3987       add_srs_wkt (p, 6,
  3992         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         3988  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3993   3989       add_srs_wkt (p, 7,
  3994         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         3990  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  3995   3991       add_srs_wkt (p, 8,
  3996         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         3992  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3997   3993       add_srs_wkt (p, 9,
  3998         -        "in\",0],PARAMETER[\"central_meridian\",177],PARAMETER[\"");
         3994  +        "igin\",0],PARAMETER[\"central_meridian\",177],PARAMETER[");
  3999   3995       add_srs_wkt (p, 10,
  4000         -        "scale_factor\",1],PARAMETER[\"false_easting\",30500000],");
         3996  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",30500000");
  4001   3997       add_srs_wkt (p, 11,
  4002         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         3998  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  4003   3999       add_srs_wkt (p, 12,
  4004         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         4000  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  4005   4001       add_srs_wkt (p, 13,
  4006         -        "],AUTHORITY[\"EPSG\",\"20030\"]]");
         4002  +        "ST],AUTHORITY[\"EPSG\",\"20030\"]]");
  4007   4003       p = add_epsg_def_ex (filter, first, last, 20031, "epsg", 20031,
  4008   4004           "Pulkovo 1995 / Gauss-Kruger zone 31", 0, 1,
  4009   4005           "Krassowsky 1940", "Greenwich",
  4010   4006           "Pulkovo_1995", "Transverse_Mercator", "metre",
  4011   4007           "X", "North", "Y", "East");
  4012   4008       add_proj4text (p, 0,
  4013   4009           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=31500000 +y_0");
  4014   4010       add_proj4text (p, 1,
  4015         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
         4011  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
  4016   4012       add_proj4text (p, 2,
  4017         -        "0.22 +units=m +no_defs");
         4013  +        ",-0.22 +units=m +no_defs");
  4018   4014       add_srs_wkt (p, 0,
  4019   4015           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 31\",GEOGCS[\"");
  4020   4016       add_srs_wkt (p, 1,
  4021   4017           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
  4022   4018       add_srs_wkt (p, 2,
  4023   4019           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  4024   4020       add_srs_wkt (p, 3,
  4025         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
         4021  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
  4026   4022       add_srs_wkt (p, 4,
  4027         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
         4023  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  4028   4024       add_srs_wkt (p, 5,
  4029         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
         4025  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  4030   4026       add_srs_wkt (p, 6,
  4031         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
         4027  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  4032   4028       add_srs_wkt (p, 7,
  4033         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
         4029  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
  4034   4030       add_srs_wkt (p, 8,
  4035         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
         4031  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  4036   4032       add_srs_wkt (p, 9,
  4037         -        "in\",0],PARAMETER[\"central_meridian\",-177],PARAMETER[\"");
         4033  +        "igin\",0],PARAMETER[\"central_meridian\",-177],PARAMETER");
  4038   4034       add_srs_wkt (p, 10,
  4039         -        "scale_factor\",1],PARAMETER[\"false_easting\",31500000],");
         4035  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",3150000");
  4040   4036       add_srs_wkt (p, 11,
  4041         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
         4037  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  4042   4038       add_srs_wkt (p, 12,
  4043         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
         4039  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
  4044   4040       add_srs_wkt (p, 13,
  4045         -        "],AUTHORITY[\"EPSG\",\"20031\"]]");
         4041  +        "AST],AUTHORITY[\"EPSG\",\"20031\"]]");
  4046   4042   }
  4047   4043   
  4048   4044   #endif /* full EPSG initialization enabled/disabled */
  4049   4045   

Changes to src/srsinit/epsg_inlined_34.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "Pulkovo 1995 / Gauss-Kruger zone 32", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Pulkovo_1995", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=32500000 +y_0");
    64     64       add_proj4text (p, 1,
    65         -        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-");
           65  +        "=0 +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13");
    66     66       add_proj4text (p, 2,
    67         -        "0.22 +units=m +no_defs");
           67  +        ",-0.22 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger zone 32\",GEOGCS[\"");
    70     70       add_srs_wkt (p, 1,
    71     71           "Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"Krassow");
    72     72       add_srs_wkt (p, 2,
    73     73           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
    74     74       add_srs_wkt (p, 3,
    75         -        "OWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHORITY[\"");
    76         -    add_srs_wkt (p, 4,
    77         -        "EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
    78         -    add_srs_wkt (p, 5,
    79         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
    80         -    add_srs_wkt (p, 6,
    81         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
    82         -    add_srs_wkt (p, 7,
    83         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJECTI");
    84         -    add_srs_wkt (p, 8,
    85         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
    86         -    add_srs_wkt (p, 9,
    87         -        "in\",0],PARAMETER[\"central_meridian\",-171],PARAMETER[\"");
    88         -    add_srs_wkt (p, 10,
    89         -        "scale_factor\",1],PARAMETER[\"false_easting\",32500000],");
    90         -    add_srs_wkt (p, 11,
    91         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
    92         -    add_srs_wkt (p, 12,
    93         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
    94         -    add_srs_wkt (p, 13,
    95         -        "],AUTHORITY[\"EPSG\",\"20032\"]]");
           75  +        "OWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUTHORITY[");
           76  +    add_srs_wkt (p, 4,
           77  +        "\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
           78  +    add_srs_wkt (p, 5,
           79  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
           80  +    add_srs_wkt (p, 6,
           81  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
           82  +    add_srs_wkt (p, 7,
           83  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],PROJEC");
           84  +    add_srs_wkt (p, 8,
           85  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
           86  +    add_srs_wkt (p, 9,
           87  +        "igin\",0],PARAMETER[\"central_meridian\",-171],PARAMETER");
           88  +    add_srs_wkt (p, 10,
           89  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",3250000");
           90  +    add_srs_wkt (p, 11,
           91  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
           92  +    add_srs_wkt (p, 12,
           93  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
           94  +    add_srs_wkt (p, 13,
           95  +        "AST],AUTHORITY[\"EPSG\",\"20032\"]]");
    96     96       p = add_epsg_def_ex (filter, first, last, 20064, "epsg", 20064,
    97     97           "Pulkovo 1995 / Gauss-Kruger 4N (deprecated)", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Pulkovo_1995", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
   103    103       add_proj4text (p, 1,
   104         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          104  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   105    105       add_proj4text (p, 2,
   106         -        " +units=m +no_defs");
          106  +        "22 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 4N (deprecated)\",G");
   109    109       add_srs_wkt (p, 1,
   110    110           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   111    111       add_srs_wkt (p, 2,
   112    112           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   113    113       add_srs_wkt (p, 3,
   114         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   115         -    add_srs_wkt (p, 4,
   116         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   117         -    add_srs_wkt (p, 5,
   118         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   119         -    add_srs_wkt (p, 6,
   120         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   121         -    add_srs_wkt (p, 7,
   122         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   123         -    add_srs_wkt (p, 8,
   124         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   125         -    add_srs_wkt (p, 9,
   126         -        "of_origin\",0],PARAMETER[\"central_meridian\",21],PARAME");
   127         -    add_srs_wkt (p, 10,
   128         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   129         -    add_srs_wkt (p, 11,
   130         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   131         -    add_srs_wkt (p, 12,
   132         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   133         -    add_srs_wkt (p, 13,
   134         -        "EAST],AUTHORITY[\"EPSG\",\"20064\"]]");
          114  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          115  +    add_srs_wkt (p, 4,
          116  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          117  +    add_srs_wkt (p, 5,
          118  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          119  +    add_srs_wkt (p, 6,
          120  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          121  +    add_srs_wkt (p, 7,
          122  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          123  +    add_srs_wkt (p, 8,
          124  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          125  +    add_srs_wkt (p, 9,
          126  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
          127  +    add_srs_wkt (p, 10,
          128  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
          129  +    add_srs_wkt (p, 11,
          130  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
          131  +    add_srs_wkt (p, 12,
          132  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          133  +    add_srs_wkt (p, 13,
          134  +        ",EAST],AUTHORITY[\"EPSG\",\"20064\"]]");
   135    135       p = add_epsg_def_ex (filter, first, last, 20065, "epsg", 20065,
   136    136           "Pulkovo 1995 / Gauss-Kruger 5N (deprecated)", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Pulkovo_1995", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
   142    142       add_proj4text (p, 1,
   143         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          143  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   144    144       add_proj4text (p, 2,
   145         -        " +units=m +no_defs");
          145  +        "22 +units=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 5N (deprecated)\",G");
   148    148       add_srs_wkt (p, 1,
   149    149           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   150    150       add_srs_wkt (p, 2,
   151    151           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   152    152       add_srs_wkt (p, 3,
   153         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   154         -    add_srs_wkt (p, 4,
   155         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   156         -    add_srs_wkt (p, 5,
   157         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   158         -    add_srs_wkt (p, 6,
   159         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   160         -    add_srs_wkt (p, 7,
   161         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   162         -    add_srs_wkt (p, 8,
   163         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   164         -    add_srs_wkt (p, 9,
   165         -        "of_origin\",0],PARAMETER[\"central_meridian\",27],PARAME");
   166         -    add_srs_wkt (p, 10,
   167         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   168         -    add_srs_wkt (p, 11,
   169         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   170         -    add_srs_wkt (p, 12,
   171         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   172         -    add_srs_wkt (p, 13,
   173         -        "EAST],AUTHORITY[\"EPSG\",\"20065\"]]");
          153  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          154  +    add_srs_wkt (p, 4,
          155  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          156  +    add_srs_wkt (p, 5,
          157  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          158  +    add_srs_wkt (p, 6,
          159  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          160  +    add_srs_wkt (p, 7,
          161  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          162  +    add_srs_wkt (p, 8,
          163  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          164  +    add_srs_wkt (p, 9,
          165  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
          166  +    add_srs_wkt (p, 10,
          167  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
          168  +    add_srs_wkt (p, 11,
          169  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
          170  +    add_srs_wkt (p, 12,
          171  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          172  +    add_srs_wkt (p, 13,
          173  +        ",EAST],AUTHORITY[\"EPSG\",\"20065\"]]");
   174    174       p = add_epsg_def_ex (filter, first, last, 20066, "epsg", 20066,
   175    175           "Pulkovo 1995 / Gauss-Kruger 6N (deprecated)", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Pulkovo_1995", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
   181    181       add_proj4text (p, 1,
   182         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          182  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   183    183       add_proj4text (p, 2,
   184         -        " +units=m +no_defs");
          184  +        "22 +units=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 6N (deprecated)\",G");
   187    187       add_srs_wkt (p, 1,
   188    188           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   189    189       add_srs_wkt (p, 2,
   190    190           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   191    191       add_srs_wkt (p, 3,
   192         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   193         -    add_srs_wkt (p, 4,
   194         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   195         -    add_srs_wkt (p, 5,
   196         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   197         -    add_srs_wkt (p, 6,
   198         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   199         -    add_srs_wkt (p, 7,
   200         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   201         -    add_srs_wkt (p, 8,
   202         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   203         -    add_srs_wkt (p, 9,
   204         -        "of_origin\",0],PARAMETER[\"central_meridian\",33],PARAME");
   205         -    add_srs_wkt (p, 10,
   206         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   207         -    add_srs_wkt (p, 11,
   208         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   209         -    add_srs_wkt (p, 12,
   210         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   211         -    add_srs_wkt (p, 13,
   212         -        "EAST],AUTHORITY[\"EPSG\",\"20066\"]]");
          192  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          193  +    add_srs_wkt (p, 4,
          194  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          195  +    add_srs_wkt (p, 5,
          196  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          197  +    add_srs_wkt (p, 6,
          198  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          199  +    add_srs_wkt (p, 7,
          200  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          201  +    add_srs_wkt (p, 8,
          202  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          203  +    add_srs_wkt (p, 9,
          204  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",33],PARA");
          205  +    add_srs_wkt (p, 10,
          206  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
          207  +    add_srs_wkt (p, 11,
          208  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
          209  +    add_srs_wkt (p, 12,
          210  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          211  +    add_srs_wkt (p, 13,
          212  +        ",EAST],AUTHORITY[\"EPSG\",\"20066\"]]");
   213    213       p = add_epsg_def_ex (filter, first, last, 20067, "epsg", 20067,
   214    214           "Pulkovo 1995 / Gauss-Kruger 7N (deprecated)", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Pulkovo_1995", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
   220    220       add_proj4text (p, 1,
   221         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          221  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   222    222       add_proj4text (p, 2,
   223         -        " +units=m +no_defs");
          223  +        "22 +units=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 7N (deprecated)\",G");
   226    226       add_srs_wkt (p, 1,
   227    227           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   228    228       add_srs_wkt (p, 2,
   229    229           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   230    230       add_srs_wkt (p, 3,
   231         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   232         -    add_srs_wkt (p, 4,
   233         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   234         -    add_srs_wkt (p, 5,
   235         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   236         -    add_srs_wkt (p, 6,
   237         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   238         -    add_srs_wkt (p, 7,
   239         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   240         -    add_srs_wkt (p, 8,
   241         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   242         -    add_srs_wkt (p, 9,
   243         -        "of_origin\",0],PARAMETER[\"central_meridian\",39],PARAME");
   244         -    add_srs_wkt (p, 10,
   245         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   246         -    add_srs_wkt (p, 11,
   247         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   248         -    add_srs_wkt (p, 12,
   249         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   250         -    add_srs_wkt (p, 13,
   251         -        "EAST],AUTHORITY[\"EPSG\",\"20067\"]]");
          231  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          232  +    add_srs_wkt (p, 4,
          233  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          234  +    add_srs_wkt (p, 5,
          235  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          236  +    add_srs_wkt (p, 6,
          237  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          238  +    add_srs_wkt (p, 7,
          239  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          240  +    add_srs_wkt (p, 8,
          241  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          242  +    add_srs_wkt (p, 9,
          243  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",39],PARA");
          244  +    add_srs_wkt (p, 10,
          245  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
          246  +    add_srs_wkt (p, 11,
          247  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
          248  +    add_srs_wkt (p, 12,
          249  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          250  +    add_srs_wkt (p, 13,
          251  +        ",EAST],AUTHORITY[\"EPSG\",\"20067\"]]");
   252    252       p = add_epsg_def_ex (filter, first, last, 20068, "epsg", 20068,
   253    253           "Pulkovo 1995 / Gauss-Kruger 8N (deprecated)", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Pulkovo_1995", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
   259    259       add_proj4text (p, 1,
   260         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          260  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   261    261       add_proj4text (p, 2,
   262         -        " +units=m +no_defs");
          262  +        "22 +units=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 8N (deprecated)\",G");
   265    265       add_srs_wkt (p, 1,
   266    266           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   267    267       add_srs_wkt (p, 2,
   268    268           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   269    269       add_srs_wkt (p, 3,
   270         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   271         -    add_srs_wkt (p, 4,
   272         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   273         -    add_srs_wkt (p, 5,
   274         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   275         -    add_srs_wkt (p, 6,
   276         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   277         -    add_srs_wkt (p, 7,
   278         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   279         -    add_srs_wkt (p, 8,
   280         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   281         -    add_srs_wkt (p, 9,
   282         -        "of_origin\",0],PARAMETER[\"central_meridian\",45],PARAME");
   283         -    add_srs_wkt (p, 10,
   284         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   285         -    add_srs_wkt (p, 11,
   286         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   287         -    add_srs_wkt (p, 12,
   288         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   289         -    add_srs_wkt (p, 13,
   290         -        "EAST],AUTHORITY[\"EPSG\",\"20068\"]]");
          270  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
          271  +    add_srs_wkt (p, 4,
          272  +        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
          273  +    add_srs_wkt (p, 5,
          274  +        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
          275  +    add_srs_wkt (p, 6,
          276  +        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
          277  +    add_srs_wkt (p, 7,
          278  +        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
          279  +    add_srs_wkt (p, 8,
          280  +        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
          281  +    add_srs_wkt (p, 9,
          282  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",45],PARA");
          283  +    add_srs_wkt (p, 10,
          284  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
          285  +    add_srs_wkt (p, 11,
          286  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
          287  +    add_srs_wkt (p, 12,
          288  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
          289  +    add_srs_wkt (p, 13,
          290  +        ",EAST],AUTHORITY[\"EPSG\",\"20068\"]]");
   291    291       p = add_epsg_def_ex (filter, first, last, 20069, "epsg", 20069,
   292    292           "Pulkovo 1995 / Gauss-Kruger 9N (deprecated)", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Pulkovo_1995", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
   298    298       add_proj4text (p, 1,
   299         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          299  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   300    300       add_proj4text (p, 2,
   301         -        " +units=m +no_defs");
          301  +        "22 +units=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 9N (deprecated)\",G");
   304    304       add_srs_wkt (p, 1,
   305    305           "EOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[\"");
   306    306       add_srs_wkt (p, 2,
   307    307           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
   308    308       add_srs_wkt (p, 3,
   309         -        "4\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUTHO");
   310         -    add_srs_wkt (p, 4,
   311         -        "RITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
   312         -    add_srs_wkt (p, 5,
   313         -        "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
   314         -    add_srs_wkt (p, 6,
   315         -        ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
   316         -    add_srs_wkt (p, 7,
   317         -        "AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]],P");
   318         -    add_srs_wkt (p, 8,
   319         -        "ROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_");
   320         -    add_srs_wkt (p, 9,
   321         -        "of_origin\",0],PARAMETER[\"central_meridian\",51],PARAME");
   322         -    add_srs_wkt (p, 10,
   323         -        "TER[\"scale_factor\",1],PARAMETER[\"false_easting\",5000");
   324         -    add_srs_wkt (p, 11,
   325         -        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
   326         -    add_srs_wkt (p, 12,
   327         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
   328         -    add_srs_wkt (p, 13,
   329         -        "EAST],AUTHORITY[\"EPSG\",\"20069\"]]");
   330         -    p = add_epsg_def_ex (filter, first, last, 20070, "epsg", 20070,
   331         -        "Pulkovo 1995 / Gauss-Kruger 10N (deprecated)", 0, 1,
   332         -        "Krassowsky 1940", "Greenwich",
   333         -        "Pulkovo_1995", "Transverse_Mercator", "metre",
   334         -        "X", "North", "Y", "East");
   335         -    add_proj4text (p, 0,
   336         -        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
   337         -    add_proj4text (p, 1,
   338         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
   339         -    add_proj4text (p, 2,
   340         -        " +units=m +no_defs");
   341         -    add_srs_wkt (p, 0,
   342         -        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 10N (deprecated)\",");
   343         -    add_srs_wkt (p, 1,
   344         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   345         -    add_srs_wkt (p, 2,
   346         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   347         -    add_srs_wkt (p, 3,
   348         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
          309  +        "4\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],AUT");
   349    310       add_srs_wkt (p, 4,
   350    311           "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   351    312       add_srs_wkt (p, 5,
   352    313           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   353    314       add_srs_wkt (p, 6,
   354    315           "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   355    316       add_srs_wkt (p, 7,
   356    317           "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   357    318       add_srs_wkt (p, 8,
   358    319           ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   359    320       add_srs_wkt (p, 9,
   360         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",57],PARA");
          321  +        "e_of_origin\",0],PARAMETER[\"central_meridian\",51],PARA");
   361    322       add_srs_wkt (p, 10,
   362    323           "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   363    324       add_srs_wkt (p, 11,
   364    325           "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   365    326       add_srs_wkt (p, 12,
   366    327           "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   367    328       add_srs_wkt (p, 13,
   368         -        ",EAST],AUTHORITY[\"EPSG\",\"20070\"]]");
          329  +        ",EAST],AUTHORITY[\"EPSG\",\"20069\"]]");
          330  +    p = add_epsg_def_ex (filter, first, last, 20070, "epsg", 20070,
          331  +        "Pulkovo 1995 / Gauss-Kruger 10N (deprecated)", 0, 1,
          332  +        "Krassowsky 1940", "Greenwich",
          333  +        "Pulkovo_1995", "Transverse_Mercator", "metre",
          334  +        "X", "North", "Y", "East");
          335  +    add_proj4text (p, 0,
          336  +        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
          337  +    add_proj4text (p, 1,
          338  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
          339  +    add_proj4text (p, 2,
          340  +        "22 +units=m +no_defs");
          341  +    add_srs_wkt (p, 0,
          342  +        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 10N (deprecated)\",");
          343  +    add_srs_wkt (p, 1,
          344  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          345  +    add_srs_wkt (p, 2,
          346  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          347  +    add_srs_wkt (p, 3,
          348  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          349  +    add_srs_wkt (p, 4,
          350  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          351  +    add_srs_wkt (p, 5,
          352  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          353  +    add_srs_wkt (p, 6,
          354  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          355  +    add_srs_wkt (p, 7,
          356  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          357  +    add_srs_wkt (p, 8,
          358  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          359  +    add_srs_wkt (p, 9,
          360  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",57],PA");
          361  +    add_srs_wkt (p, 10,
          362  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          363  +    add_srs_wkt (p, 11,
          364  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          365  +    add_srs_wkt (p, 12,
          366  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          367  +    add_srs_wkt (p, 13,
          368  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20070\"]]");
   369    369       p = add_epsg_def_ex (filter, first, last, 20071, "epsg", 20071,
   370    370           "Pulkovo 1995 / Gauss-Kruger 11N (deprecated)", 0, 1,
   371    371           "Krassowsky 1940", "Greenwich",
   372    372           "Pulkovo_1995", "Transverse_Mercator", "metre",
   373    373           "X", "North", "Y", "East");
   374    374       add_proj4text (p, 0,
   375    375           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
   376    376       add_proj4text (p, 1,
   377         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          377  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   378    378       add_proj4text (p, 2,
   379         -        " +units=m +no_defs");
          379  +        "22 +units=m +no_defs");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 11N (deprecated)\",");
   382    382       add_srs_wkt (p, 1,
   383    383           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   384    384       add_srs_wkt (p, 2,
   385    385           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   386    386       add_srs_wkt (p, 3,
   387         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   388         -    add_srs_wkt (p, 4,
   389         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   390         -    add_srs_wkt (p, 5,
   391         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   392         -    add_srs_wkt (p, 6,
   393         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   394         -    add_srs_wkt (p, 7,
   395         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   396         -    add_srs_wkt (p, 8,
   397         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   398         -    add_srs_wkt (p, 9,
   399         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",63],PARA");
   400         -    add_srs_wkt (p, 10,
   401         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   402         -    add_srs_wkt (p, 11,
   403         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   404         -    add_srs_wkt (p, 12,
   405         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   406         -    add_srs_wkt (p, 13,
   407         -        ",EAST],AUTHORITY[\"EPSG\",\"20071\"]]");
          387  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          388  +    add_srs_wkt (p, 4,
          389  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          390  +    add_srs_wkt (p, 5,
          391  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          392  +    add_srs_wkt (p, 6,
          393  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          394  +    add_srs_wkt (p, 7,
          395  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          396  +    add_srs_wkt (p, 8,
          397  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          398  +    add_srs_wkt (p, 9,
          399  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",63],PA");
          400  +    add_srs_wkt (p, 10,
          401  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          402  +    add_srs_wkt (p, 11,
          403  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          404  +    add_srs_wkt (p, 12,
          405  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          406  +    add_srs_wkt (p, 13,
          407  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20071\"]]");
   408    408       p = add_epsg_def_ex (filter, first, last, 20072, "epsg", 20072,
   409    409           "Pulkovo 1995 / Gauss-Kruger 12N (deprecated)", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Pulkovo_1995", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
   415    415       add_proj4text (p, 1,
   416         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          416  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   417    417       add_proj4text (p, 2,
   418         -        " +units=m +no_defs");
          418  +        "22 +units=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 12N (deprecated)\",");
   421    421       add_srs_wkt (p, 1,
   422    422           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   423    423       add_srs_wkt (p, 2,
   424    424           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   425    425       add_srs_wkt (p, 3,
   426         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   427         -    add_srs_wkt (p, 4,
   428         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   429         -    add_srs_wkt (p, 5,
   430         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   431         -    add_srs_wkt (p, 6,
   432         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   433         -    add_srs_wkt (p, 7,
   434         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   435         -    add_srs_wkt (p, 8,
   436         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   437         -    add_srs_wkt (p, 9,
   438         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",69],PARA");
   439         -    add_srs_wkt (p, 10,
   440         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   441         -    add_srs_wkt (p, 11,
   442         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   443         -    add_srs_wkt (p, 12,
   444         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   445         -    add_srs_wkt (p, 13,
   446         -        ",EAST],AUTHORITY[\"EPSG\",\"20072\"]]");
          426  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          427  +    add_srs_wkt (p, 4,
          428  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          429  +    add_srs_wkt (p, 5,
          430  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          431  +    add_srs_wkt (p, 6,
          432  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          433  +    add_srs_wkt (p, 7,
          434  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          435  +    add_srs_wkt (p, 8,
          436  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          437  +    add_srs_wkt (p, 9,
          438  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",69],PA");
          439  +    add_srs_wkt (p, 10,
          440  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          441  +    add_srs_wkt (p, 11,
          442  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          443  +    add_srs_wkt (p, 12,
          444  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          445  +    add_srs_wkt (p, 13,
          446  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20072\"]]");
   447    447       p = add_epsg_def_ex (filter, first, last, 20073, "epsg", 20073,
   448    448           "Pulkovo 1995 / Gauss-Kruger 13N (deprecated)", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Pulkovo_1995", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
   454    454       add_proj4text (p, 1,
   455         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          455  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   456    456       add_proj4text (p, 2,
   457         -        " +units=m +no_defs");
          457  +        "22 +units=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 13N (deprecated)\",");
   460    460       add_srs_wkt (p, 1,
   461    461           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   462    462       add_srs_wkt (p, 2,
   463    463           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   464    464       add_srs_wkt (p, 3,
   465         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   466         -    add_srs_wkt (p, 4,
   467         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   468         -    add_srs_wkt (p, 5,
   469         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   470         -    add_srs_wkt (p, 6,
   471         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   472         -    add_srs_wkt (p, 7,
   473         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   474         -    add_srs_wkt (p, 8,
   475         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   476         -    add_srs_wkt (p, 9,
   477         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",75],PARA");
   478         -    add_srs_wkt (p, 10,
   479         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   480         -    add_srs_wkt (p, 11,
   481         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   482         -    add_srs_wkt (p, 12,
   483         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   484         -    add_srs_wkt (p, 13,
   485         -        ",EAST],AUTHORITY[\"EPSG\",\"20073\"]]");
          465  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          466  +    add_srs_wkt (p, 4,
          467  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          468  +    add_srs_wkt (p, 5,
          469  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          470  +    add_srs_wkt (p, 6,
          471  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          472  +    add_srs_wkt (p, 7,
          473  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          474  +    add_srs_wkt (p, 8,
          475  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          476  +    add_srs_wkt (p, 9,
          477  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",75],PA");
          478  +    add_srs_wkt (p, 10,
          479  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          480  +    add_srs_wkt (p, 11,
          481  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          482  +    add_srs_wkt (p, 12,
          483  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          484  +    add_srs_wkt (p, 13,
          485  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20073\"]]");
   486    486       p = add_epsg_def_ex (filter, first, last, 20074, "epsg", 20074,
   487    487           "Pulkovo 1995 / Gauss-Kruger 14N (deprecated)", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Pulkovo_1995", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
   493    493       add_proj4text (p, 1,
   494         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          494  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   495    495       add_proj4text (p, 2,
   496         -        " +units=m +no_defs");
          496  +        "22 +units=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 14N (deprecated)\",");
   499    499       add_srs_wkt (p, 1,
   500    500           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   501    501       add_srs_wkt (p, 2,
   502    502           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   503    503       add_srs_wkt (p, 3,
   504         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   505         -    add_srs_wkt (p, 4,
   506         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   507         -    add_srs_wkt (p, 5,
   508         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   509         -    add_srs_wkt (p, 6,
   510         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   511         -    add_srs_wkt (p, 7,
   512         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   513         -    add_srs_wkt (p, 8,
   514         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   515         -    add_srs_wkt (p, 9,
   516         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",81],PARA");
   517         -    add_srs_wkt (p, 10,
   518         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   519         -    add_srs_wkt (p, 11,
   520         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   521         -    add_srs_wkt (p, 12,
   522         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   523         -    add_srs_wkt (p, 13,
   524         -        ",EAST],AUTHORITY[\"EPSG\",\"20074\"]]");
          504  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          505  +    add_srs_wkt (p, 4,
          506  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          507  +    add_srs_wkt (p, 5,
          508  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          509  +    add_srs_wkt (p, 6,
          510  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          511  +    add_srs_wkt (p, 7,
          512  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          513  +    add_srs_wkt (p, 8,
          514  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          515  +    add_srs_wkt (p, 9,
          516  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",81],PA");
          517  +    add_srs_wkt (p, 10,
          518  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          519  +    add_srs_wkt (p, 11,
          520  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          521  +    add_srs_wkt (p, 12,
          522  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          523  +    add_srs_wkt (p, 13,
          524  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20074\"]]");
   525    525       p = add_epsg_def_ex (filter, first, last, 20075, "epsg", 20075,
   526    526           "Pulkovo 1995 / Gauss-Kruger 15N (deprecated)", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Pulkovo_1995", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
   532    532       add_proj4text (p, 1,
   533         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
   534         -    add_proj4text (p, 2,
   535         -        " +units=m +no_defs");
   536         -    add_srs_wkt (p, 0,
   537         -        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 15N (deprecated)\",");
   538         -    add_srs_wkt (p, 1,
   539         -        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   540         -    add_srs_wkt (p, 2,
   541         -        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   542         -    add_srs_wkt (p, 3,
   543         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   544         -    add_srs_wkt (p, 4,
   545         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   546         -    add_srs_wkt (p, 5,
   547         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   548         -    add_srs_wkt (p, 6,
   549         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   550         -    add_srs_wkt (p, 7,
   551         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   552         -    add_srs_wkt (p, 8,
   553         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   554         -    add_srs_wkt (p, 9,
   555         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",87],PARA");
   556         -    add_srs_wkt (p, 10,
   557         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   558         -    add_srs_wkt (p, 11,
   559         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   560         -    add_srs_wkt (p, 12,
   561         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   562         -    add_srs_wkt (p, 13,
   563         -        ",EAST],AUTHORITY[\"EPSG\",\"20075\"]]");
          533  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
          534  +    add_proj4text (p, 2,
          535  +        "22 +units=m +no_defs");
          536  +    add_srs_wkt (p, 0,
          537  +        "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 15N (deprecated)\",");
          538  +    add_srs_wkt (p, 1,
          539  +        "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
          540  +    add_srs_wkt (p, 2,
          541  +        "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
          542  +    add_srs_wkt (p, 3,
          543  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          544  +    add_srs_wkt (p, 4,
          545  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          546  +    add_srs_wkt (p, 5,
          547  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          548  +    add_srs_wkt (p, 6,
          549  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          550  +    add_srs_wkt (p, 7,
          551  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          552  +    add_srs_wkt (p, 8,
          553  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          554  +    add_srs_wkt (p, 9,
          555  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",87],PA");
          556  +    add_srs_wkt (p, 10,
          557  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          558  +    add_srs_wkt (p, 11,
          559  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          560  +    add_srs_wkt (p, 12,
          561  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          562  +    add_srs_wkt (p, 13,
          563  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20075\"]]");
   564    564       p = add_epsg_def_ex (filter, first, last, 20076, "epsg", 20076,
   565    565           "Pulkovo 1995 / Gauss-Kruger 16N (deprecated)", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Pulkovo_1995", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
   571    571       add_proj4text (p, 1,
   572         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          572  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   573    573       add_proj4text (p, 2,
   574         -        " +units=m +no_defs");
          574  +        "22 +units=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 16N (deprecated)\",");
   577    577       add_srs_wkt (p, 1,
   578    578           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   579    579       add_srs_wkt (p, 2,
   580    580           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   581    581       add_srs_wkt (p, 3,
   582         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   583         -    add_srs_wkt (p, 4,
   584         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   585         -    add_srs_wkt (p, 5,
   586         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   587         -    add_srs_wkt (p, 6,
   588         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   589         -    add_srs_wkt (p, 7,
   590         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   591         -    add_srs_wkt (p, 8,
   592         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   593         -    add_srs_wkt (p, 9,
   594         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",93],PARA");
   595         -    add_srs_wkt (p, 10,
   596         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   597         -    add_srs_wkt (p, 11,
   598         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   599         -    add_srs_wkt (p, 12,
   600         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   601         -    add_srs_wkt (p, 13,
   602         -        ",EAST],AUTHORITY[\"EPSG\",\"20076\"]]");
          582  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          583  +    add_srs_wkt (p, 4,
          584  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          585  +    add_srs_wkt (p, 5,
          586  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          587  +    add_srs_wkt (p, 6,
          588  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          589  +    add_srs_wkt (p, 7,
          590  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          591  +    add_srs_wkt (p, 8,
          592  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          593  +    add_srs_wkt (p, 9,
          594  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",93],PA");
          595  +    add_srs_wkt (p, 10,
          596  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          597  +    add_srs_wkt (p, 11,
          598  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          599  +    add_srs_wkt (p, 12,
          600  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          601  +    add_srs_wkt (p, 13,
          602  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20076\"]]");
   603    603       p = add_epsg_def_ex (filter, first, last, 20077, "epsg", 20077,
   604    604           "Pulkovo 1995 / Gauss-Kruger 17N (deprecated)", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Pulkovo_1995", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
   610    610       add_proj4text (p, 1,
   611         -        "ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22");
          611  +        "ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0.");
   612    612       add_proj4text (p, 2,
   613         -        " +units=m +no_defs");
          613  +        "22 +units=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 17N (deprecated)\",");
   616    616       add_srs_wkt (p, 1,
   617    617           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   618    618       add_srs_wkt (p, 2,
   619    619           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   620    620       add_srs_wkt (p, 3,
   621         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   622         -    add_srs_wkt (p, 4,
   623         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   624         -    add_srs_wkt (p, 5,
   625         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   626         -    add_srs_wkt (p, 6,
   627         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   628         -    add_srs_wkt (p, 7,
   629         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   630         -    add_srs_wkt (p, 8,
   631         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   632         -    add_srs_wkt (p, 9,
   633         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",99],PARA");
   634         -    add_srs_wkt (p, 10,
   635         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
   636         -    add_srs_wkt (p, 11,
   637         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
   638         -    add_srs_wkt (p, 12,
   639         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
   640         -    add_srs_wkt (p, 13,
   641         -        ",EAST],AUTHORITY[\"EPSG\",\"20077\"]]");
          621  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          622  +    add_srs_wkt (p, 4,
          623  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          624  +    add_srs_wkt (p, 5,
          625  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          626  +    add_srs_wkt (p, 6,
          627  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          628  +    add_srs_wkt (p, 7,
          629  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          630  +    add_srs_wkt (p, 8,
          631  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          632  +    add_srs_wkt (p, 9,
          633  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",99],PA");
          634  +    add_srs_wkt (p, 10,
          635  +        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
          636  +    add_srs_wkt (p, 11,
          637  +        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
          638  +    add_srs_wkt (p, 12,
          639  +        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          640  +    add_srs_wkt (p, 13,
          641  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20077\"]]");
   642    642       p = add_epsg_def_ex (filter, first, last, 20078, "epsg", 20078,
   643    643           "Pulkovo 1995 / Gauss-Kruger 18N (deprecated)", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Pulkovo_1995", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
   649    649       add_proj4text (p, 1,
   650         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          650  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   651    651       add_proj4text (p, 2,
   652         -        "2 +units=m +no_defs");
          652  +        ".22 +units=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 18N (deprecated)\",");
   655    655       add_srs_wkt (p, 1,
   656    656           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   657    657       add_srs_wkt (p, 2,
   658    658           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   659    659       add_srs_wkt (p, 3,
   660         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   661         -    add_srs_wkt (p, 4,
   662         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   663         -    add_srs_wkt (p, 5,
   664         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   665         -    add_srs_wkt (p, 6,
   666         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   667         -    add_srs_wkt (p, 7,
   668         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   669         -    add_srs_wkt (p, 8,
   670         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   671         -    add_srs_wkt (p, 9,
   672         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",105],PAR");
   673         -    add_srs_wkt (p, 10,
   674         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   675         -    add_srs_wkt (p, 11,
   676         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   677         -    add_srs_wkt (p, 12,
   678         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   679         -    add_srs_wkt (p, 13,
   680         -        "\",EAST],AUTHORITY[\"EPSG\",\"20078\"]]");
          660  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          661  +    add_srs_wkt (p, 4,
          662  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          663  +    add_srs_wkt (p, 5,
          664  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          665  +    add_srs_wkt (p, 6,
          666  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          667  +    add_srs_wkt (p, 7,
          668  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          669  +    add_srs_wkt (p, 8,
          670  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          671  +    add_srs_wkt (p, 9,
          672  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
          673  +    add_srs_wkt (p, 10,
          674  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          675  +    add_srs_wkt (p, 11,
          676  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          677  +    add_srs_wkt (p, 12,
          678  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          679  +    add_srs_wkt (p, 13,
          680  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20078\"]]");
   681    681       p = add_epsg_def_ex (filter, first, last, 20079, "epsg", 20079,
   682    682           "Pulkovo 1995 / Gauss-Kruger 19N (deprecated)", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Pulkovo_1995", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
   688    688       add_proj4text (p, 1,
   689         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          689  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   690    690       add_proj4text (p, 2,
   691         -        "2 +units=m +no_defs");
          691  +        ".22 +units=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 19N (deprecated)\",");
   694    694       add_srs_wkt (p, 1,
   695    695           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   696    696       add_srs_wkt (p, 2,
   697    697           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   698    698       add_srs_wkt (p, 3,
   699         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   700         -    add_srs_wkt (p, 4,
   701         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   702         -    add_srs_wkt (p, 5,
   703         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   704         -    add_srs_wkt (p, 6,
   705         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   706         -    add_srs_wkt (p, 7,
   707         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   708         -    add_srs_wkt (p, 8,
   709         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   710         -    add_srs_wkt (p, 9,
   711         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",111],PAR");
   712         -    add_srs_wkt (p, 10,
   713         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   714         -    add_srs_wkt (p, 11,
   715         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   716         -    add_srs_wkt (p, 12,
   717         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   718         -    add_srs_wkt (p, 13,
   719         -        "\",EAST],AUTHORITY[\"EPSG\",\"20079\"]]");
          699  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          700  +    add_srs_wkt (p, 4,
          701  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          702  +    add_srs_wkt (p, 5,
          703  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          704  +    add_srs_wkt (p, 6,
          705  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          706  +    add_srs_wkt (p, 7,
          707  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          708  +    add_srs_wkt (p, 8,
          709  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          710  +    add_srs_wkt (p, 9,
          711  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
          712  +    add_srs_wkt (p, 10,
          713  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          714  +    add_srs_wkt (p, 11,
          715  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          716  +    add_srs_wkt (p, 12,
          717  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          718  +    add_srs_wkt (p, 13,
          719  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20079\"]]");
   720    720       p = add_epsg_def_ex (filter, first, last, 20080, "epsg", 20080,
   721    721           "Pulkovo 1995 / Gauss-Kruger 20N (deprecated)", 0, 1,
   722    722           "Krassowsky 1940", "Greenwich",
   723    723           "Pulkovo_1995", "Transverse_Mercator", "metre",
   724    724           "X", "North", "Y", "East");
   725    725       add_proj4text (p, 0,
   726    726           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
   727    727       add_proj4text (p, 1,
   728         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          728  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   729    729       add_proj4text (p, 2,
   730         -        "2 +units=m +no_defs");
          730  +        ".22 +units=m +no_defs");
   731    731       add_srs_wkt (p, 0,
   732    732           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 20N (deprecated)\",");
   733    733       add_srs_wkt (p, 1,
   734    734           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   735    735       add_srs_wkt (p, 2,
   736    736           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   737    737       add_srs_wkt (p, 3,
   738         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   739         -    add_srs_wkt (p, 4,
   740         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   741         -    add_srs_wkt (p, 5,
   742         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   743         -    add_srs_wkt (p, 6,
   744         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   745         -    add_srs_wkt (p, 7,
   746         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   747         -    add_srs_wkt (p, 8,
   748         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   749         -    add_srs_wkt (p, 9,
   750         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",117],PAR");
   751         -    add_srs_wkt (p, 10,
   752         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   753         -    add_srs_wkt (p, 11,
   754         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   755         -    add_srs_wkt (p, 12,
   756         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   757         -    add_srs_wkt (p, 13,
   758         -        "\",EAST],AUTHORITY[\"EPSG\",\"20080\"]]");
          738  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          739  +    add_srs_wkt (p, 4,
          740  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          741  +    add_srs_wkt (p, 5,
          742  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          743  +    add_srs_wkt (p, 6,
          744  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          745  +    add_srs_wkt (p, 7,
          746  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          747  +    add_srs_wkt (p, 8,
          748  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          749  +    add_srs_wkt (p, 9,
          750  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
          751  +    add_srs_wkt (p, 10,
          752  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          753  +    add_srs_wkt (p, 11,
          754  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          755  +    add_srs_wkt (p, 12,
          756  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          757  +    add_srs_wkt (p, 13,
          758  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20080\"]]");
   759    759       p = add_epsg_def_ex (filter, first, last, 20081, "epsg", 20081,
   760    760           "Pulkovo 1995 / Gauss-Kruger 21N (deprecated)", 0, 1,
   761    761           "Krassowsky 1940", "Greenwich",
   762    762           "Pulkovo_1995", "Transverse_Mercator", "metre",
   763    763           "X", "North", "Y", "East");
   764    764       add_proj4text (p, 0,
   765    765           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
   766    766       add_proj4text (p, 1,
   767         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          767  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   768    768       add_proj4text (p, 2,
   769         -        "2 +units=m +no_defs");
          769  +        ".22 +units=m +no_defs");
   770    770       add_srs_wkt (p, 0,
   771    771           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 21N (deprecated)\",");
   772    772       add_srs_wkt (p, 1,
   773    773           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   774    774       add_srs_wkt (p, 2,
   775    775           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   776    776       add_srs_wkt (p, 3,
   777         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   778         -    add_srs_wkt (p, 4,
   779         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   780         -    add_srs_wkt (p, 5,
   781         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   782         -    add_srs_wkt (p, 6,
   783         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   784         -    add_srs_wkt (p, 7,
   785         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   786         -    add_srs_wkt (p, 8,
   787         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   788         -    add_srs_wkt (p, 9,
   789         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",123],PAR");
   790         -    add_srs_wkt (p, 10,
   791         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   792         -    add_srs_wkt (p, 11,
   793         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   794         -    add_srs_wkt (p, 12,
   795         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   796         -    add_srs_wkt (p, 13,
   797         -        "\",EAST],AUTHORITY[\"EPSG\",\"20081\"]]");
          777  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          778  +    add_srs_wkt (p, 4,
          779  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          780  +    add_srs_wkt (p, 5,
          781  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          782  +    add_srs_wkt (p, 6,
          783  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          784  +    add_srs_wkt (p, 7,
          785  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          786  +    add_srs_wkt (p, 8,
          787  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          788  +    add_srs_wkt (p, 9,
          789  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
          790  +    add_srs_wkt (p, 10,
          791  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          792  +    add_srs_wkt (p, 11,
          793  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          794  +    add_srs_wkt (p, 12,
          795  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          796  +    add_srs_wkt (p, 13,
          797  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20081\"]]");
   798    798       p = add_epsg_def_ex (filter, first, last, 20082, "epsg", 20082,
   799    799           "Pulkovo 1995 / Gauss-Kruger 22N (deprecated)", 0, 1,
   800    800           "Krassowsky 1940", "Greenwich",
   801    801           "Pulkovo_1995", "Transverse_Mercator", "metre",
   802    802           "X", "North", "Y", "East");
   803    803       add_proj4text (p, 0,
   804    804           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
   805    805       add_proj4text (p, 1,
   806         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          806  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   807    807       add_proj4text (p, 2,
   808         -        "2 +units=m +no_defs");
          808  +        ".22 +units=m +no_defs");
   809    809       add_srs_wkt (p, 0,
   810    810           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 22N (deprecated)\",");
   811    811       add_srs_wkt (p, 1,
   812    812           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   813    813       add_srs_wkt (p, 2,
   814    814           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   815    815       add_srs_wkt (p, 3,
   816         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   817         -    add_srs_wkt (p, 4,
   818         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   819         -    add_srs_wkt (p, 5,
   820         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   821         -    add_srs_wkt (p, 6,
   822         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   823         -    add_srs_wkt (p, 7,
   824         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   825         -    add_srs_wkt (p, 8,
   826         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   827         -    add_srs_wkt (p, 9,
   828         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",129],PAR");
   829         -    add_srs_wkt (p, 10,
   830         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   831         -    add_srs_wkt (p, 11,
   832         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   833         -    add_srs_wkt (p, 12,
   834         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   835         -    add_srs_wkt (p, 13,
   836         -        "\",EAST],AUTHORITY[\"EPSG\",\"20082\"]]");
          816  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          817  +    add_srs_wkt (p, 4,
          818  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          819  +    add_srs_wkt (p, 5,
          820  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          821  +    add_srs_wkt (p, 6,
          822  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          823  +    add_srs_wkt (p, 7,
          824  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          825  +    add_srs_wkt (p, 8,
          826  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          827  +    add_srs_wkt (p, 9,
          828  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
          829  +    add_srs_wkt (p, 10,
          830  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          831  +    add_srs_wkt (p, 11,
          832  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          833  +    add_srs_wkt (p, 12,
          834  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          835  +    add_srs_wkt (p, 13,
          836  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20082\"]]");
   837    837       p = add_epsg_def_ex (filter, first, last, 20083, "epsg", 20083,
   838    838           "Pulkovo 1995 / Gauss-Kruger 23N (deprecated)", 0, 1,
   839    839           "Krassowsky 1940", "Greenwich",
   840    840           "Pulkovo_1995", "Transverse_Mercator", "metre",
   841    841           "X", "North", "Y", "East");
   842    842       add_proj4text (p, 0,
   843    843           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
   844    844       add_proj4text (p, 1,
   845         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          845  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   846    846       add_proj4text (p, 2,
   847         -        "2 +units=m +no_defs");
          847  +        ".22 +units=m +no_defs");
   848    848       add_srs_wkt (p, 0,
   849    849           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 23N (deprecated)\",");
   850    850       add_srs_wkt (p, 1,
   851    851           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   852    852       add_srs_wkt (p, 2,
   853    853           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   854    854       add_srs_wkt (p, 3,
   855         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   856         -    add_srs_wkt (p, 4,
   857         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   858         -    add_srs_wkt (p, 5,
   859         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   860         -    add_srs_wkt (p, 6,
   861         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   862         -    add_srs_wkt (p, 7,
   863         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   864         -    add_srs_wkt (p, 8,
   865         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   866         -    add_srs_wkt (p, 9,
   867         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",135],PAR");
   868         -    add_srs_wkt (p, 10,
   869         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   870         -    add_srs_wkt (p, 11,
   871         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   872         -    add_srs_wkt (p, 12,
   873         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   874         -    add_srs_wkt (p, 13,
   875         -        "\",EAST],AUTHORITY[\"EPSG\",\"20083\"]]");
          855  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          856  +    add_srs_wkt (p, 4,
          857  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          858  +    add_srs_wkt (p, 5,
          859  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          860  +    add_srs_wkt (p, 6,
          861  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          862  +    add_srs_wkt (p, 7,
          863  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          864  +    add_srs_wkt (p, 8,
          865  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          866  +    add_srs_wkt (p, 9,
          867  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
          868  +    add_srs_wkt (p, 10,
          869  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          870  +    add_srs_wkt (p, 11,
          871  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          872  +    add_srs_wkt (p, 12,
          873  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          874  +    add_srs_wkt (p, 13,
          875  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20083\"]]");
   876    876       p = add_epsg_def_ex (filter, first, last, 20084, "epsg", 20084,
   877    877           "Pulkovo 1995 / Gauss-Kruger 24N (deprecated)", 0, 1,
   878    878           "Krassowsky 1940", "Greenwich",
   879    879           "Pulkovo_1995", "Transverse_Mercator", "metre",
   880    880           "X", "North", "Y", "East");
   881    881       add_proj4text (p, 0,
   882    882           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
   883    883       add_proj4text (p, 1,
   884         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          884  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   885    885       add_proj4text (p, 2,
   886         -        "2 +units=m +no_defs");
          886  +        ".22 +units=m +no_defs");
   887    887       add_srs_wkt (p, 0,
   888    888           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 24N (deprecated)\",");
   889    889       add_srs_wkt (p, 1,
   890    890           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   891    891       add_srs_wkt (p, 2,
   892    892           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   893    893       add_srs_wkt (p, 3,
   894         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   895         -    add_srs_wkt (p, 4,
   896         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   897         -    add_srs_wkt (p, 5,
   898         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   899         -    add_srs_wkt (p, 6,
   900         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   901         -    add_srs_wkt (p, 7,
   902         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   903         -    add_srs_wkt (p, 8,
   904         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   905         -    add_srs_wkt (p, 9,
   906         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",141],PAR");
   907         -    add_srs_wkt (p, 10,
   908         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   909         -    add_srs_wkt (p, 11,
   910         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   911         -    add_srs_wkt (p, 12,
   912         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   913         -    add_srs_wkt (p, 13,
   914         -        "\",EAST],AUTHORITY[\"EPSG\",\"20084\"]]");
          894  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          895  +    add_srs_wkt (p, 4,
          896  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          897  +    add_srs_wkt (p, 5,
          898  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          899  +    add_srs_wkt (p, 6,
          900  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          901  +    add_srs_wkt (p, 7,
          902  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          903  +    add_srs_wkt (p, 8,
          904  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          905  +    add_srs_wkt (p, 9,
          906  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
          907  +    add_srs_wkt (p, 10,
          908  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          909  +    add_srs_wkt (p, 11,
          910  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          911  +    add_srs_wkt (p, 12,
          912  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          913  +    add_srs_wkt (p, 13,
          914  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20084\"]]");
   915    915       p = add_epsg_def_ex (filter, first, last, 20085, "epsg", 20085,
   916    916           "Pulkovo 1995 / Gauss-Kruger 25N (deprecated)", 0, 1,
   917    917           "Krassowsky 1940", "Greenwich",
   918    918           "Pulkovo_1995", "Transverse_Mercator", "metre",
   919    919           "X", "North", "Y", "East");
   920    920       add_proj4text (p, 0,
   921    921           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
   922    922       add_proj4text (p, 1,
   923         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          923  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   924    924       add_proj4text (p, 2,
   925         -        "2 +units=m +no_defs");
          925  +        ".22 +units=m +no_defs");
   926    926       add_srs_wkt (p, 0,
   927    927           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 25N (deprecated)\",");
   928    928       add_srs_wkt (p, 1,
   929    929           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   930    930       add_srs_wkt (p, 2,
   931    931           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   932    932       add_srs_wkt (p, 3,
   933         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   934         -    add_srs_wkt (p, 4,
   935         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   936         -    add_srs_wkt (p, 5,
   937         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   938         -    add_srs_wkt (p, 6,
   939         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   940         -    add_srs_wkt (p, 7,
   941         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   942         -    add_srs_wkt (p, 8,
   943         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   944         -    add_srs_wkt (p, 9,
   945         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",147],PAR");
   946         -    add_srs_wkt (p, 10,
   947         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   948         -    add_srs_wkt (p, 11,
   949         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   950         -    add_srs_wkt (p, 12,
   951         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   952         -    add_srs_wkt (p, 13,
   953         -        "\",EAST],AUTHORITY[\"EPSG\",\"20085\"]]");
          933  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          934  +    add_srs_wkt (p, 4,
          935  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          936  +    add_srs_wkt (p, 5,
          937  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          938  +    add_srs_wkt (p, 6,
          939  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          940  +    add_srs_wkt (p, 7,
          941  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          942  +    add_srs_wkt (p, 8,
          943  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          944  +    add_srs_wkt (p, 9,
          945  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
          946  +    add_srs_wkt (p, 10,
          947  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          948  +    add_srs_wkt (p, 11,
          949  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          950  +    add_srs_wkt (p, 12,
          951  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          952  +    add_srs_wkt (p, 13,
          953  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20085\"]]");
   954    954       p = add_epsg_def_ex (filter, first, last, 20086, "epsg", 20086,
   955    955           "Pulkovo 1995 / Gauss-Kruger 26N (deprecated)", 0, 1,
   956    956           "Krassowsky 1940", "Greenwich",
   957    957           "Pulkovo_1995", "Transverse_Mercator", "metre",
   958    958           "X", "North", "Y", "East");
   959    959       add_proj4text (p, 0,
   960    960           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
   961    961       add_proj4text (p, 1,
   962         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
          962  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
   963    963       add_proj4text (p, 2,
   964         -        "2 +units=m +no_defs");
          964  +        ".22 +units=m +no_defs");
   965    965       add_srs_wkt (p, 0,
   966    966           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 26N (deprecated)\",");
   967    967       add_srs_wkt (p, 1,
   968    968           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
   969    969       add_srs_wkt (p, 2,
   970    970           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   971    971       add_srs_wkt (p, 3,
   972         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
   973         -    add_srs_wkt (p, 4,
   974         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
   975         -    add_srs_wkt (p, 5,
   976         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
   977         -    add_srs_wkt (p, 6,
   978         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
   979         -    add_srs_wkt (p, 7,
   980         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
   981         -    add_srs_wkt (p, 8,
   982         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
   983         -    add_srs_wkt (p, 9,
   984         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",153],PAR");
   985         -    add_srs_wkt (p, 10,
   986         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
   987         -    add_srs_wkt (p, 11,
   988         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
   989         -    add_srs_wkt (p, 12,
   990         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
   991         -    add_srs_wkt (p, 13,
   992         -        "\",EAST],AUTHORITY[\"EPSG\",\"20086\"]]");
          972  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
          973  +    add_srs_wkt (p, 4,
          974  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
          975  +    add_srs_wkt (p, 5,
          976  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          977  +    add_srs_wkt (p, 6,
          978  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          979  +    add_srs_wkt (p, 7,
          980  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
          981  +    add_srs_wkt (p, 8,
          982  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
          983  +    add_srs_wkt (p, 9,
          984  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
          985  +    add_srs_wkt (p, 10,
          986  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
          987  +    add_srs_wkt (p, 11,
          988  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
          989  +    add_srs_wkt (p, 12,
          990  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
          991  +    add_srs_wkt (p, 13,
          992  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20086\"]]");
   993    993       p = add_epsg_def_ex (filter, first, last, 20087, "epsg", 20087,
   994    994           "Pulkovo 1995 / Gauss-Kruger 27N (deprecated)", 0, 1,
   995    995           "Krassowsky 1940", "Greenwich",
   996    996           "Pulkovo_1995", "Transverse_Mercator", "metre",
   997    997           "X", "North", "Y", "East");
   998    998       add_proj4text (p, 0,
   999    999           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
  1000   1000       add_proj4text (p, 1,
  1001         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1001  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1002   1002       add_proj4text (p, 2,
  1003         -        "2 +units=m +no_defs");
         1003  +        ".22 +units=m +no_defs");
  1004   1004       add_srs_wkt (p, 0,
  1005   1005           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 27N (deprecated)\",");
  1006   1006       add_srs_wkt (p, 1,
  1007   1007           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1008   1008       add_srs_wkt (p, 2,
  1009   1009           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1010   1010       add_srs_wkt (p, 3,
  1011         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1012         -    add_srs_wkt (p, 4,
  1013         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1014         -    add_srs_wkt (p, 5,
  1015         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1016         -    add_srs_wkt (p, 6,
  1017         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1018         -    add_srs_wkt (p, 7,
  1019         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1020         -    add_srs_wkt (p, 8,
  1021         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1022         -    add_srs_wkt (p, 9,
  1023         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",159],PAR");
  1024         -    add_srs_wkt (p, 10,
  1025         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1026         -    add_srs_wkt (p, 11,
  1027         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1028         -    add_srs_wkt (p, 12,
  1029         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1030         -    add_srs_wkt (p, 13,
  1031         -        "\",EAST],AUTHORITY[\"EPSG\",\"20087\"]]");
         1011  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1012  +    add_srs_wkt (p, 4,
         1013  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1014  +    add_srs_wkt (p, 5,
         1015  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1016  +    add_srs_wkt (p, 6,
         1017  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1018  +    add_srs_wkt (p, 7,
         1019  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1020  +    add_srs_wkt (p, 8,
         1021  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1022  +    add_srs_wkt (p, 9,
         1023  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
         1024  +    add_srs_wkt (p, 10,
         1025  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1026  +    add_srs_wkt (p, 11,
         1027  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1028  +    add_srs_wkt (p, 12,
         1029  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1030  +    add_srs_wkt (p, 13,
         1031  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20087\"]]");
  1032   1032       p = add_epsg_def_ex (filter, first, last, 20088, "epsg", 20088,
  1033   1033           "Pulkovo 1995 / Gauss-Kruger 28N (deprecated)", 0, 1,
  1034   1034           "Krassowsky 1940", "Greenwich",
  1035   1035           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1036   1036           "X", "North", "Y", "East");
  1037   1037       add_proj4text (p, 0,
  1038   1038           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
  1039   1039       add_proj4text (p, 1,
  1040         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1040  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1041   1041       add_proj4text (p, 2,
  1042         -        "2 +units=m +no_defs");
         1042  +        ".22 +units=m +no_defs");
  1043   1043       add_srs_wkt (p, 0,
  1044   1044           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 28N (deprecated)\",");
  1045   1045       add_srs_wkt (p, 1,
  1046   1046           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1047   1047       add_srs_wkt (p, 2,
  1048   1048           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1049   1049       add_srs_wkt (p, 3,
  1050         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1051         -    add_srs_wkt (p, 4,
  1052         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1053         -    add_srs_wkt (p, 5,
  1054         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1055         -    add_srs_wkt (p, 6,
  1056         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1057         -    add_srs_wkt (p, 7,
  1058         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1059         -    add_srs_wkt (p, 8,
  1060         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1061         -    add_srs_wkt (p, 9,
  1062         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",165],PAR");
  1063         -    add_srs_wkt (p, 10,
  1064         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1065         -    add_srs_wkt (p, 11,
  1066         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1067         -    add_srs_wkt (p, 12,
  1068         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1069         -    add_srs_wkt (p, 13,
  1070         -        "\",EAST],AUTHORITY[\"EPSG\",\"20088\"]]");
         1050  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1051  +    add_srs_wkt (p, 4,
         1052  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1053  +    add_srs_wkt (p, 5,
         1054  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1055  +    add_srs_wkt (p, 6,
         1056  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1057  +    add_srs_wkt (p, 7,
         1058  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1059  +    add_srs_wkt (p, 8,
         1060  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1061  +    add_srs_wkt (p, 9,
         1062  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
         1063  +    add_srs_wkt (p, 10,
         1064  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1065  +    add_srs_wkt (p, 11,
         1066  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1067  +    add_srs_wkt (p, 12,
         1068  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1069  +    add_srs_wkt (p, 13,
         1070  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20088\"]]");
  1071   1071       p = add_epsg_def_ex (filter, first, last, 20089, "epsg", 20089,
  1072   1072           "Pulkovo 1995 / Gauss-Kruger 29N (deprecated)", 0, 1,
  1073   1073           "Krassowsky 1940", "Greenwich",
  1074   1074           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1075   1075           "X", "North", "Y", "East");
  1076   1076       add_proj4text (p, 0,
  1077   1077           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
  1078   1078       add_proj4text (p, 1,
  1079         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1079  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1080   1080       add_proj4text (p, 2,
  1081         -        "2 +units=m +no_defs");
         1081  +        ".22 +units=m +no_defs");
  1082   1082       add_srs_wkt (p, 0,
  1083   1083           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 29N (deprecated)\",");
  1084   1084       add_srs_wkt (p, 1,
  1085   1085           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1086   1086       add_srs_wkt (p, 2,
  1087   1087           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1088   1088       add_srs_wkt (p, 3,
  1089         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1090         -    add_srs_wkt (p, 4,
  1091         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1092         -    add_srs_wkt (p, 5,
  1093         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1094         -    add_srs_wkt (p, 6,
  1095         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1096         -    add_srs_wkt (p, 7,
  1097         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1098         -    add_srs_wkt (p, 8,
  1099         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1100         -    add_srs_wkt (p, 9,
  1101         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",171],PAR");
  1102         -    add_srs_wkt (p, 10,
  1103         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1104         -    add_srs_wkt (p, 11,
  1105         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1106         -    add_srs_wkt (p, 12,
  1107         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1108         -    add_srs_wkt (p, 13,
  1109         -        "\",EAST],AUTHORITY[\"EPSG\",\"20089\"]]");
         1089  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1090  +    add_srs_wkt (p, 4,
         1091  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1092  +    add_srs_wkt (p, 5,
         1093  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1094  +    add_srs_wkt (p, 6,
         1095  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1096  +    add_srs_wkt (p, 7,
         1097  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1098  +    add_srs_wkt (p, 8,
         1099  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1100  +    add_srs_wkt (p, 9,
         1101  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
         1102  +    add_srs_wkt (p, 10,
         1103  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1104  +    add_srs_wkt (p, 11,
         1105  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1106  +    add_srs_wkt (p, 12,
         1107  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1108  +    add_srs_wkt (p, 13,
         1109  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20089\"]]");
  1110   1110       p = add_epsg_def_ex (filter, first, last, 20090, "epsg", 20090,
  1111   1111           "Pulkovo 1995 / Gauss-Kruger 30N (deprecated)", 0, 1,
  1112   1112           "Krassowsky 1940", "Greenwich",
  1113   1113           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1114   1114           "X", "North", "Y", "East");
  1115   1115       add_proj4text (p, 0,
  1116   1116           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
  1117   1117       add_proj4text (p, 1,
  1118         -        "+ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.2");
         1118  +        "+ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-0");
  1119   1119       add_proj4text (p, 2,
  1120         -        "2 +units=m +no_defs");
         1120  +        ".22 +units=m +no_defs");
  1121   1121       add_srs_wkt (p, 0,
  1122   1122           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 30N (deprecated)\",");
  1123   1123       add_srs_wkt (p, 1,
  1124   1124           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1125   1125       add_srs_wkt (p, 2,
  1126   1126           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1127   1127       add_srs_wkt (p, 3,
  1128         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
  1129         -    add_srs_wkt (p, 4,
  1130         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  1131         -    add_srs_wkt (p, 5,
  1132         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  1133         -    add_srs_wkt (p, 6,
  1134         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
  1135         -    add_srs_wkt (p, 7,
  1136         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
  1137         -    add_srs_wkt (p, 8,
  1138         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
  1139         -    add_srs_wkt (p, 9,
  1140         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",177],PAR");
  1141         -    add_srs_wkt (p, 10,
  1142         -        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  1143         -    add_srs_wkt (p, 11,
  1144         -        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  1145         -    add_srs_wkt (p, 12,
  1146         -        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  1147         -    add_srs_wkt (p, 13,
  1148         -        "\",EAST],AUTHORITY[\"EPSG\",\"20090\"]]");
         1128  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
         1129  +    add_srs_wkt (p, 4,
         1130  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
         1131  +    add_srs_wkt (p, 5,
         1132  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         1133  +    add_srs_wkt (p, 6,
         1134  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         1135  +    add_srs_wkt (p, 7,
         1136  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
         1137  +    add_srs_wkt (p, 8,
         1138  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
         1139  +    add_srs_wkt (p, 9,
         1140  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
         1141  +    add_srs_wkt (p, 10,
         1142  +        "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
         1143  +    add_srs_wkt (p, 11,
         1144  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
         1145  +    add_srs_wkt (p, 12,
         1146  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1147  +    add_srs_wkt (p, 13,
         1148  +        "Y\",EAST],AUTHORITY[\"EPSG\",\"20090\"]]");
  1149   1149       p = add_epsg_def_ex (filter, first, last, 20091, "epsg", 20091,
  1150   1150           "Pulkovo 1995 / Gauss-Kruger 31N (deprecated)", 0, 1,
  1151   1151           "Krassowsky 1940", "Greenwich",
  1152   1152           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1153   1153           "X", "North", "Y", "East");
  1154   1154       add_proj4text (p, 0,
  1155   1155           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
  1156   1156       add_proj4text (p, 1,
  1157         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1157  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1158   1158       add_proj4text (p, 2,
  1159         -        "22 +units=m +no_defs");
         1159  +        "0.22 +units=m +no_defs");
  1160   1160       add_srs_wkt (p, 0,
  1161   1161           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 31N (deprecated)\",");
  1162   1162       add_srs_wkt (p, 1,
  1163   1163           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1164   1164       add_srs_wkt (p, 2,
  1165   1165           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1166   1166       add_srs_wkt (p, 3,
  1167         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1167  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1168   1168       add_srs_wkt (p, 4,
  1169         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1169  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1170   1170       add_srs_wkt (p, 5,
  1171         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1171  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1172   1172       add_srs_wkt (p, 6,
  1173         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1173  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1174   1174       add_srs_wkt (p, 7,
  1175         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1175  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1176   1176       add_srs_wkt (p, 8,
  1177         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1177  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1178   1178       add_srs_wkt (p, 9,
  1179         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-177],PA");
         1179  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
  1180   1180       add_srs_wkt (p, 10,
  1181         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1181  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1182   1182       add_srs_wkt (p, 11,
  1183         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1183  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1184   1184       add_srs_wkt (p, 12,
  1185         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1185  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1186   1186       add_srs_wkt (p, 13,
  1187   1187           "Y\",EAST],AUTHORITY[\"EPSG\",\"20091\"]]");
  1188   1188       p = add_epsg_def_ex (filter, first, last, 20092, "epsg", 20092,
  1189   1189           "Pulkovo 1995 / Gauss-Kruger 32N (deprecated)", 0, 1,
  1190   1190           "Krassowsky 1940", "Greenwich",
  1191   1191           "Pulkovo_1995", "Transverse_Mercator", "metre",
  1192   1192           "X", "North", "Y", "East");
  1193   1193       add_proj4text (p, 0,
  1194   1194           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
  1195   1195       add_proj4text (p, 1,
  1196         -        " +ellps=krass +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.");
         1196  +        " +ellps=krass +towgs84=24.47,-130.89,-81.56,-0,-0,0.13,-");
  1197   1197       add_proj4text (p, 2,
  1198         -        "22 +units=m +no_defs");
         1198  +        "0.22 +units=m +no_defs");
  1199   1199       add_srs_wkt (p, 0,
  1200   1200           "PROJCS[\"Pulkovo 1995 / Gauss-Kruger 32N (deprecated)\",");
  1201   1201       add_srs_wkt (p, 1,
  1202   1202           "GEOGCS[\"Pulkovo 1995\",DATUM[\"Pulkovo_1995\",SPHEROID[");
  1203   1203       add_srs_wkt (p, 2,
  1204   1204           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  1205   1205       add_srs_wkt (p, 3,
  1206         -        "024\"]],TOWGS84[24.47,-130.89,-81.56,0,0,0.13,-0.22],AUT");
         1206  +        "024\"]],TOWGS84[24.47,-130.89,-81.56,-0,-0,0.13,-0.22],A");
  1207   1207       add_srs_wkt (p, 4,
  1208         -        "HORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         1208  +        "UTHORITY[\"EPSG\",\"6200\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1209   1209       add_srs_wkt (p, 5,
  1210         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         1210  +        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1211   1211       add_srs_wkt (p, 6,
  1212         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         1212  +        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1213   1213       add_srs_wkt (p, 7,
  1214         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"]]");
         1214  +        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4200\"");
  1215   1215       add_srs_wkt (p, 8,
  1216         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         1216  +        "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  1217   1217       add_srs_wkt (p, 9,
  1218         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",-171],PA");
         1218  +        "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
  1219   1219       add_srs_wkt (p, 10,
  1220         -        "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
         1220  +        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  1221   1221       add_srs_wkt (p, 11,
  1222         -        "500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1");
         1222  +        ",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",");
  1223   1223       add_srs_wkt (p, 12,
  1224         -        ",AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
         1224  +        "1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"");
  1225   1225       add_srs_wkt (p, 13,
  1226   1226           "Y\",EAST],AUTHORITY[\"EPSG\",\"20092\"]]");
  1227   1227       p = add_epsg_def_ex (filter, first, last, 20135, "epsg", 20135,
  1228   1228           "Adindan / UTM zone 35N", 0, 0,
  1229   1229           "Clarke 1880 (RGS)", "Greenwich",
  1230   1230           "Adindan", "Transverse_Mercator", "metre",
  1231   1231           "Easting", "East", "Northing", "North");

Changes to src/srsinit/epsg_inlined_35.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  2674   2674       add_proj4text (p, 1,
  2675   2675           ",6,431,0,0,0,0 +units=m +no_defs");
  2676   2676       add_srs_wkt (p, 0,
  2677   2677           "PROJCS[\"Carthage / UTM zone 32N\",GEOGCS[\"Carthage\",D");
  2678   2678       add_srs_wkt (p, 1,
  2679   2679           "ATUM[\"Carthage\",SPHEROID[\"Clarke 1880 (IGN)\",6378249");
  2680   2680       add_srs_wkt (p, 2,
  2681         -        ".2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS");
         2681  +        ".2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS");
  2682   2682       add_srs_wkt (p, 3,
  2683   2683           "84[-263,6,431,0,0,0,0],AUTHORITY[\"EPSG\",\"6223\"]],PRI");
  2684   2684       add_srs_wkt (p, 4,
  2685   2685           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  2686   2686       add_srs_wkt (p, 5,
  2687   2687           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  2688   2688       add_srs_wkt (p, 6,
................................................................................
  2713   2713       add_proj4text (p, 2,
  2714   2714           "84=-263,6,431,0,0,0,0 +units=m +no_defs");
  2715   2715       add_srs_wkt (p, 0,
  2716   2716           "PROJCS[\"Carthage / Nord Tunisie\",GEOGCS[\"Carthage\",D");
  2717   2717       add_srs_wkt (p, 1,
  2718   2718           "ATUM[\"Carthage\",SPHEROID[\"Clarke 1880 (IGN)\",6378249");
  2719   2719       add_srs_wkt (p, 2,
  2720         -        ".2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS");
         2720  +        ".2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS");
  2721   2721       add_srs_wkt (p, 3,
  2722   2722           "84[-263,6,431,0,0,0,0],AUTHORITY[\"EPSG\",\"6223\"]],PRI");
  2723   2723       add_srs_wkt (p, 4,
  2724   2724           "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  2725   2725       add_srs_wkt (p, 5,
  2726   2726           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  2727   2727       add_srs_wkt (p, 6,
................................................................................
  2752   2752       add_proj4text (p, 2,
  2753   2753           "owgs84=-263,6,431,0,0,0,0 +units=m +no_defs");
  2754   2754       add_srs_wkt (p, 0,
  2755   2755           "PROJCS[\"Carthage / Sud Tunisie\",GEOGCS[\"Carthage\",DA");
  2756   2756       add_srs_wkt (p, 1,
  2757   2757           "TUM[\"Carthage\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.");
  2758   2758       add_srs_wkt (p, 2,
  2759         -        "2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS8");
         2759  +        "2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS8");
  2760   2760       add_srs_wkt (p, 3,
  2761   2761           "4[-263,6,431,0,0,0,0],AUTHORITY[\"EPSG\",\"6223\"]],PRIM");
  2762   2762       add_srs_wkt (p, 4,
  2763   2763           "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  2764   2764       add_srs_wkt (p, 5,
  2765   2765           "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  2766   2766       add_srs_wkt (p, 6,
................................................................................
  2986   2986       add_proj4text (p, 2,
  2987   2987           "+towgs84=-190.421,8.532,238.69,0,0,0,0 +units=m +no_defs");
  2988   2988       add_srs_wkt (p, 0,
  2989   2989           "PROJCS[\"Deir ez Zor / Levant Zone\",GEOGCS[\"Deir ez Zo");
  2990   2990       add_srs_wkt (p, 1,
  2991   2991           "r\",DATUM[\"Deir_ez_Zor\",SPHEROID[\"Clarke 1880 (IGN)\"");
  2992   2992       add_srs_wkt (p, 2,
  2993         -        ",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"");
         2993  +        ",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"");
  2994   2994       add_srs_wkt (p, 3,
  2995   2995           "]],TOWGS84[-190.421,8.532,238.69,0,0,0,0],AUTHORITY[\"EP");
  2996   2996       add_srs_wkt (p, 4,
  2997   2997           "SG\",\"6227\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
  2998   2998       add_srs_wkt (p, 5,
  2999   2999           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
  3000   3000       add_srs_wkt (p, 6,
................................................................................
  3025   3025       add_proj4text (p, 2,
  3026   3026           "+towgs84=-190.421,8.532,238.69,0,0,0,0 +units=m +no_defs");
  3027   3027       add_srs_wkt (p, 0,
  3028   3028           "PROJCS[\"Deir ez Zor / Syria Lambert\",GEOGCS[\"Deir ez ");
  3029   3029       add_srs_wkt (p, 1,
  3030   3030           "Zor\",DATUM[\"Deir_ez_Zor\",SPHEROID[\"Clarke 1880 (IGN)");
  3031   3031       add_srs_wkt (p, 2,
  3032         -        "\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011");
         3032  +        "\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011");
  3033   3033       add_srs_wkt (p, 3,
  3034   3034           "\"]],TOWGS84[-190.421,8.532,238.69,0,0,0,0],AUTHORITY[\"");
  3035   3035       add_srs_wkt (p, 4,
  3036   3036           "EPSG\",\"6227\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3037   3037       add_srs_wkt (p, 5,
  3038   3038           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3039   3039       add_srs_wkt (p, 6,
................................................................................
  3066   3066       add_proj4text (p, 2,
  3067   3067           ",238.69,0,0,0,0 +units=m +no_defs");
  3068   3068       add_srs_wkt (p, 0,
  3069   3069           "PROJCS[\"Deir ez Zor / Levant Stereographic\",GEOGCS[\"D");
  3070   3070       add_srs_wkt (p, 1,
  3071   3071           "eir ez Zor\",DATUM[\"Deir_ez_Zor\",SPHEROID[\"Clarke 188");
  3072   3072       add_srs_wkt (p, 2,
  3073         -        "0 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
         3073  +        "0 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
  3074   3074       add_srs_wkt (p, 3,
  3075   3075           ",\"7011\"]],TOWGS84[-190.421,8.532,238.69,0,0,0,0],AUTHO");
  3076   3076       add_srs_wkt (p, 4,
  3077   3077           "RITY[\"EPSG\",\"6227\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  3078   3078       add_srs_wkt (p, 5,
  3079   3079           "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  3080   3080       add_srs_wkt (p, 6,
................................................................................
  3103   3103       add_proj4text (p, 1,
  3104   3104           "defs");
  3105   3105       add_srs_wkt (p, 0,
  3106   3106           "PROJCS[\"Douala / UTM zone 32N (deprecated)\",GEOGCS[\"D");
  3107   3107       add_srs_wkt (p, 1,
  3108   3108           "ouala\",DATUM[\"Douala\",SPHEROID[\"Clarke 1880 (IGN)\",");
  3109   3109       add_srs_wkt (p, 2,
  3110         -        "6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]");
         3110  +        "6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]");
  3111   3111       add_srs_wkt (p, 3,
  3112   3112           "],AUTHORITY[\"EPSG\",\"6228\"]],PRIMEM[\"Greenwich\",0,A");
  3113   3113       add_srs_wkt (p, 4,
  3114   3114           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3115   3115       add_srs_wkt (p, 5,
  3116   3116           "5199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Latitude\",");
  3117   3117       add_srs_wkt (p, 6,
................................................................................
  3855   3855       add_proj4text (p, 1,
  3856   3856           "defs");
  3857   3857       add_srs_wkt (p, 0,
  3858   3858           "PROJCS[\"Garoua / UTM zone 33N (deprecated)\",GEOGCS[\"G");
  3859   3859       add_srs_wkt (p, 1,
  3860   3860           "aroua\",DATUM[\"Garoua\",SPHEROID[\"Clarke 1880 (IGN)\",");
  3861   3861       add_srs_wkt (p, 2,
  3862         -        "6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]");
         3862  +        "6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]");
  3863   3863       add_srs_wkt (p, 3,
  3864   3864           "],AUTHORITY[\"EPSG\",\"6234\"]],PRIMEM[\"Greenwich\",0,A");
  3865   3865       add_srs_wkt (p, 4,
  3866   3866           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3867   3867       add_srs_wkt (p, 5,
  3868   3868           "5199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Latitude\",");
  3869   3869       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_36.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1864   1864           "NORTH],AUTHORITY[\"EPSG\",\"23894\"]]");
  1865   1865       p = add_epsg_def_ex (filter, first, last, 23946, "epsg", 23946,
  1866   1866           "Indian 1954 / UTM zone 46N", 0, 0,
  1867   1867           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1868   1868           "Indian_1954", "Transverse_Mercator", "metre",
  1869   1869           "Easting", "East", "Northing", "North");
  1870   1870       add_proj4text (p, 0,
  1871         -        "+proj=utm +zone=46 +a=6377276.345 +b=6356075.413140239 +");
         1871  +        "+proj=utm +zone=46 +a=6377276.345 +b=6356075.41314024 +t");
  1872   1872       add_proj4text (p, 1,
  1873         -        "towgs84=217,823,299,0,0,0,0 +units=m +no_defs");
         1873  +        "owgs84=217,823,299,0,0,0,0 +units=m +no_defs");
  1874   1874       add_srs_wkt (p, 0,
  1875   1875           "PROJCS[\"Indian 1954 / UTM zone 46N\",GEOGCS[\"Indian 19");
  1876   1876       add_srs_wkt (p, 1,
  1877   1877           "54\",DATUM[\"Indian_1954\",SPHEROID[\"Everest 1830 (1937");
  1878   1878       add_srs_wkt (p, 2,
  1879   1879           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
  1880   1880       add_srs_wkt (p, 3,
................................................................................
  1901   1901           "\",NORTH],AUTHORITY[\"EPSG\",\"23946\"]]");
  1902   1902       p = add_epsg_def_ex (filter, first, last, 23947, "epsg", 23947,
  1903   1903           "Indian 1954 / UTM zone 47N", 0, 0,
  1904   1904           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1905   1905           "Indian_1954", "Transverse_Mercator", "metre",
  1906   1906           "Easting", "East", "Northing", "North");
  1907   1907       add_proj4text (p, 0,
  1908         -        "+proj=utm +zone=47 +a=6377276.345 +b=6356075.413140239 +");
         1908  +        "+proj=utm +zone=47 +a=6377276.345 +b=6356075.41314024 +t");
  1909   1909       add_proj4text (p, 1,
  1910         -        "towgs84=217,823,299,0,0,0,0 +units=m +no_defs");
         1910  +        "owgs84=217,823,299,0,0,0,0 +units=m +no_defs");
  1911   1911       add_srs_wkt (p, 0,
  1912   1912           "PROJCS[\"Indian 1954 / UTM zone 47N\",GEOGCS[\"Indian 19");
  1913   1913       add_srs_wkt (p, 1,
  1914   1914           "54\",DATUM[\"Indian_1954\",SPHEROID[\"Everest 1830 (1937");
  1915   1915       add_srs_wkt (p, 2,
  1916   1916           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
  1917   1917       add_srs_wkt (p, 3,
................................................................................
  1938   1938           "\",NORTH],AUTHORITY[\"EPSG\",\"23947\"]]");
  1939   1939       p = add_epsg_def_ex (filter, first, last, 23948, "epsg", 23948,
  1940   1940           "Indian 1954 / UTM zone 48N", 0, 0,
  1941   1941           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1942   1942           "Indian_1954", "Transverse_Mercator", "metre",
  1943   1943           "Easting", "East", "Northing", "North");
  1944   1944       add_proj4text (p, 0,
  1945         -        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.413140239 +");
         1945  +        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.41314024 +t");
  1946   1946       add_proj4text (p, 1,
  1947         -        "towgs84=217,823,299,0,0,0,0 +units=m +no_defs");
         1947  +        "owgs84=217,823,299,0,0,0,0 +units=m +no_defs");
  1948   1948       add_srs_wkt (p, 0,
  1949   1949           "PROJCS[\"Indian 1954 / UTM zone 48N\",GEOGCS[\"Indian 19");
  1950   1950       add_srs_wkt (p, 1,
  1951   1951           "54\",DATUM[\"Indian_1954\",SPHEROID[\"Everest 1830 (1937");
  1952   1952       add_srs_wkt (p, 2,
  1953   1953           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
  1954   1954       add_srs_wkt (p, 3,
................................................................................
  1975   1975           "ng\",NORTH],AUTHORITY[\"EPSG\",\"23948\"]]");
  1976   1976       p = add_epsg_def_ex (filter, first, last, 24047, "epsg", 24047,
  1977   1977           "Indian 1975 / UTM zone 47N", 0, 0,
  1978   1978           "Everest 1830 (1937 Adjustment)", "Greenwich",
  1979   1979           "Indian_1975", "Transverse_Mercator", "metre",
  1980   1980           "Easting", "East", "Northing", "North");
  1981   1981       add_proj4text (p, 0,
  1982         -        "+proj=utm +zone=47 +a=6377276.345 +b=6356075.413140239 +");
         1982  +        "+proj=utm +zone=47 +a=6377276.345 +b=6356075.41314024 +t");
  1983   1983       add_proj4text (p, 1,
  1984         -        "towgs84=210,814,289,0,0,0,0 +units=m +no_defs");
         1984  +        "owgs84=210,814,289,0,0,0,0 +units=m +no_defs");
  1985   1985       add_srs_wkt (p, 0,
  1986   1986           "PROJCS[\"Indian 1975 / UTM zone 47N\",GEOGCS[\"Indian 19");
  1987   1987       add_srs_wkt (p, 1,
  1988   1988           "75\",DATUM[\"Indian_1975\",SPHEROID[\"Everest 1830 (1937");
  1989   1989       add_srs_wkt (p, 2,
  1990   1990           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
  1991   1991       add_srs_wkt (p, 3,
................................................................................
  2012   2012           "\",NORTH],AUTHORITY[\"EPSG\",\"24047\"]]");
  2013   2013       p = add_epsg_def_ex (filter, first, last, 24048, "epsg", 24048,
  2014   2014           "Indian 1975 / UTM zone 48N", 0, 0,
  2015   2015           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2016   2016           "Indian_1975", "Transverse_Mercator", "metre",
  2017   2017           "Easting", "East", "Northing", "North");
  2018   2018       add_proj4text (p, 0,
  2019         -        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.413140239 +");
         2019  +        "+proj=utm +zone=48 +a=6377276.345 +b=6356075.41314024 +t");
  2020   2020       add_proj4text (p, 1,
  2021         -        "towgs84=210,814,289,0,0,0,0 +units=m +no_defs");
         2021  +        "owgs84=210,814,289,0,0,0,0 +units=m +no_defs");
  2022   2022       add_srs_wkt (p, 0,
  2023   2023           "PROJCS[\"Indian 1975 / UTM zone 48N\",GEOGCS[\"Indian 19");
  2024   2024       add_srs_wkt (p, 1,
  2025   2025           "75\",DATUM[\"Indian_1975\",SPHEROID[\"Everest 1830 (1937");
  2026   2026       add_srs_wkt (p, 2,
  2027   2027           " Adjustment)\",6377276.345,300.8017,AUTHORITY[\"EPSG\",\"");
  2028   2028       add_srs_wkt (p, 3,
................................................................................
  2059   2059       add_proj4text (p, 2,
  2060   2060           "514.966204134 +to_meter=0.3047972654 +no_defs");
  2061   2061       add_srs_wkt (p, 0,
  2062   2062           "PROJCS[\"Jamaica 1875 / Jamaica (Old Grid)\",GEOGCS[\"Ja");
  2063   2063       add_srs_wkt (p, 1,
  2064   2064           "maica 1875\",DATUM[\"Jamaica_1875\",SPHEROID[\"Clarke 18");
  2065   2065       add_srs_wkt (p, 2,
  2066         -        "80\",6378249.144808011,293.4663076556365,AUTHORITY[\"EPS");
         2066  +        "80\",6378249.144808011,293.4663076556349,AUTHORITY[\"EPS");
  2067   2067       add_srs_wkt (p, 3,
  2068   2068           "G\",\"7034\"]],AUTHORITY[\"EPSG\",\"6241\"]],PRIMEM[\"Gr");
  2069   2069       add_srs_wkt (p, 4,
  2070   2070           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  2071   2071       add_srs_wkt (p, 5,
  2072   2072           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  2073   2073       add_srs_wkt (p, 6,
................................................................................
  2098   2098       add_proj4text (p, 2,
  2099   2099           "0,0 +units=m +no_defs");
  2100   2100       add_srs_wkt (p, 0,
  2101   2101           "PROJCS[\"JAD69 / Jamaica National Grid\",GEOGCS[\"JAD69\"");
  2102   2102       add_srs_wkt (p, 1,
  2103   2103           ",DATUM[\"Jamaica_1969\",SPHEROID[\"Clarke 1866\",6378206");
  2104   2104       add_srs_wkt (p, 2,
  2105         -        ".4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS");
         2105  +        ".4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],TOWGS");
  2106   2106       add_srs_wkt (p, 3,
  2107   2107           "84[70,207,389.5,0,0,0,0],AUTHORITY[\"EPSG\",\"6242\"]],P");
  2108   2108       add_srs_wkt (p, 4,
  2109   2109           "RIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT");
  2110   2110       add_srs_wkt (p, 5,
  2111   2111           "[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122");
  2112   2112       add_srs_wkt (p, 6,
................................................................................
  2127   2127           ",NORTH],AUTHORITY[\"EPSG\",\"24200\"]]");
  2128   2128       p = add_epsg_def_ex (filter, first, last, 24305, "epsg", 24305,
  2129   2129           "Kalianpur 1937 / UTM zone 45N", 0, 0,
  2130   2130           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2131   2131           "Kalianpur_1937", "Transverse_Mercator", "metre",
  2132   2132           "Easting", "East", "Northing", "North");
  2133   2133       add_proj4text (p, 0,
  2134         -        "+proj=utm +zone=45 +a=6377276.345 +b=6356075.413140239 +");
         2134  +        "+proj=utm +zone=45 +a=6377276.345 +b=6356075.41314024 +t");
  2135   2135       add_proj4text (p, 1,
  2136         -        "towgs84=214,804,268,0,0,0,0 +units=m +no_defs");
         2136  +        "owgs84=214,804,268,0,0,0,0 +units=m +no_defs");
  2137   2137       add_srs_wkt (p, 0,
  2138   2138           "PROJCS[\"Kalianpur 1937 / UTM zone 45N\",GEOGCS[\"Kalian");
  2139   2139       add_srs_wkt (p, 1,
  2140   2140           "pur 1937\",DATUM[\"Kalianpur_1937\",SPHEROID[\"Everest 1");
  2141   2141       add_srs_wkt (p, 2,
  2142   2142           "830 (1937 Adjustment)\",6377276.345,300.8017,AUTHORITY[\"");
  2143   2143       add_srs_wkt (p, 3,
................................................................................
  2164   2164           "\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"24305\"]]");
  2165   2165       p = add_epsg_def_ex (filter, first, last, 24306, "epsg", 24306,
  2166   2166           "Kalianpur 1937 / UTM zone 46N", 0, 0,
  2167   2167           "Everest 1830 (1937 Adjustment)", "Greenwich",
  2168   2168           "Kalianpur_1937", "Transverse_Mercator", "metre",
  2169   2169           "Easting", "East", "Northing", "North");
  2170   2170       add_proj4text (p, 0,
  2171         -        "+proj=utm +zone=46 +a=6377276.345 +b=6356075.413140239 +");
         2171  +        "+proj=utm +zone=46 +a=6377276.345 +b=6356075.41314024 +t");
  2172   2172       add_proj4text (p, 1,
  2173         -        "towgs84=214,804,268,0,0,0,0 +units=m +no_defs");
         2173  +        "owgs84=214,804,268,0,0,0,0 +units=m +no_defs");
  2174   2174       add_srs_wkt (p, 0,
  2175   2175           "PROJCS[\"Kalianpur 1937 / UTM zone 46N\",GEOGCS[\"Kalian");
  2176   2176       add_srs_wkt (p, 1,
  2177   2177           "pur 1937\",DATUM[\"Kalianpur_1937\",SPHEROID[\"Everest 1");
  2178   2178       add_srs_wkt (p, 2,
  2179   2179           "830 (1937 Adjustment)\",6377276.345,300.8017,AUTHORITY[\"");
  2180   2180       add_srs_wkt (p, 3,
................................................................................
  2201   2201           "\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"24306\"]]");
  2202   2202       p = add_epsg_def_ex (filter, first, last, 24311, "epsg", 24311,
  2203   2203           "Kalianpur 1962 / UTM zone 41N", 0, 0,
  2204   2204           "Everest 1830 (1962 Definition)", "Greenwich",
  2205   2205           "Kalianpur_1962", "Transverse_Mercator", "metre",
  2206   2206           "Easting", "East", "Northing", "North");
  2207   2207       add_proj4text (p, 0,
  2208         -        "+proj=utm +zone=41 +a=6377301.243 +b=6356100.230165385 +");
         2208  +        "+proj=utm +zone=41 +a=6377301.243 +b=6356100.230165384 +");
  2209   2209       add_proj4text (p, 1,
  2210   2210           "towgs84=283,682,231,0,0,0,0 +units=m +no_defs");
  2211   2211       add_srs_wkt (p, 0,
  2212   2212           "PROJCS[\"Kalianpur 1962 / UTM zone 41N\",GEOGCS[\"Kalian");
  2213   2213       add_srs_wkt (p, 1,
  2214   2214           "pur 1962\",DATUM[\"Kalianpur_1962\",SPHEROID[\"Everest 1");
  2215   2215       add_srs_wkt (p, 2,
................................................................................
  2238   2238           "XIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"24311\"]]");
  2239   2239       p = add_epsg_def_ex (filter, first, last, 24312, "epsg", 24312,
  2240   2240           "Kalianpur 1962 / UTM zone 42N", 0, 0,
  2241   2241           "Everest 1830 (1962 Definition)", "Greenwich",
  2242   2242           "Kalianpur_1962", "Transverse_Mercator", "metre",
  2243   2243           "Easting", "East", "Northing", "North");
  2244   2244       add_proj4text (p, 0,
  2245         -        "+proj=utm +zone=42 +a=6377301.243 +b=6356100.230165385 +");
         2245  +        "+proj=utm +zone=42 +a=6377301.243 +b=6356100.230165384 +");
  2246   2246       add_proj4text (p, 1,
  2247   2247           "towgs84=283,682,231,0,0,0,0 +units=m +no_defs");
  2248   2248       add_srs_wkt (p, 0,
  2249   2249           "PROJCS[\"Kalianpur 1962 / UTM zone 42N\",GEOGCS[\"Kalian");
  2250   2250       add_srs_wkt (p, 1,
  2251   2251           "pur 1962\",DATUM[\"Kalianpur_1962\",SPHEROID[\"Everest 1");
  2252   2252       add_srs_wkt (p, 2,
................................................................................
  2275   2275           "XIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"24312\"]]");
  2276   2276       p = add_epsg_def_ex (filter, first, last, 24313, "epsg", 24313,
  2277   2277           "Kalianpur 1962 / UTM zone 43N", 0, 0,
  2278   2278           "Everest 1830 (1962 Definition)", "Greenwich",
  2279   2279           "Kalianpur_1962", "Transverse_Mercator", "metre",
  2280   2280           "Easting", "East", "Northing", "North");
  2281   2281       add_proj4text (p, 0,
  2282         -        "+proj=utm +zone=43 +a=6377301.243 +b=6356100.230165385 +");
         2282  +        "+proj=utm +zone=43 +a=6377301.243 +b=6356100.230165384 +");
  2283   2283       add_proj4text (p, 1,
  2284   2284           "towgs84=283,682,231,0,0,0,0 +units=m +no_defs");
  2285   2285       add_srs_wkt (p, 0,
  2286   2286           "PROJCS[\"Kalianpur 1962 / UTM zone 43N\",GEOGCS[\"Kalian");
  2287   2287       add_srs_wkt (p, 1,
  2288   2288           "pur 1962\",DATUM[\"Kalianpur_1962\",SPHEROID[\"Everest 1");
  2289   2289       add_srs_wkt (p, 2,
................................................................................
  2546   2546       add_proj4text (p, 3,
  2547   2547           "444408 +no_defs");
  2548   2548       add_srs_wkt (p, 0,
  2549   2549           "PROJCS[\"Kalianpur 1880 / India zone 0\",GEOGCS[\"Kalian");
  2550   2550       add_srs_wkt (p, 1,
  2551   2551           "pur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everest (");
  2552   2552       add_srs_wkt (p, 2,
  2553         -        "1830 Definition)\",6377299.36559538,300.8017255433549,AU");
         2553  +        "1830 Definition)\",6377299.36559538,300.8017255433552,AU");
  2554   2554       add_srs_wkt (p, 3,
  2555   2555           "THORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243\"]");
  2556   2556       add_srs_wkt (p, 4,
  2557   2557           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2558   2558       add_srs_wkt (p, 5,
  2559   2559           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2560   2560       add_srs_wkt (p, 6,
................................................................................
  2589   2589       add_proj4text (p, 3,
  2590   2590           "7444408 +no_defs");
  2591   2591       add_srs_wkt (p, 0,
  2592   2592           "PROJCS[\"Kalianpur 1880 / India zone I\",GEOGCS[\"Kalian");
  2593   2593       add_srs_wkt (p, 1,
  2594   2594           "pur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everest (");
  2595   2595       add_srs_wkt (p, 2,
  2596         -        "1830 Definition)\",6377299.36559538,300.8017255433549,AU");
         2596  +        "1830 Definition)\",6377299.36559538,300.8017255433552,AU");
  2597   2597       add_srs_wkt (p, 3,
  2598   2598           "THORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243\"]");
  2599   2599       add_srs_wkt (p, 4,
  2600   2600           "],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],U");
  2601   2601       add_srs_wkt (p, 5,
  2602   2602           "NIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9");
  2603   2603       add_srs_wkt (p, 6,
................................................................................
  2632   2632       add_proj4text (p, 3,
  2633   2633           "408 +no_defs");
  2634   2634       add_srs_wkt (p, 0,
  2635   2635           "PROJCS[\"Kalianpur 1880 / India zone IIa\",GEOGCS[\"Kali");
  2636   2636       add_srs_wkt (p, 1,
  2637   2637           "anpur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everest");
  2638   2638       add_srs_wkt (p, 2,
  2639         -        " (1830 Definition)\",6377299.36559538,300.8017255433549,");
         2639  +        " (1830 Definition)\",6377299.36559538,300.8017255433552,");
  2640   2640       add_srs_wkt (p, 3,
  2641   2641           "AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243\"");
  2642   2642       add_srs_wkt (p, 4,
  2643   2643           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  2644   2644       add_srs_wkt (p, 5,
  2645   2645           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  2646   2646       add_srs_wkt (p, 6,
................................................................................
  2675   2675       add_proj4text (p, 3,
  2676   2676           "408 +no_defs");
  2677   2677       add_srs_wkt (p, 0,
  2678   2678           "PROJCS[\"Kalianpur 1880 / India zone IIIa\",GEOGCS[\"Kal");
  2679   2679       add_srs_wkt (p, 1,
  2680   2680           "ianpur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everes");
  2681   2681       add_srs_wkt (p, 2,
  2682         -        "t (1830 Definition)\",6377299.36559538,300.8017255433549");
         2682  +        "t (1830 Definition)\",6377299.36559538,300.8017255433552");
  2683   2683       add_srs_wkt (p, 3,
  2684   2684           ",AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243");
  2685   2685       add_srs_wkt (p, 4,
  2686   2686           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
  2687   2687       add_srs_wkt (p, 5,
  2688   2688           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
  2689   2689       add_srs_wkt (p, 6,
................................................................................
  2718   2718       add_proj4text (p, 3,
  2719   2719           "408 +no_defs");
  2720   2720       add_srs_wkt (p, 0,
  2721   2721           "PROJCS[\"Kalianpur 1880 / India zone IVa\",GEOGCS[\"Kali");
  2722   2722       add_srs_wkt (p, 1,
  2723   2723           "anpur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everest");
  2724   2724       add_srs_wkt (p, 2,
  2725         -        " (1830 Definition)\",6377299.36559538,300.8017255433549,");
         2725  +        " (1830 Definition)\",6377299.36559538,300.8017255433552,");
  2726   2726       add_srs_wkt (p, 3,
  2727   2727           "AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243\"");
  2728   2728       add_srs_wkt (p, 4,
  2729   2729           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  2730   2730       add_srs_wkt (p, 5,
  2731   2731           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  2732   2732       add_srs_wkt (p, 6,
................................................................................
  2753   2753           "Kalianpur_1937", "Lambert_Conformal_Conic_1SP", "metre",
  2754   2754           "Easting", "East", "Northing", "North");
  2755   2755       add_proj4text (p, 0,
  2756   2756           "+proj=lcc +lat_1=26 +lat_0=26 +lon_0=90 +k_0=0.99878641 ");
  2757   2757       add_proj4text (p, 1,
  2758   2758           "+x_0=2743185.69 +y_0=914395.23 +a=6377276.345 +b=6356075");
  2759   2759       add_proj4text (p, 2,
  2760         -        ".413140239 +towgs84=214,804,268,0,0,0,0 +units=m +no_def");
  2761         -    add_proj4text (p, 3,
  2762         -        "s");
         2760  +        ".41314024 +towgs84=214,804,268,0,0,0,0 +units=m +no_defs");
  2763   2761       add_srs_wkt (p, 0,
  2764   2762           "PROJCS[\"Kalianpur 1937 / India zone IIb\",GEOGCS[\"Kali");
  2765   2763       add_srs_wkt (p, 1,
  2766   2764           "anpur 1937\",DATUM[\"Kalianpur_1937\",SPHEROID[\"Everest");
  2767   2765       add_srs_wkt (p, 2,
  2768   2766           " 1830 (1937 Adjustment)\",6377276.345,300.8017,AUTHORITY");
  2769   2767       add_srs_wkt (p, 3,
................................................................................
  2796   2794           "Kalianpur_1962", "Lambert_Conformal_Conic_1SP", "metre",
  2797   2795           "Easting", "East", "Northing", "North");
  2798   2796       add_proj4text (p, 0,
  2799   2797           "+proj=lcc +lat_1=32.5 +lat_0=32.5 +lon_0=68 +k_0=0.99878");
  2800   2798       add_proj4text (p, 1,
  2801   2799           "641 +x_0=2743196.4 +y_0=914398.8 +a=6377301.243 +b=63561");
  2802   2800       add_proj4text (p, 2,
  2803         -        "00.230165385 +towgs84=283,682,231,0,0,0,0 +units=m +no_d");
         2801  +        "00.230165384 +towgs84=283,682,231,0,0,0,0 +units=m +no_d");
  2804   2802       add_proj4text (p, 3,
  2805   2803           "efs");
  2806   2804       add_srs_wkt (p, 0,
  2807   2805           "PROJCS[\"Kalianpur 1962 / India zone I\",GEOGCS[\"Kalian");
  2808   2806       add_srs_wkt (p, 1,
  2809   2807           "pur 1962\",DATUM[\"Kalianpur_1962\",SPHEROID[\"Everest 1");
  2810   2808       add_srs_wkt (p, 2,
................................................................................
  2839   2837           "Kalianpur_1962", "Lambert_Conformal_Conic_1SP", "metre",
  2840   2838           "Easting", "East", "Northing", "North");
  2841   2839       add_proj4text (p, 0,
  2842   2840           "+proj=lcc +lat_1=26 +lat_0=26 +lon_0=74 +k_0=0.99878641 ");
  2843   2841       add_proj4text (p, 1,
  2844   2842           "+x_0=2743196.4 +y_0=914398.8 +a=6377301.243 +b=6356100.2");
  2845   2843       add_proj4text (p, 2,
  2846         -        "30165385 +towgs84=283,682,231,0,0,0,0 +units=m +no_defs");
         2844  +        "30165384 +towgs84=283,682,231,0,0,0,0 +units=m +no_defs");
  2847   2845       add_srs_wkt (p, 0,
  2848   2846           "PROJCS[\"Kalianpur 1962 / India zone IIa\",GEOGCS[\"Kali");
  2849   2847       add_srs_wkt (p, 1,
  2850   2848           "anpur 1962\",DATUM[\"Kalianpur_1962\",SPHEROID[\"Everest");
  2851   2849       add_srs_wkt (p, 2,
  2852   2850           " 1830 (1962 Definition)\",6377301.243,300.8017255,AUTHOR");
  2853   2851       add_srs_wkt (p, 3,
................................................................................
  3054   3052       add_proj4text (p, 3,
  3055   3053           "408 +no_defs");
  3056   3054       add_srs_wkt (p, 0,
  3057   3055           "PROJCS[\"Kalianpur 1880 / India zone IIb\",GEOGCS[\"Kali");
  3058   3056       add_srs_wkt (p, 1,
  3059   3057           "anpur 1880\",DATUM[\"Kalianpur_1880\",SPHEROID[\"Everest");
  3060   3058       add_srs_wkt (p, 2,
  3061         -        " (1830 Definition)\",6377299.36559538,300.8017255433549,");
         3059  +        " (1830 Definition)\",6377299.36559538,300.8017255433552,");
  3062   3060       add_srs_wkt (p, 3,
  3063   3061           "AUTHORITY[\"EPSG\",\"7042\"]],AUTHORITY[\"EPSG\",\"6243\"");
  3064   3062       add_srs_wkt (p, 4,
  3065   3063           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  3066   3064       add_srs_wkt (p, 5,
  3067   3065           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  3068   3066       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_37.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   142    142       add_proj4text (p, 1,
   143    143           "defs");
   144    144       add_srs_wkt (p, 0,
   145    145           "PROJCS[\"Lome / UTM zone 31N\",GEOGCS[\"Lome\",DATUM[\"L");
   146    146       add_srs_wkt (p, 1,
   147    147           "ome\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602");
   148    148       add_srs_wkt (p, 2,
   149         -        "12936269,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\"");
          149  +        "12936265,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\"");
   150    150       add_srs_wkt (p, 3,
   151    151           ",\"6252\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   152    152       add_srs_wkt (p, 4,
   153    153           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   154    154       add_srs_wkt (p, 5,
   155    155           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   156    156       add_srs_wkt (p, 6,
................................................................................
   179    179       add_proj4text (p, 2,
   180    180           "=m +no_defs");
   181    181       add_srs_wkt (p, 0,
   182    182           "PROJCS[\"Luzon 1911 / Philippines zone I\",GEOGCS[\"Luzo");
   183    183       add_srs_wkt (p, 1,
   184    184           "n 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Clarke 1866\",6");
   185    185       add_srs_wkt (p, 2,
   186         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          186  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   187    187       add_srs_wkt (p, 3,
   188    188           ",TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"EPSG\",\"6253");
   189    189       add_srs_wkt (p, 4,
   190    190           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
   191    191       add_srs_wkt (p, 5,
   192    192           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
   193    193       add_srs_wkt (p, 6,
................................................................................
   218    218       add_proj4text (p, 2,
   219    219           "=m +no_defs");
   220    220       add_srs_wkt (p, 0,
   221    221           "PROJCS[\"Luzon 1911 / Philippines zone II\",GEOGCS[\"Luz");
   222    222       add_srs_wkt (p, 1,
   223    223           "on 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Clarke 1866\",");
   224    224       add_srs_wkt (p, 2,
   225         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          225  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   226    226       add_srs_wkt (p, 3,
   227    227           "],TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"EPSG\",\"625");
   228    228       add_srs_wkt (p, 4,
   229    229           "3\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   230    230       add_srs_wkt (p, 5,
   231    231           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   232    232       add_srs_wkt (p, 6,
................................................................................
   257    257       add_proj4text (p, 2,
   258    258           "=m +no_defs");
   259    259       add_srs_wkt (p, 0,
   260    260           "PROJCS[\"Luzon 1911 / Philippines zone III\",GEOGCS[\"Lu");
   261    261       add_srs_wkt (p, 1,
   262    262           "zon 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Clarke 1866\"");
   263    263       add_srs_wkt (p, 2,
   264         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          264  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   265    265       add_srs_wkt (p, 3,
   266    266           "]],TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"EPSG\",\"62");
   267    267       add_srs_wkt (p, 4,
   268    268           "53\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   269    269       add_srs_wkt (p, 5,
   270    270           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   271    271       add_srs_wkt (p, 6,
................................................................................
   296    296       add_proj4text (p, 2,
   297    297           "=m +no_defs");
   298    298       add_srs_wkt (p, 0,
   299    299           "PROJCS[\"Luzon 1911 / Philippines zone IV\",GEOGCS[\"Luz");
   300    300       add_srs_wkt (p, 1,
   301    301           "on 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Clarke 1866\",");
   302    302       add_srs_wkt (p, 2,
   303         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          303  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   304    304       add_srs_wkt (p, 3,
   305    305           "],TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"EPSG\",\"625");
   306    306       add_srs_wkt (p, 4,
   307    307           "3\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"");
   308    308       add_srs_wkt (p, 5,
   309    309           "]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\"");
   310    310       add_srs_wkt (p, 6,
................................................................................
   335    335       add_proj4text (p, 2,
   336    336           "=m +no_defs");
   337    337       add_srs_wkt (p, 0,
   338    338           "PROJCS[\"Luzon 1911 / Philippines zone V\",GEOGCS[\"Luzo");
   339    339       add_srs_wkt (p, 1,
   340    340           "n 1911\",DATUM[\"Luzon_1911\",SPHEROID[\"Clarke 1866\",6");
   341    341       add_srs_wkt (p, 2,
   342         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          342  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   343    343       add_srs_wkt (p, 3,
   344    344           ",TOWGS84[-133,-77,-51,0,0,0,0],AUTHORITY[\"EPSG\",\"6253");
   345    345       add_srs_wkt (p, 4,
   346    346           "\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]");
   347    347       add_srs_wkt (p, 5,
   348    348           "],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",");
   349    349       add_srs_wkt (p, 6,
................................................................................
   896    896       add_proj4text (p, 2,
   897    897           "towgs84=31,146,47,0,0,0,0 +units=m +no_defs");
   898    898       add_srs_wkt (p, 0,
   899    899           "PROJCS[\"Merchich / Nord Maroc\",GEOGCS[\"Merchich\",DAT");
   900    900       add_srs_wkt (p, 1,
   901    901           "UM[\"Merchich\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2");
   902    902       add_srs_wkt (p, 2,
   903         -        ",293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
          903  +        ",293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
   904    904       add_srs_wkt (p, 3,
   905    905           "[31,146,47,0,0,0,0],AUTHORITY[\"EPSG\",\"6261\"]],PRIMEM");
   906    906       add_srs_wkt (p, 4,
   907    907           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
   908    908       add_srs_wkt (p, 5,
   909    909           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
   910    910       add_srs_wkt (p, 6,
................................................................................
   935    935       add_proj4text (p, 2,
   936    936           "56515 +towgs84=31,146,47,0,0,0,0 +units=m +no_defs");
   937    937       add_srs_wkt (p, 0,
   938    938           "PROJCS[\"Merchich / Sud Maroc\",GEOGCS[\"Merchich\",DATU");
   939    939       add_srs_wkt (p, 1,
   940    940           "M[\"Merchich\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,");
   941    941       add_srs_wkt (p, 2,
   942         -        "293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[");
          942  +        "293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[");
   943    943       add_srs_wkt (p, 3,
   944    944           "31,146,47,0,0,0,0],AUTHORITY[\"EPSG\",\"6261\"]],PRIMEM[");
   945    945       add_srs_wkt (p, 4,
   946    946           "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
   947    947       add_srs_wkt (p, 5,
   948    948           "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
   949    949       add_srs_wkt (p, 6,
................................................................................
   974    974       add_proj4text (p, 2,
   975    975           "s84=31,146,47,0,0,0,0 +units=m +no_defs");
   976    976       add_srs_wkt (p, 0,
   977    977           "PROJCS[\"Merchich / Sahara (deprecated)\",GEOGCS[\"Merch");
   978    978       add_srs_wkt (p, 1,
   979    979           "ich\",DATUM[\"Merchich\",SPHEROID[\"Clarke 1880 (IGN)\",");
   980    980       add_srs_wkt (p, 2,
   981         -        "6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]");
          981  +        "6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]");
   982    982       add_srs_wkt (p, 3,
   983    983           "],TOWGS84[31,146,47,0,0,0,0],AUTHORITY[\"EPSG\",\"6261\"");
   984    984       add_srs_wkt (p, 4,
   985    985           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
   986    986       add_srs_wkt (p, 5,
   987    987           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
   988    988       add_srs_wkt (p, 6,
................................................................................
  1013   1013       add_proj4text (p, 2,
  1014   1014           "+towgs84=31,146,47,0,0,0,0 +units=m +no_defs");
  1015   1015       add_srs_wkt (p, 0,
  1016   1016           "PROJCS[\"Merchich / Sahara Nord\",GEOGCS[\"Merchich\",DA");
  1017   1017       add_srs_wkt (p, 1,
  1018   1018           "TUM[\"Merchich\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.");
  1019   1019       add_srs_wkt (p, 2,
  1020         -        "2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS8");
         1020  +        "2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS8");
  1021   1021       add_srs_wkt (p, 3,
  1022   1022           "4[31,146,47,0,0,0,0],AUTHORITY[\"EPSG\",\"6261\"]],PRIME");
  1023   1023       add_srs_wkt (p, 4,
  1024   1024           "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
  1025   1025       add_srs_wkt (p, 5,
  1026   1026           "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
  1027   1027       add_srs_wkt (p, 6,
................................................................................
  1052   1052       add_proj4text (p, 2,
  1053   1053           "+towgs84=31,146,47,0,0,0,0 +units=m +no_defs");
  1054   1054       add_srs_wkt (p, 0,
  1055   1055           "PROJCS[\"Merchich / Sahara Sud\",GEOGCS[\"Merchich\",DAT");
  1056   1056       add_srs_wkt (p, 1,
  1057   1057           "UM[\"Merchich\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2");
  1058   1058       add_srs_wkt (p, 2,
  1059         -        ",293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
         1059  +        ",293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84");
  1060   1060       add_srs_wkt (p, 3,
  1061   1061           "[31,146,47,0,0,0,0],AUTHORITY[\"EPSG\",\"6261\"]],PRIMEM");
  1062   1062       add_srs_wkt (p, 4,
  1063   1063           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  1064   1064       add_srs_wkt (p, 5,
  1065   1065           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  1066   1066       add_srs_wkt (p, 6,
................................................................................
  1436   1436       add_proj4text (p, 1,
  1437   1437           "-130,42,0,0,0,0 +units=m +no_defs");
  1438   1438       add_srs_wkt (p, 0,
  1439   1439           "PROJCS[\"M'poraloko / UTM zone 32N\",GEOGCS[\"M'poraloko");
  1440   1440       add_srs_wkt (p, 1,
  1441   1441           "\",DATUM[\"M_poraloko\",SPHEROID[\"Clarke 1880 (IGN)\",6");
  1442   1442       add_srs_wkt (p, 2,
  1443         -        "378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]]");
         1443  +        "378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]]");
  1444   1444       add_srs_wkt (p, 3,
  1445   1445           ",TOWGS84[-74,-130,42,0,0,0,0],AUTHORITY[\"EPSG\",\"6266\"");
  1446   1446       add_srs_wkt (p, 4,
  1447   1447           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  1448   1448       add_srs_wkt (p, 5,
  1449   1449           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  1450   1450       add_srs_wkt (p, 6,
................................................................................
  1473   1473       add_proj4text (p, 1,
  1474   1474           "84=-74,-130,42,0,0,0,0 +units=m +no_defs");
  1475   1475       add_srs_wkt (p, 0,
  1476   1476           "PROJCS[\"M'poraloko / UTM zone 32S\",GEOGCS[\"M'poraloko");
  1477   1477       add_srs_wkt (p, 1,
  1478   1478           "\",DATUM[\"M_poraloko\",SPHEROID[\"Clarke 1880 (IGN)\",6");
  1479   1479       add_srs_wkt (p, 2,
  1480         -        "378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]]");
         1480  +        "378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]]");
  1481   1481       add_srs_wkt (p, 3,
  1482   1482           ",TOWGS84[-74,-130,42,0,0,0,0],AUTHORITY[\"EPSG\",\"6266\"");
  1483   1483       add_srs_wkt (p, 4,
  1484   1484           "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
  1485   1485       add_srs_wkt (p, 5,
  1486   1486           "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
  1487   1487       add_srs_wkt (p, 6,
................................................................................
  1508   1508       add_proj4text (p, 0,
  1509   1509           "+proj=utm +zone=1 +datum=NAD27 +units=m +no_defs");
  1510   1510       add_srs_wkt (p, 0,
  1511   1511           "PROJCS[\"NAD27 / UTM zone 1N\",GEOGCS[\"NAD27\",DATUM[\"");
  1512   1512       add_srs_wkt (p, 1,
  1513   1513           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1514   1514       add_srs_wkt (p, 2,
  1515         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1515  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1516   1516       add_srs_wkt (p, 3,
  1517   1517           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1518   1518       add_srs_wkt (p, 4,
  1519   1519           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1520   1520       add_srs_wkt (p, 5,
  1521   1521           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1522   1522       add_srs_wkt (p, 6,
................................................................................
  1543   1543       add_proj4text (p, 0,
  1544   1544           "+proj=utm +zone=2 +datum=NAD27 +units=m +no_defs");
  1545   1545       add_srs_wkt (p, 0,
  1546   1546           "PROJCS[\"NAD27 / UTM zone 2N\",GEOGCS[\"NAD27\",DATUM[\"");
  1547   1547       add_srs_wkt (p, 1,
  1548   1548           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1549   1549       add_srs_wkt (p, 2,
  1550         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1550  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1551   1551       add_srs_wkt (p, 3,
  1552   1552           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1553   1553       add_srs_wkt (p, 4,
  1554   1554           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1555   1555       add_srs_wkt (p, 5,
  1556   1556           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1557   1557       add_srs_wkt (p, 6,
................................................................................
  1578   1578       add_proj4text (p, 0,
  1579   1579           "+proj=utm +zone=3 +datum=NAD27 +units=m +no_defs");
  1580   1580       add_srs_wkt (p, 0,
  1581   1581           "PROJCS[\"NAD27 / UTM zone 3N\",GEOGCS[\"NAD27\",DATUM[\"");
  1582   1582       add_srs_wkt (p, 1,
  1583   1583           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1584   1584       add_srs_wkt (p, 2,
  1585         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1585  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1586   1586       add_srs_wkt (p, 3,
  1587   1587           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1588   1588       add_srs_wkt (p, 4,
  1589   1589           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1590   1590       add_srs_wkt (p, 5,
  1591   1591           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1592   1592       add_srs_wkt (p, 6,
................................................................................
  1613   1613       add_proj4text (p, 0,
  1614   1614           "+proj=utm +zone=4 +datum=NAD27 +units=m +no_defs");
  1615   1615       add_srs_wkt (p, 0,
  1616   1616           "PROJCS[\"NAD27 / UTM zone 4N\",GEOGCS[\"NAD27\",DATUM[\"");
  1617   1617       add_srs_wkt (p, 1,
  1618   1618           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1619   1619       add_srs_wkt (p, 2,
  1620         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1620  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1621   1621       add_srs_wkt (p, 3,
  1622   1622           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1623   1623       add_srs_wkt (p, 4,
  1624   1624           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1625   1625       add_srs_wkt (p, 5,
  1626   1626           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1627   1627       add_srs_wkt (p, 6,
................................................................................
  1648   1648       add_proj4text (p, 0,
  1649   1649           "+proj=utm +zone=5 +datum=NAD27 +units=m +no_defs");
  1650   1650       add_srs_wkt (p, 0,
  1651   1651           "PROJCS[\"NAD27 / UTM zone 5N\",GEOGCS[\"NAD27\",DATUM[\"");
  1652   1652       add_srs_wkt (p, 1,
  1653   1653           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1654   1654       add_srs_wkt (p, 2,
  1655         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1655  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1656   1656       add_srs_wkt (p, 3,
  1657   1657           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1658   1658       add_srs_wkt (p, 4,
  1659   1659           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1660   1660       add_srs_wkt (p, 5,
  1661   1661           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1662   1662       add_srs_wkt (p, 6,
................................................................................
  1683   1683       add_proj4text (p, 0,
  1684   1684           "+proj=utm +zone=6 +datum=NAD27 +units=m +no_defs");
  1685   1685       add_srs_wkt (p, 0,
  1686   1686           "PROJCS[\"NAD27 / UTM zone 6N\",GEOGCS[\"NAD27\",DATUM[\"");
  1687   1687       add_srs_wkt (p, 1,
  1688   1688           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1689   1689       add_srs_wkt (p, 2,
  1690         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1690  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1691   1691       add_srs_wkt (p, 3,
  1692   1692           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1693   1693       add_srs_wkt (p, 4,
  1694   1694           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1695   1695       add_srs_wkt (p, 5,
  1696   1696           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1697   1697       add_srs_wkt (p, 6,
................................................................................
  1718   1718       add_proj4text (p, 0,
  1719   1719           "+proj=utm +zone=7 +datum=NAD27 +units=m +no_defs");
  1720   1720       add_srs_wkt (p, 0,
  1721   1721           "PROJCS[\"NAD27 / UTM zone 7N\",GEOGCS[\"NAD27\",DATUM[\"");
  1722   1722       add_srs_wkt (p, 1,
  1723   1723           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1724   1724       add_srs_wkt (p, 2,
  1725         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1725  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1726   1726       add_srs_wkt (p, 3,
  1727   1727           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1728   1728       add_srs_wkt (p, 4,
  1729   1729           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1730   1730       add_srs_wkt (p, 5,
  1731   1731           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1732   1732       add_srs_wkt (p, 6,
................................................................................
  1753   1753       add_proj4text (p, 0,
  1754   1754           "+proj=utm +zone=8 +datum=NAD27 +units=m +no_defs");
  1755   1755       add_srs_wkt (p, 0,
  1756   1756           "PROJCS[\"NAD27 / UTM zone 8N\",GEOGCS[\"NAD27\",DATUM[\"");
  1757   1757       add_srs_wkt (p, 1,
  1758   1758           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1759   1759       add_srs_wkt (p, 2,
  1760         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1760  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1761   1761       add_srs_wkt (p, 3,
  1762   1762           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1763   1763       add_srs_wkt (p, 4,
  1764   1764           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1765   1765       add_srs_wkt (p, 5,
  1766   1766           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1767   1767       add_srs_wkt (p, 6,
................................................................................
  1788   1788       add_proj4text (p, 0,
  1789   1789           "+proj=utm +zone=9 +datum=NAD27 +units=m +no_defs");
  1790   1790       add_srs_wkt (p, 0,
  1791   1791           "PROJCS[\"NAD27 / UTM zone 9N\",GEOGCS[\"NAD27\",DATUM[\"");
  1792   1792       add_srs_wkt (p, 1,
  1793   1793           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1794   1794       add_srs_wkt (p, 2,
  1795         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1795  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1796   1796       add_srs_wkt (p, 3,
  1797   1797           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1798   1798       add_srs_wkt (p, 4,
  1799   1799           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1800   1800       add_srs_wkt (p, 5,
  1801   1801           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1802   1802       add_srs_wkt (p, 6,
................................................................................
  1823   1823       add_proj4text (p, 0,
  1824   1824           "+proj=utm +zone=10 +datum=NAD27 +units=m +no_defs");
  1825   1825       add_srs_wkt (p, 0,
  1826   1826           "PROJCS[\"NAD27 / UTM zone 10N\",GEOGCS[\"NAD27\",DATUM[\"");
  1827   1827       add_srs_wkt (p, 1,
  1828   1828           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1829   1829       add_srs_wkt (p, 2,
  1830         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1830  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1831   1831       add_srs_wkt (p, 3,
  1832   1832           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1833   1833       add_srs_wkt (p, 4,
  1834   1834           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1835   1835       add_srs_wkt (p, 5,
  1836   1836           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1837   1837       add_srs_wkt (p, 6,
................................................................................
  1858   1858       add_proj4text (p, 0,
  1859   1859           "+proj=utm +zone=11 +datum=NAD27 +units=m +no_defs");
  1860   1860       add_srs_wkt (p, 0,
  1861   1861           "PROJCS[\"NAD27 / UTM zone 11N\",GEOGCS[\"NAD27\",DATUM[\"");
  1862   1862       add_srs_wkt (p, 1,
  1863   1863           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1864   1864       add_srs_wkt (p, 2,
  1865         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1865  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1866   1866       add_srs_wkt (p, 3,
  1867   1867           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1868   1868       add_srs_wkt (p, 4,
  1869   1869           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1870   1870       add_srs_wkt (p, 5,
  1871   1871           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1872   1872       add_srs_wkt (p, 6,
................................................................................
  1893   1893       add_proj4text (p, 0,
  1894   1894           "+proj=utm +zone=12 +datum=NAD27 +units=m +no_defs");
  1895   1895       add_srs_wkt (p, 0,
  1896   1896           "PROJCS[\"NAD27 / UTM zone 12N\",GEOGCS[\"NAD27\",DATUM[\"");
  1897   1897       add_srs_wkt (p, 1,
  1898   1898           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1899   1899       add_srs_wkt (p, 2,
  1900         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1900  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1901   1901       add_srs_wkt (p, 3,
  1902   1902           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1903   1903       add_srs_wkt (p, 4,
  1904   1904           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1905   1905       add_srs_wkt (p, 5,
  1906   1906           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1907   1907       add_srs_wkt (p, 6,
................................................................................
  1928   1928       add_proj4text (p, 0,
  1929   1929           "+proj=utm +zone=13 +datum=NAD27 +units=m +no_defs");
  1930   1930       add_srs_wkt (p, 0,
  1931   1931           "PROJCS[\"NAD27 / UTM zone 13N\",GEOGCS[\"NAD27\",DATUM[\"");
  1932   1932       add_srs_wkt (p, 1,
  1933   1933           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1934   1934       add_srs_wkt (p, 2,
  1935         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1935  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1936   1936       add_srs_wkt (p, 3,
  1937   1937           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1938   1938       add_srs_wkt (p, 4,
  1939   1939           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1940   1940       add_srs_wkt (p, 5,
  1941   1941           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1942   1942       add_srs_wkt (p, 6,
................................................................................
  1963   1963       add_proj4text (p, 0,
  1964   1964           "+proj=utm +zone=14 +datum=NAD27 +units=m +no_defs");
  1965   1965       add_srs_wkt (p, 0,
  1966   1966           "PROJCS[\"NAD27 / UTM zone 14N\",GEOGCS[\"NAD27\",DATUM[\"");
  1967   1967       add_srs_wkt (p, 1,
  1968   1968           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1969   1969       add_srs_wkt (p, 2,
  1970         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1970  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1971   1971       add_srs_wkt (p, 3,
  1972   1972           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1973   1973       add_srs_wkt (p, 4,
  1974   1974           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1975   1975       add_srs_wkt (p, 5,
  1976   1976           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1977   1977       add_srs_wkt (p, 6,
................................................................................
  1998   1998       add_proj4text (p, 0,
  1999   1999           "+proj=utm +zone=15 +datum=NAD27 +units=m +no_defs");
  2000   2000       add_srs_wkt (p, 0,
  2001   2001           "PROJCS[\"NAD27 / UTM zone 15N\",GEOGCS[\"NAD27\",DATUM[\"");
  2002   2002       add_srs_wkt (p, 1,
  2003   2003           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2004   2004       add_srs_wkt (p, 2,
  2005         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2005  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2006   2006       add_srs_wkt (p, 3,
  2007   2007           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2008   2008       add_srs_wkt (p, 4,
  2009   2009           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2010   2010       add_srs_wkt (p, 5,
  2011   2011           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2012   2012       add_srs_wkt (p, 6,
................................................................................
  2033   2033       add_proj4text (p, 0,
  2034   2034           "+proj=utm +zone=16 +datum=NAD27 +units=m +no_defs");
  2035   2035       add_srs_wkt (p, 0,
  2036   2036           "PROJCS[\"NAD27 / UTM zone 16N\",GEOGCS[\"NAD27\",DATUM[\"");
  2037   2037       add_srs_wkt (p, 1,
  2038   2038           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2039   2039       add_srs_wkt (p, 2,
  2040         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2040  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2041   2041       add_srs_wkt (p, 3,
  2042   2042           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2043   2043       add_srs_wkt (p, 4,
  2044   2044           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2045   2045       add_srs_wkt (p, 5,
  2046   2046           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2047   2047       add_srs_wkt (p, 6,
................................................................................
  2068   2068       add_proj4text (p, 0,
  2069   2069           "+proj=utm +zone=17 +datum=NAD27 +units=m +no_defs");
  2070   2070       add_srs_wkt (p, 0,
  2071   2071           "PROJCS[\"NAD27 / UTM zone 17N\",GEOGCS[\"NAD27\",DATUM[\"");
  2072   2072       add_srs_wkt (p, 1,
  2073   2073           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2074   2074       add_srs_wkt (p, 2,
  2075         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2075  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2076   2076       add_srs_wkt (p, 3,
  2077   2077           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2078   2078       add_srs_wkt (p, 4,
  2079   2079           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2080   2080       add_srs_wkt (p, 5,
  2081   2081           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2082   2082       add_srs_wkt (p, 6,
................................................................................
  2103   2103       add_proj4text (p, 0,
  2104   2104           "+proj=utm +zone=18 +datum=NAD27 +units=m +no_defs");
  2105   2105       add_srs_wkt (p, 0,
  2106   2106           "PROJCS[\"NAD27 / UTM zone 18N\",GEOGCS[\"NAD27\",DATUM[\"");
  2107   2107       add_srs_wkt (p, 1,
  2108   2108           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2109   2109       add_srs_wkt (p, 2,
  2110         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2110  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2111   2111       add_srs_wkt (p, 3,
  2112   2112           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2113   2113       add_srs_wkt (p, 4,
  2114   2114           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2115   2115       add_srs_wkt (p, 5,
  2116   2116           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2117   2117       add_srs_wkt (p, 6,
................................................................................
  2138   2138       add_proj4text (p, 0,
  2139   2139           "+proj=utm +zone=19 +datum=NAD27 +units=m +no_defs");
  2140   2140       add_srs_wkt (p, 0,
  2141   2141           "PROJCS[\"NAD27 / UTM zone 19N\",GEOGCS[\"NAD27\",DATUM[\"");
  2142   2142       add_srs_wkt (p, 1,
  2143   2143           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2144   2144       add_srs_wkt (p, 2,
  2145         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2145  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2146   2146       add_srs_wkt (p, 3,
  2147   2147           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2148   2148       add_srs_wkt (p, 4,
  2149   2149           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2150   2150       add_srs_wkt (p, 5,
  2151   2151           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2152   2152       add_srs_wkt (p, 6,
................................................................................
  2173   2173       add_proj4text (p, 0,
  2174   2174           "+proj=utm +zone=20 +datum=NAD27 +units=m +no_defs");
  2175   2175       add_srs_wkt (p, 0,
  2176   2176           "PROJCS[\"NAD27 / UTM zone 20N\",GEOGCS[\"NAD27\",DATUM[\"");
  2177   2177       add_srs_wkt (p, 1,
  2178   2178           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2179   2179       add_srs_wkt (p, 2,
  2180         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2180  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2181   2181       add_srs_wkt (p, 3,
  2182   2182           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2183   2183       add_srs_wkt (p, 4,
  2184   2184           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2185   2185       add_srs_wkt (p, 5,
  2186   2186           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2187   2187       add_srs_wkt (p, 6,
................................................................................
  2208   2208       add_proj4text (p, 0,
  2209   2209           "+proj=utm +zone=21 +datum=NAD27 +units=m +no_defs");
  2210   2210       add_srs_wkt (p, 0,
  2211   2211           "PROJCS[\"NAD27 / UTM zone 21N\",GEOGCS[\"NAD27\",DATUM[\"");
  2212   2212       add_srs_wkt (p, 1,
  2213   2213           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2214   2214       add_srs_wkt (p, 2,
  2215         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2215  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2216   2216       add_srs_wkt (p, 3,
  2217   2217           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2218   2218       add_srs_wkt (p, 4,
  2219   2219           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2220   2220       add_srs_wkt (p, 5,
  2221   2221           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2222   2222       add_srs_wkt (p, 6,
................................................................................
  2243   2243       add_proj4text (p, 0,
  2244   2244           "+proj=utm +zone=22 +datum=NAD27 +units=m +no_defs");
  2245   2245       add_srs_wkt (p, 0,
  2246   2246           "PROJCS[\"NAD27 / UTM zone 22N\",GEOGCS[\"NAD27\",DATUM[\"");
  2247   2247       add_srs_wkt (p, 1,
  2248   2248           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2249   2249       add_srs_wkt (p, 2,
  2250         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2250  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2251   2251       add_srs_wkt (p, 3,
  2252   2252           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2253   2253       add_srs_wkt (p, 4,
  2254   2254           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2255   2255       add_srs_wkt (p, 5,
  2256   2256           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2257   2257       add_srs_wkt (p, 6,
................................................................................
  2282   2282       add_proj4text (p, 2,
  2283   2283           "s-ft +no_defs");
  2284   2284       add_srs_wkt (p, 0,
  2285   2285           "PROJCS[\"NAD27 / Alabama East\",GEOGCS[\"NAD27\",DATUM[\"");
  2286   2286       add_srs_wkt (p, 1,
  2287   2287           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2288   2288       add_srs_wkt (p, 2,
  2289         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2289  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2290   2290       add_srs_wkt (p, 3,
  2291   2291           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2292   2292       add_srs_wkt (p, 4,
  2293   2293           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2294   2294       add_srs_wkt (p, 5,
  2295   2295           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2296   2296       add_srs_wkt (p, 6,
................................................................................
  2321   2321       add_proj4text (p, 2,
  2322   2322           "fs");
  2323   2323       add_srs_wkt (p, 0,
  2324   2324           "PROJCS[\"NAD27 / Alabama West\",GEOGCS[\"NAD27\",DATUM[\"");
  2325   2325       add_srs_wkt (p, 1,
  2326   2326           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2327   2327       add_srs_wkt (p, 2,
  2328         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2328  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2329   2329       add_srs_wkt (p, 3,
  2330   2330           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2331   2331       add_srs_wkt (p, 4,
  2332   2332           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2333   2333       add_srs_wkt (p, 5,
  2334   2334           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2335   2335       add_srs_wkt (p, 6,
................................................................................
  2362   2362       add_proj4text (p, 3,
  2363   2363           "m=NAD27 +units=us-ft +no_defs");
  2364   2364       add_srs_wkt (p, 0,
  2365   2365           "PROJCS[\"NAD27 / Alaska zone 1\",GEOGCS[\"NAD27\",DATUM[");
  2366   2366       add_srs_wkt (p, 1,
  2367   2367           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2368   2368       add_srs_wkt (p, 2,
  2369         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2369  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2370   2370       add_srs_wkt (p, 3,
  2371   2371           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2372   2372       add_srs_wkt (p, 4,
  2373   2373           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2374   2374       add_srs_wkt (p, 5,
  2375   2375           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2376   2376       add_srs_wkt (p, 6,
................................................................................
  2403   2403       add_proj4text (p, 1,
  2404   2404           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2405   2405       add_srs_wkt (p, 0,
  2406   2406           "PROJCS[\"NAD27 / Alaska zone 2\",GEOGCS[\"NAD27\",DATUM[");
  2407   2407       add_srs_wkt (p, 1,
  2408   2408           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2409   2409       add_srs_wkt (p, 2,
  2410         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2410  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2411   2411       add_srs_wkt (p, 3,
  2412   2412           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2413   2413       add_srs_wkt (p, 4,
  2414   2414           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2415   2415       add_srs_wkt (p, 5,
  2416   2416           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2417   2417       add_srs_wkt (p, 6,
................................................................................
  2440   2440       add_proj4text (p, 1,
  2441   2441           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2442   2442       add_srs_wkt (p, 0,
  2443   2443           "PROJCS[\"NAD27 / Alaska zone 3\",GEOGCS[\"NAD27\",DATUM[");
  2444   2444       add_srs_wkt (p, 1,
  2445   2445           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2446   2446       add_srs_wkt (p, 2,
  2447         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2447  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2448   2448       add_srs_wkt (p, 3,
  2449   2449           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2450   2450       add_srs_wkt (p, 4,
  2451   2451           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2452   2452       add_srs_wkt (p, 5,
  2453   2453           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2454   2454       add_srs_wkt (p, 6,
................................................................................
  2477   2477       add_proj4text (p, 1,
  2478   2478           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2479   2479       add_srs_wkt (p, 0,
  2480   2480           "PROJCS[\"NAD27 / Alaska zone 4\",GEOGCS[\"NAD27\",DATUM[");
  2481   2481       add_srs_wkt (p, 1,
  2482   2482           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2483   2483       add_srs_wkt (p, 2,
  2484         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2484  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2485   2485       add_srs_wkt (p, 3,
  2486   2486           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2487   2487       add_srs_wkt (p, 4,
  2488   2488           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2489   2489       add_srs_wkt (p, 5,
  2490   2490           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2491   2491       add_srs_wkt (p, 6,
................................................................................
  2514   2514       add_proj4text (p, 1,
  2515   2515           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2516   2516       add_srs_wkt (p, 0,
  2517   2517           "PROJCS[\"NAD27 / Alaska zone 5\",GEOGCS[\"NAD27\",DATUM[");
  2518   2518       add_srs_wkt (p, 1,
  2519   2519           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2520   2520       add_srs_wkt (p, 2,
  2521         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2521  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2522   2522       add_srs_wkt (p, 3,
  2523   2523           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2524   2524       add_srs_wkt (p, 4,
  2525   2525           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2526   2526       add_srs_wkt (p, 5,
  2527   2527           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2528   2528       add_srs_wkt (p, 6,
................................................................................
  2551   2551       add_proj4text (p, 1,
  2552   2552           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2553   2553       add_srs_wkt (p, 0,
  2554   2554           "PROJCS[\"NAD27 / Alaska zone 6\",GEOGCS[\"NAD27\",DATUM[");
  2555   2555       add_srs_wkt (p, 1,
  2556   2556           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2557   2557       add_srs_wkt (p, 2,
  2558         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2558  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2559   2559       add_srs_wkt (p, 3,
  2560   2560           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2561   2561       add_srs_wkt (p, 4,
  2562   2562           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2563   2563       add_srs_wkt (p, 5,
  2564   2564           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2565   2565       add_srs_wkt (p, 6,
................................................................................
  2588   2588       add_proj4text (p, 1,
  2589   2589           "4267208534 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2590   2590       add_srs_wkt (p, 0,
  2591   2591           "PROJCS[\"NAD27 / Alaska zone 7\",GEOGCS[\"NAD27\",DATUM[");
  2592   2592       add_srs_wkt (p, 1,
  2593   2593           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2594   2594       add_srs_wkt (p, 2,
  2595         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2595  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2596   2596       add_srs_wkt (p, 3,
  2597   2597           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2598   2598       add_srs_wkt (p, 4,
  2599   2599           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2600   2600       add_srs_wkt (p, 5,
  2601   2601           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2602   2602       add_srs_wkt (p, 6,
................................................................................
  2625   2625       add_proj4text (p, 1,
  2626   2626           "3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2627   2627       add_srs_wkt (p, 0,
  2628   2628           "PROJCS[\"NAD27 / Alaska zone 8\",GEOGCS[\"NAD27\",DATUM[");
  2629   2629       add_srs_wkt (p, 1,
  2630   2630           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2631   2631       add_srs_wkt (p, 2,
  2632         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2632  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2633   2633       add_srs_wkt (p, 3,
  2634   2634           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2635   2635       add_srs_wkt (p, 4,
  2636   2636           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2637   2637       add_srs_wkt (p, 5,
  2638   2638           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2639   2639       add_srs_wkt (p, 6,
................................................................................
  2662   2662       add_proj4text (p, 1,
  2663   2663           "3657607315 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2664   2664       add_srs_wkt (p, 0,
  2665   2665           "PROJCS[\"NAD27 / Alaska zone 9\",GEOGCS[\"NAD27\",DATUM[");
  2666   2666       add_srs_wkt (p, 1,
  2667   2667           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  2668   2668       add_srs_wkt (p, 2,
  2669         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         2669  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  2670   2670       add_srs_wkt (p, 3,
  2671   2671           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  2672   2672       add_srs_wkt (p, 4,
  2673   2673           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  2674   2674       add_srs_wkt (p, 5,
  2675   2675           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  2676   2676       add_srs_wkt (p, 6,
................................................................................
  2701   2701       add_proj4text (p, 2,
  2702   2702           "+datum=NAD27 +units=us-ft +no_defs");
  2703   2703       add_srs_wkt (p, 0,
  2704   2704           "PROJCS[\"NAD27 / Alaska zone 10\",GEOGCS[\"NAD27\",DATUM");
  2705   2705       add_srs_wkt (p, 1,
  2706   2706           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2707   2707       add_srs_wkt (p, 2,
  2708         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2708  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2709   2709       add_srs_wkt (p, 3,
  2710   2710           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2711   2711       add_srs_wkt (p, 4,
  2712   2712           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2713   2713       add_srs_wkt (p, 5,
  2714   2714           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2715   2715       add_srs_wkt (p, 6,
................................................................................
  2742   2742       add_proj4text (p, 2,
  2743   2743           "+datum=NAD27 +units=us-ft +no_defs");
  2744   2744       add_srs_wkt (p, 0,
  2745   2745           "PROJCS[\"NAD27 / California zone I\",GEOGCS[\"NAD27\",DA");
  2746   2746       add_srs_wkt (p, 1,
  2747   2747           "TUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866");
  2748   2748       add_srs_wkt (p, 2,
  2749         -        "\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008");
         2749  +        "\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008");
  2750   2750       add_srs_wkt (p, 3,
  2751   2751           "\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",");
  2752   2752       add_srs_wkt (p, 4,
  2753   2753           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
  2754   2754       add_srs_wkt (p, 5,
  2755   2755           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
  2756   2756       add_srs_wkt (p, 6,
................................................................................
  2783   2783       add_proj4text (p, 2,
  2784   2784           "2024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2785   2785       add_srs_wkt (p, 0,
  2786   2786           "PROJCS[\"NAD27 / California zone II\",GEOGCS[\"NAD27\",D");
  2787   2787       add_srs_wkt (p, 1,
  2788   2788           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  2789   2789       add_srs_wkt (p, 2,
  2790         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         2790  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  2791   2791       add_srs_wkt (p, 3,
  2792   2792           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2793   2793       add_srs_wkt (p, 4,
  2794   2794           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2795   2795       add_srs_wkt (p, 5,
  2796   2796           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2797   2797       add_srs_wkt (p, 6,
................................................................................
  2826   2826       add_proj4text (p, 2,
  2827   2827           "0=0 +datum=NAD27 +units=us-ft +no_defs");
  2828   2828       add_srs_wkt (p, 0,
  2829   2829           "PROJCS[\"NAD27 / California zone III\",GEOGCS[\"NAD27\",");
  2830   2830       add_srs_wkt (p, 1,
  2831   2831           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
  2832   2832       add_srs_wkt (p, 2,
  2833         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
         2833  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
  2834   2834       add_srs_wkt (p, 3,
  2835   2835           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2836   2836       add_srs_wkt (p, 4,
  2837   2837           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2838   2838       add_srs_wkt (p, 5,
  2839   2839           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2840   2840       add_srs_wkt (p, 6,
................................................................................
  2867   2867       add_proj4text (p, 2,
  2868   2868           " +units=us-ft +no_defs");
  2869   2869       add_srs_wkt (p, 0,
  2870   2870           "PROJCS[\"NAD27 / California zone IV\",GEOGCS[\"NAD27\",D");
  2871   2871       add_srs_wkt (p, 1,
  2872   2872           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  2873   2873       add_srs_wkt (p, 2,
  2874         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         2874  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  2875   2875       add_srs_wkt (p, 3,
  2876   2876           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2877   2877       add_srs_wkt (p, 4,
  2878   2878           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2879   2879       add_srs_wkt (p, 5,
  2880   2880           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2881   2881       add_srs_wkt (p, 6,
................................................................................
  2908   2908       add_proj4text (p, 2,
  2909   2909           "0 +datum=NAD27 +units=us-ft +no_defs");
  2910   2910       add_srs_wkt (p, 0,
  2911   2911           "PROJCS[\"NAD27 / California zone V\",GEOGCS[\"NAD27\",DA");
  2912   2912       add_srs_wkt (p, 1,
  2913   2913           "TUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866");
  2914   2914       add_srs_wkt (p, 2,
  2915         -        "\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008");
         2915  +        "\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008");
  2916   2916       add_srs_wkt (p, 3,
  2917   2917           "\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",");
  2918   2918       add_srs_wkt (p, 4,
  2919   2919           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
  2920   2920       add_srs_wkt (p, 5,
  2921   2921           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
  2922   2922       add_srs_wkt (p, 6,
................................................................................
  2949   2949       add_proj4text (p, 2,
  2950   2950           "2192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2951   2951       add_srs_wkt (p, 0,
  2952   2952           "PROJCS[\"NAD27 / California zone VI\",GEOGCS[\"NAD27\",D");
  2953   2953       add_srs_wkt (p, 1,
  2954   2954           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  2955   2955       add_srs_wkt (p, 2,
  2956         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         2956  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  2957   2957       add_srs_wkt (p, 3,
  2958   2958           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2959   2959       add_srs_wkt (p, 4,
  2960   2960           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2961   2961       add_srs_wkt (p, 5,
  2962   2962           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2963   2963       add_srs_wkt (p, 6,
................................................................................
  2994   2994       add_proj4text (p, 3,
  2995   2995           " +units=us-ft +no_defs");
  2996   2996       add_srs_wkt (p, 0,
  2997   2997           "PROJCS[\"NAD27 / California zone VII (deprecated)\",GEOG");
  2998   2998       add_srs_wkt (p, 1,
  2999   2999           "CS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROI");
  3000   3000       add_srs_wkt (p, 2,
  3001         -        "D[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[");
         3001  +        "D[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[");
  3002   3002       add_srs_wkt (p, 3,
  3003   3003           "\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM");
  3004   3004       add_srs_wkt (p, 4,
  3005   3005           "[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"de");
  3006   3006       add_srs_wkt (p, 5,
  3007   3007           "gree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],");
  3008   3008       add_srs_wkt (p, 6,
................................................................................
  3037   3037       add_proj4text (p, 2,
  3038   3038           "t +no_defs");
  3039   3039       add_srs_wkt (p, 0,
  3040   3040           "PROJCS[\"NAD27 / Arizona East\",GEOGCS[\"NAD27\",DATUM[\"");
  3041   3041       add_srs_wkt (p, 1,
  3042   3042           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3043   3043       add_srs_wkt (p, 2,
  3044         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3044  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3045   3045       add_srs_wkt (p, 3,
  3046   3046           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3047   3047       add_srs_wkt (p, 4,
  3048   3048           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3049   3049       add_srs_wkt (p, 5,
  3050   3050           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3051   3051       add_srs_wkt (p, 6,
................................................................................
  3076   3076       add_proj4text (p, 2,
  3077   3077           "t +no_defs");
  3078   3078       add_srs_wkt (p, 0,
  3079   3079           "PROJCS[\"NAD27 / Arizona Central\",GEOGCS[\"NAD27\",DATU");
  3080   3080       add_srs_wkt (p, 1,
  3081   3081           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  3082   3082       add_srs_wkt (p, 2,
  3083         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         3083  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  3084   3084       add_srs_wkt (p, 3,
  3085   3085           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  3086   3086       add_srs_wkt (p, 4,
  3087   3087           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  3088   3088       add_srs_wkt (p, 5,
  3089   3089           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  3090   3090       add_srs_wkt (p, 6,
................................................................................
  3115   3115       add_proj4text (p, 2,
  3116   3116           "defs");
  3117   3117       add_srs_wkt (p, 0,
  3118   3118           "PROJCS[\"NAD27 / Arizona West\",GEOGCS[\"NAD27\",DATUM[\"");
  3119   3119       add_srs_wkt (p, 1,
  3120   3120           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3121   3121       add_srs_wkt (p, 2,
  3122         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3122  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3123   3123       add_srs_wkt (p, 3,
  3124   3124           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3125   3125       add_srs_wkt (p, 4,
  3126   3126           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3127   3127       add_srs_wkt (p, 5,
  3128   3128           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3129   3129       add_srs_wkt (p, 6,
................................................................................
  3154   3154       add_proj4text (p, 2,
  3155   3155           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  3156   3156       add_srs_wkt (p, 0,
  3157   3157           "PROJCS[\"NAD27 / Arkansas North\",GEOGCS[\"NAD27\",DATUM");
  3158   3158       add_srs_wkt (p, 1,
  3159   3159           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  3160   3160       add_srs_wkt (p, 2,
  3161         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         3161  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  3162   3162       add_srs_wkt (p, 3,
  3163   3163           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  3164   3164       add_srs_wkt (p, 4,
  3165   3165           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3166   3166       add_srs_wkt (p, 5,
  3167   3167           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  3168   3168       add_srs_wkt (p, 6,
................................................................................
  3197   3197       add_proj4text (p, 2,
  3198   3198           " +datum=NAD27 +units=us-ft +no_defs");
  3199   3199       add_srs_wkt (p, 0,
  3200   3200           "PROJCS[\"NAD27 / Arkansas South\",GEOGCS[\"NAD27\",DATUM");
  3201   3201       add_srs_wkt (p, 1,
  3202   3202           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  3203   3203       add_srs_wkt (p, 2,
  3204         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         3204  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  3205   3205       add_srs_wkt (p, 3,
  3206   3206           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  3207   3207       add_srs_wkt (p, 4,
  3208   3208           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3209   3209       add_srs_wkt (p, 5,
  3210   3210           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  3211   3211       add_srs_wkt (p, 6,
................................................................................
  3238   3238       add_proj4text (p, 2,
  3239   3239           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  3240   3240       add_srs_wkt (p, 0,
  3241   3241           "PROJCS[\"NAD27 / Colorado North\",GEOGCS[\"NAD27\",DATUM");
  3242   3242       add_srs_wkt (p, 1,
  3243   3243           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  3244   3244       add_srs_wkt (p, 2,
  3245         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         3245  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  3246   3246       add_srs_wkt (p, 3,
  3247   3247           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  3248   3248       add_srs_wkt (p, 4,
  3249   3249           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3250   3250       add_srs_wkt (p, 5,
  3251   3251           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  3252   3252       add_srs_wkt (p, 6,
................................................................................
  3281   3281       add_proj4text (p, 2,
  3282   3282           "NAD27 +units=us-ft +no_defs");
  3283   3283       add_srs_wkt (p, 0,
  3284   3284           "PROJCS[\"NAD27 / Colorado Central\",GEOGCS[\"NAD27\",DAT");
  3285   3285       add_srs_wkt (p, 1,
  3286   3286           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  3287   3287       add_srs_wkt (p, 2,
  3288         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         3288  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  3289   3289       add_srs_wkt (p, 3,
  3290   3290           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  3291   3291       add_srs_wkt (p, 4,
  3292   3292           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  3293   3293       add_srs_wkt (p, 5,
  3294   3294           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  3295   3295       add_srs_wkt (p, 6,
................................................................................
  3322   3322       add_proj4text (p, 2,
  3323   3323           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  3324   3324       add_srs_wkt (p, 0,
  3325   3325           "PROJCS[\"NAD27 / Colorado South\",GEOGCS[\"NAD27\",DATUM");
  3326   3326       add_srs_wkt (p, 1,
  3327   3327           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  3328   3328       add_srs_wkt (p, 2,
  3329         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         3329  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  3330   3330       add_srs_wkt (p, 3,
  3331   3331           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  3332   3332       add_srs_wkt (p, 4,
  3333   3333           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3334   3334       add_srs_wkt (p, 5,
  3335   3335           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  3336   3336       add_srs_wkt (p, 6,
................................................................................
  3365   3365       add_proj4text (p, 2,
  3366   3366           "0=0 +datum=NAD27 +units=us-ft +no_defs");
  3367   3367       add_srs_wkt (p, 0,
  3368   3368           "PROJCS[\"NAD27 / Connecticut\",GEOGCS[\"NAD27\",DATUM[\"");
  3369   3369       add_srs_wkt (p, 1,
  3370   3370           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3371   3371       add_srs_wkt (p, 2,
  3372         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3372  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3373   3373       add_srs_wkt (p, 3,
  3374   3374           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3375   3375       add_srs_wkt (p, 4,
  3376   3376           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3377   3377       add_srs_wkt (p, 5,
  3378   3378           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3379   3379       add_srs_wkt (p, 6,
................................................................................
  3406   3406       add_proj4text (p, 2,
  3407   3407           "-ft +no_defs");
  3408   3408       add_srs_wkt (p, 0,
  3409   3409           "PROJCS[\"NAD27 / Delaware\",GEOGCS[\"NAD27\",DATUM[\"Nor");
  3410   3410       add_srs_wkt (p, 1,
  3411   3411           "th_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637820");
  3412   3412       add_srs_wkt (p, 2,
  3413         -        "6.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
         3413  +        "6.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
  3414   3414       add_srs_wkt (p, 3,
  3415   3415           "ORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
  3416   3416       add_srs_wkt (p, 4,
  3417   3417           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
  3418   3418       add_srs_wkt (p, 5,
  3419   3419           "3,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH]");
  3420   3420       add_srs_wkt (p, 6,
................................................................................
  3445   3445       add_proj4text (p, 2,
  3446   3446           "=us-ft +no_defs");
  3447   3447       add_srs_wkt (p, 0,
  3448   3448           "PROJCS[\"NAD27 / Florida East\",GEOGCS[\"NAD27\",DATUM[\"");
  3449   3449       add_srs_wkt (p, 1,
  3450   3450           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3451   3451       add_srs_wkt (p, 2,
  3452         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3452  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3453   3453       add_srs_wkt (p, 3,
  3454   3454           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3455   3455       add_srs_wkt (p, 4,
  3456   3456           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3457   3457       add_srs_wkt (p, 5,
  3458   3458           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3459   3459       add_srs_wkt (p, 6,
................................................................................
  3484   3484       add_proj4text (p, 2,
  3485   3485           "=us-ft +no_defs");
  3486   3486       add_srs_wkt (p, 0,
  3487   3487           "PROJCS[\"NAD27 / Florida West\",GEOGCS[\"NAD27\",DATUM[\"");
  3488   3488       add_srs_wkt (p, 1,
  3489   3489           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3490   3490       add_srs_wkt (p, 2,
  3491         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3491  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3492   3492       add_srs_wkt (p, 3,
  3493   3493           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3494   3494       add_srs_wkt (p, 4,
  3495   3495           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3496   3496       add_srs_wkt (p, 5,
  3497   3497           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3498   3498       add_srs_wkt (p, 6,
................................................................................
  3523   3523       add_proj4text (p, 2,
  3524   3524           "7 +units=us-ft +no_defs");
  3525   3525       add_srs_wkt (p, 0,
  3526   3526           "PROJCS[\"NAD27 / Florida North\",GEOGCS[\"NAD27\",DATUM[");
  3527   3527       add_srs_wkt (p, 1,
  3528   3528           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  3529   3529       add_srs_wkt (p, 2,
  3530         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         3530  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  3531   3531       add_srs_wkt (p, 3,
  3532   3532           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  3533   3533       add_srs_wkt (p, 4,
  3534   3534           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  3535   3535       add_srs_wkt (p, 5,
  3536   3536           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  3537   3537       add_srs_wkt (p, 6,
................................................................................
  3564   3564       add_proj4text (p, 2,
  3565   3565           "t +no_defs");
  3566   3566       add_srs_wkt (p, 0,
  3567   3567           "PROJCS[\"NAD27 / Georgia East\",GEOGCS[\"NAD27\",DATUM[\"");
  3568   3568       add_srs_wkt (p, 1,
  3569   3569           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3570   3570       add_srs_wkt (p, 2,
  3571         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3571  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3572   3572       add_srs_wkt (p, 3,
  3573   3573           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3574   3574       add_srs_wkt (p, 4,
  3575   3575           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3576   3576       add_srs_wkt (p, 5,
  3577   3577           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3578   3578       add_srs_wkt (p, 6,
................................................................................
  3603   3603       add_proj4text (p, 2,
  3604   3604           "t +no_defs");
  3605   3605       add_srs_wkt (p, 0,
  3606   3606           "PROJCS[\"NAD27 / Georgia West\",GEOGCS[\"NAD27\",DATUM[\"");
  3607   3607       add_srs_wkt (p, 1,
  3608   3608           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3609   3609       add_srs_wkt (p, 2,
  3610         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3610  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3611   3611       add_srs_wkt (p, 3,
  3612   3612           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3613   3613       add_srs_wkt (p, 4,
  3614   3614           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3615   3615       add_srs_wkt (p, 5,
  3616   3616           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3617   3617       add_srs_wkt (p, 6,
................................................................................
  3642   3642       add_proj4text (p, 2,
  3643   3643           "=0 +datum=NAD27 +units=us-ft +no_defs");
  3644   3644       add_srs_wkt (p, 0,
  3645   3645           "PROJCS[\"NAD27 / Idaho East\",GEOGCS[\"NAD27\",DATUM[\"N");
  3646   3646       add_srs_wkt (p, 1,
  3647   3647           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3648   3648       add_srs_wkt (p, 2,
  3649         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3649  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3650   3650       add_srs_wkt (p, 3,
  3651   3651           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3652   3652       add_srs_wkt (p, 4,
  3653   3653           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3654   3654       add_srs_wkt (p, 5,
  3655   3655           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3656   3656       add_srs_wkt (p, 6,
................................................................................
  3681   3681       add_proj4text (p, 2,
  3682   3682           "7 +units=us-ft +no_defs");
  3683   3683       add_srs_wkt (p, 0,
  3684   3684           "PROJCS[\"NAD27 / Idaho Central\",GEOGCS[\"NAD27\",DATUM[");
  3685   3685       add_srs_wkt (p, 1,
  3686   3686           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  3687   3687       add_srs_wkt (p, 2,
  3688         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         3688  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  3689   3689       add_srs_wkt (p, 3,
  3690   3690           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  3691   3691       add_srs_wkt (p, 4,
  3692   3692           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  3693   3693       add_srs_wkt (p, 5,
  3694   3694           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  3695   3695       add_srs_wkt (p, 6,
................................................................................
  3720   3720       add_proj4text (p, 2,
  3721   3721           "nits=us-ft +no_defs");
  3722   3722       add_srs_wkt (p, 0,
  3723   3723           "PROJCS[\"NAD27 / Idaho West\",GEOGCS[\"NAD27\",DATUM[\"N");
  3724   3724       add_srs_wkt (p, 1,
  3725   3725           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3726   3726       add_srs_wkt (p, 2,
  3727         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3727  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3728   3728       add_srs_wkt (p, 3,
  3729   3729           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3730   3730       add_srs_wkt (p, 4,
  3731   3731           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3732   3732       add_srs_wkt (p, 5,
  3733   3733           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3734   3734       add_srs_wkt (p, 6,
................................................................................
  3759   3759       add_proj4text (p, 2,
  3760   3760           "=0 +datum=NAD27 +units=us-ft +no_defs");
  3761   3761       add_srs_wkt (p, 0,
  3762   3762           "PROJCS[\"NAD27 / Illinois East\",GEOGCS[\"NAD27\",DATUM[");
  3763   3763       add_srs_wkt (p, 1,
  3764   3764           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  3765   3765       add_srs_wkt (p, 2,
  3766         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         3766  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  3767   3767       add_srs_wkt (p, 3,
  3768   3768           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  3769   3769       add_srs_wkt (p, 4,
  3770   3770           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  3771   3771       add_srs_wkt (p, 5,
  3772   3772           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  3773   3773       add_srs_wkt (p, 6,
................................................................................
  3798   3798       add_proj4text (p, 2,
  3799   3799           "um=NAD27 +units=us-ft +no_defs");
  3800   3800       add_srs_wkt (p, 0,
  3801   3801           "PROJCS[\"NAD27 / Illinois West\",GEOGCS[\"NAD27\",DATUM[");
  3802   3802       add_srs_wkt (p, 1,
  3803   3803           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  3804   3804       add_srs_wkt (p, 2,
  3805         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         3805  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  3806   3806       add_srs_wkt (p, 3,
  3807   3807           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  3808   3808       add_srs_wkt (p, 4,
  3809   3809           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  3810   3810       add_srs_wkt (p, 5,
  3811   3811           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  3812   3812       add_srs_wkt (p, 6,
................................................................................
  3837   3837       add_proj4text (p, 2,
  3838   3838           "ts=us-ft +no_defs");
  3839   3839       add_srs_wkt (p, 0,
  3840   3840           "PROJCS[\"NAD27 / Indiana East\",GEOGCS[\"NAD27\",DATUM[\"");
  3841   3841       add_srs_wkt (p, 1,
  3842   3842           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3843   3843       add_srs_wkt (p, 2,
  3844         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3844  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3845   3845       add_srs_wkt (p, 3,
  3846   3846           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3847   3847       add_srs_wkt (p, 4,
  3848   3848           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3849   3849       add_srs_wkt (p, 5,
  3850   3850           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3851   3851       add_srs_wkt (p, 6,
................................................................................
  3876   3876       add_proj4text (p, 2,
  3877   3877           "ts=us-ft +no_defs");
  3878   3878       add_srs_wkt (p, 0,
  3879   3879           "PROJCS[\"NAD27 / Indiana West\",GEOGCS[\"NAD27\",DATUM[\"");
  3880   3880       add_srs_wkt (p, 1,
  3881   3881           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  3882   3882       add_srs_wkt (p, 2,
  3883         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         3883  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  3884   3884       add_srs_wkt (p, 3,
  3885   3885           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  3886   3886       add_srs_wkt (p, 4,
  3887   3887           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  3888   3888       add_srs_wkt (p, 5,
  3889   3889           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  3890   3890       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_38.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    66     66       add_proj4text (p, 2,
    67     67           "=0 +datum=NAD27 +units=us-ft +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"NAD27 / Iowa North\",GEOGCS[\"NAD27\",DATUM[\"N");
    70     70       add_srs_wkt (p, 1,
    71     71           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
    72     72       add_srs_wkt (p, 2,
    73         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
           73  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
    74     74       add_srs_wkt (p, 3,
    75     75           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
    76     76       add_srs_wkt (p, 4,
    77     77           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
    78     78       add_srs_wkt (p, 5,
    79     79           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
    80     80       add_srs_wkt (p, 6,
................................................................................
   107    107       add_proj4text (p, 2,
   108    108           " +datum=NAD27 +units=us-ft +no_defs");
   109    109       add_srs_wkt (p, 0,
   110    110           "PROJCS[\"NAD27 / Iowa South\",GEOGCS[\"NAD27\",DATUM[\"N");
   111    111       add_srs_wkt (p, 1,
   112    112           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
   113    113       add_srs_wkt (p, 2,
   114         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
          114  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
   115    115       add_srs_wkt (p, 3,
   116    116           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
   117    117       add_srs_wkt (p, 4,
   118    118           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
   119    119       add_srs_wkt (p, 5,
   120    120           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
   121    121       add_srs_wkt (p, 6,
................................................................................
   148    148       add_proj4text (p, 2,
   149    149           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   150    150       add_srs_wkt (p, 0,
   151    151           "PROJCS[\"NAD27 / Kansas North\",GEOGCS[\"NAD27\",DATUM[\"");
   152    152       add_srs_wkt (p, 1,
   153    153           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
   154    154       add_srs_wkt (p, 2,
   155         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
          155  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
   156    156       add_srs_wkt (p, 3,
   157    157           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
   158    158       add_srs_wkt (p, 4,
   159    159           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
   160    160       add_srs_wkt (p, 5,
   161    161           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
   162    162       add_srs_wkt (p, 6,
................................................................................
   189    189       add_proj4text (p, 2,
   190    190           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   191    191       add_srs_wkt (p, 0,
   192    192           "PROJCS[\"NAD27 / Kansas South\",GEOGCS[\"NAD27\",DATUM[\"");
   193    193       add_srs_wkt (p, 1,
   194    194           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
   195    195       add_srs_wkt (p, 2,
   196         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
          196  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
   197    197       add_srs_wkt (p, 3,
   198    198           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
   199    199       add_srs_wkt (p, 4,
   200    200           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
   201    201       add_srs_wkt (p, 5,
   202    202           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
   203    203       add_srs_wkt (p, 6,
................................................................................
   232    232       add_proj4text (p, 2,
   233    233           "0=0 +datum=NAD27 +units=us-ft +no_defs");
   234    234       add_srs_wkt (p, 0,
   235    235           "PROJCS[\"NAD27 / Kentucky North\",GEOGCS[\"NAD27\",DATUM");
   236    236       add_srs_wkt (p, 1,
   237    237           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   238    238       add_srs_wkt (p, 2,
   239         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          239  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   240    240       add_srs_wkt (p, 3,
   241    241           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   242    242       add_srs_wkt (p, 4,
   243    243           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   244    244       add_srs_wkt (p, 5,
   245    245           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   246    246       add_srs_wkt (p, 6,
................................................................................
   273    273       add_proj4text (p, 2,
   274    274           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   275    275       add_srs_wkt (p, 0,
   276    276           "PROJCS[\"NAD27 / Kentucky South\",GEOGCS[\"NAD27\",DATUM");
   277    277       add_srs_wkt (p, 1,
   278    278           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   279    279       add_srs_wkt (p, 2,
   280         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          280  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   281    281       add_srs_wkt (p, 3,
   282    282           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   283    283       add_srs_wkt (p, 4,
   284    284           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   285    285       add_srs_wkt (p, 5,
   286    286           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   287    287       add_srs_wkt (p, 6,
................................................................................
   316    316       add_proj4text (p, 2,
   317    317           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   318    318       add_srs_wkt (p, 0,
   319    319           "PROJCS[\"NAD27 / Louisiana North\",GEOGCS[\"NAD27\",DATU");
   320    320       add_srs_wkt (p, 1,
   321    321           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   322    322       add_srs_wkt (p, 2,
   323         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          323  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   324    324       add_srs_wkt (p, 3,
   325    325           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   326    326       add_srs_wkt (p, 4,
   327    327           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   328    328       add_srs_wkt (p, 5,
   329    329           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   330    330       add_srs_wkt (p, 6,
................................................................................
   359    359       add_proj4text (p, 2,
   360    360           "=0 +datum=NAD27 +units=us-ft +no_defs");
   361    361       add_srs_wkt (p, 0,
   362    362           "PROJCS[\"NAD27 / Louisiana South\",GEOGCS[\"NAD27\",DATU");
   363    363       add_srs_wkt (p, 1,
   364    364           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   365    365       add_srs_wkt (p, 2,
   366         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          366  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   367    367       add_srs_wkt (p, 3,
   368    368           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   369    369       add_srs_wkt (p, 4,
   370    370           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   371    371       add_srs_wkt (p, 5,
   372    372           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   373    373       add_srs_wkt (p, 6,
................................................................................
   400    400       add_proj4text (p, 2,
   401    401           "-ft +no_defs");
   402    402       add_srs_wkt (p, 0,
   403    403           "PROJCS[\"NAD27 / Maine East\",GEOGCS[\"NAD27\",DATUM[\"N");
   404    404       add_srs_wkt (p, 1,
   405    405           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
   406    406       add_srs_wkt (p, 2,
   407         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
          407  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
   408    408       add_srs_wkt (p, 3,
   409    409           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
   410    410       add_srs_wkt (p, 4,
   411    411           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
   412    412       add_srs_wkt (p, 5,
   413    413           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
   414    414       add_srs_wkt (p, 6,
................................................................................
   439    439       add_proj4text (p, 2,
   440    440           "um=NAD27 +units=us-ft +no_defs");
   441    441       add_srs_wkt (p, 0,
   442    442           "PROJCS[\"NAD27 / Maine West\",GEOGCS[\"NAD27\",DATUM[\"N");
   443    443       add_srs_wkt (p, 1,
   444    444           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
   445    445       add_srs_wkt (p, 2,
   446         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
          446  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
   447    447       add_srs_wkt (p, 3,
   448    448           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
   449    449       add_srs_wkt (p, 4,
   450    450           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
   451    451       add_srs_wkt (p, 5,
   452    452           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
   453    453       add_srs_wkt (p, 6,
................................................................................
   478    478       add_proj4text (p, 2,
   479    479           "7 +units=us-ft +no_defs");
   480    480       add_srs_wkt (p, 0,
   481    481           "PROJCS[\"NAD27 / Maryland\",GEOGCS[\"NAD27\",DATUM[\"Nor");
   482    482       add_srs_wkt (p, 1,
   483    483           "th_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637820");
   484    484       add_srs_wkt (p, 2,
   485         -        "6.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
          485  +        "6.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTH");
   486    486       add_srs_wkt (p, 3,
   487    487           "ORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
   488    488       add_srs_wkt (p, 4,
   489    489           "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
   490    490       add_srs_wkt (p, 5,
   491    491           "3,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH]");
   492    492       add_srs_wkt (p, 6,
................................................................................
   519    519       add_proj4text (p, 2,
   520    520           " +datum=NAD27 +units=us-ft +no_defs");
   521    521       add_srs_wkt (p, 0,
   522    522           "PROJCS[\"NAD27 / Massachusetts Mainland\",GEOGCS[\"NAD27");
   523    523       add_srs_wkt (p, 1,
   524    524           "\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke");
   525    525       add_srs_wkt (p, 2,
   526         -        " 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
          526  +        " 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
   527    527       add_srs_wkt (p, 3,
   528    528           "7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwic");
   529    529       add_srs_wkt (p, 4,
   530    530           "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
   531    531       add_srs_wkt (p, 5,
   532    532           "74532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lati");
   533    533       add_srs_wkt (p, 6,
................................................................................
   560    560       add_proj4text (p, 2,
   561    561           " +datum=NAD27 +units=us-ft +no_defs");
   562    562       add_srs_wkt (p, 0,
   563    563           "PROJCS[\"NAD27 / Massachusetts Island\",GEOGCS[\"NAD27\"");
   564    564       add_srs_wkt (p, 1,
   565    565           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
   566    566       add_srs_wkt (p, 2,
   567         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
          567  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
   568    568       add_srs_wkt (p, 3,
   569    569           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
   570    570       add_srs_wkt (p, 4,
   571    571           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
   572    572       add_srs_wkt (p, 5,
   573    573           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
   574    574       add_srs_wkt (p, 6,
................................................................................
   601    601       add_proj4text (p, 2,
   602    602           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   603    603       add_srs_wkt (p, 0,
   604    604           "PROJCS[\"NAD27 / Minnesota North\",GEOGCS[\"NAD27\",DATU");
   605    605       add_srs_wkt (p, 1,
   606    606           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   607    607       add_srs_wkt (p, 2,
   608         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          608  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   609    609       add_srs_wkt (p, 3,
   610    610           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   611    611       add_srs_wkt (p, 4,
   612    612           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   613    613       add_srs_wkt (p, 5,
   614    614           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   615    615       add_srs_wkt (p, 6,
................................................................................
   642    642       add_proj4text (p, 2,
   643    643           "27 +units=us-ft +no_defs");
   644    644       add_srs_wkt (p, 0,
   645    645           "PROJCS[\"NAD27 / Minnesota Central\",GEOGCS[\"NAD27\",DA");
   646    646       add_srs_wkt (p, 1,
   647    647           "TUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866");
   648    648       add_srs_wkt (p, 2,
   649         -        "\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008");
          649  +        "\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008");
   650    650       add_srs_wkt (p, 3,
   651    651           "\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",");
   652    652       add_srs_wkt (p, 4,
   653    653           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
   654    654       add_srs_wkt (p, 5,
   655    655           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
   656    656       add_srs_wkt (p, 6,
................................................................................
   683    683       add_proj4text (p, 2,
   684    684           "datum=NAD27 +units=us-ft +no_defs");
   685    685       add_srs_wkt (p, 0,
   686    686           "PROJCS[\"NAD27 / Minnesota South\",GEOGCS[\"NAD27\",DATU");
   687    687       add_srs_wkt (p, 1,
   688    688           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   689    689       add_srs_wkt (p, 2,
   690         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          690  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   691    691       add_srs_wkt (p, 3,
   692    692           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   693    693       add_srs_wkt (p, 4,
   694    694           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   695    695       add_srs_wkt (p, 5,
   696    696           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   697    697       add_srs_wkt (p, 6,
................................................................................
   724    724       add_proj4text (p, 2,
   725    725           "AD27 +units=us-ft +no_defs");
   726    726       add_srs_wkt (p, 0,
   727    727           "PROJCS[\"NAD27 / Mississippi East\",GEOGCS[\"NAD27\",DAT");
   728    728       add_srs_wkt (p, 1,
   729    729           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   730    730       add_srs_wkt (p, 2,
   731         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          731  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   732    732       add_srs_wkt (p, 3,
   733    733           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   734    734       add_srs_wkt (p, 4,
   735    735           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   736    736       add_srs_wkt (p, 5,
   737    737           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   738    738       add_srs_wkt (p, 6,
................................................................................
   763    763       add_proj4text (p, 2,
   764    764           "ts=us-ft +no_defs");
   765    765       add_srs_wkt (p, 0,
   766    766           "PROJCS[\"NAD27 / Mississippi West\",GEOGCS[\"NAD27\",DAT");
   767    767       add_srs_wkt (p, 1,
   768    768           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   769    769       add_srs_wkt (p, 2,
   770         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          770  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   771    771       add_srs_wkt (p, 3,
   772    772           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   773    773       add_srs_wkt (p, 4,
   774    774           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   775    775       add_srs_wkt (p, 5,
   776    776           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   777    777       add_srs_wkt (p, 6,
................................................................................
   802    802       add_proj4text (p, 2,
   803    803           "ts=us-ft +no_defs");
   804    804       add_srs_wkt (p, 0,
   805    805           "PROJCS[\"NAD27 / Missouri East\",GEOGCS[\"NAD27\",DATUM[");
   806    806       add_srs_wkt (p, 1,
   807    807           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   808    808       add_srs_wkt (p, 2,
   809         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          809  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   810    810       add_srs_wkt (p, 3,
   811    811           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   812    812       add_srs_wkt (p, 4,
   813    813           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   814    814       add_srs_wkt (p, 5,
   815    815           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   816    816       add_srs_wkt (p, 6,
................................................................................
   841    841       add_proj4text (p, 2,
   842    842           "ts=us-ft +no_defs");
   843    843       add_srs_wkt (p, 0,
   844    844           "PROJCS[\"NAD27 / Missouri Central\",GEOGCS[\"NAD27\",DAT");
   845    845       add_srs_wkt (p, 1,
   846    846           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   847    847       add_srs_wkt (p, 2,
   848         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          848  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   849    849       add_srs_wkt (p, 3,
   850    850           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   851    851       add_srs_wkt (p, 4,
   852    852           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   853    853       add_srs_wkt (p, 5,
   854    854           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   855    855       add_srs_wkt (p, 6,
................................................................................
   880    880       add_proj4text (p, 2,
   881    881           "ts=us-ft +no_defs");
   882    882       add_srs_wkt (p, 0,
   883    883           "PROJCS[\"NAD27 / Missouri West\",GEOGCS[\"NAD27\",DATUM[");
   884    884       add_srs_wkt (p, 1,
   885    885           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   886    886       add_srs_wkt (p, 2,
   887         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          887  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   888    888       add_srs_wkt (p, 3,
   889    889           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   890    890       add_srs_wkt (p, 4,
   891    891           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   892    892       add_srs_wkt (p, 5,
   893    893           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   894    894       add_srs_wkt (p, 6,
................................................................................
   921    921       add_proj4text (p, 3,
   922    922           "7 +units=us-ft +no_defs");
   923    923       add_srs_wkt (p, 0,
   924    924           "PROJCS[\"NAD27 / California zone VII\",GEOGCS[\"NAD27\",");
   925    925       add_srs_wkt (p, 1,
   926    926           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
   927    927       add_srs_wkt (p, 2,
   928         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
          928  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
   929    929       add_srs_wkt (p, 3,
   930    930           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
   931    931       add_srs_wkt (p, 4,
   932    932           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
   933    933       add_srs_wkt (p, 5,
   934    934           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
   935    935       add_srs_wkt (p, 6,
................................................................................
   966    966       add_srs_wkt (p, 0,
   967    967           "PROJCS[\"NAD Michigan / Michigan East (deprecated)\",GEO");
   968    968       add_srs_wkt (p, 1,
   969    969           "GCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHEROID");
   970    970       add_srs_wkt (p, 2,
   971    971           "[\"Clarke 1866 Michigan\",6378450.047548896,294.97869716");
   972    972       add_srs_wkt (p, 3,
   973         -        "46772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",\"");
          973  +        "46739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",\"");
   974    974       add_srs_wkt (p, 4,
   975    975           "6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
   976    976       add_srs_wkt (p, 5,
   977    977           "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
   978    978       add_srs_wkt (p, 6,
   979    979           "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
   980    980       add_srs_wkt (p, 7,
................................................................................
  1007   1007       add_srs_wkt (p, 0,
  1008   1008           "PROJCS[\"NAD Michigan / Michigan Old Central (deprecated");
  1009   1009       add_srs_wkt (p, 1,
  1010   1010           ")\",GEOGCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",S");
  1011   1011       add_srs_wkt (p, 2,
  1012   1012           "PHEROID[\"Clarke 1866 Michigan\",6378450.047548896,294.9");
  1013   1013       add_srs_wkt (p, 3,
  1014         -        "786971646772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"E");
         1014  +        "786971646739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"E");
  1015   1015       add_srs_wkt (p, 4,
  1016   1016           "PSG\",\"6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG");
  1017   1017       add_srs_wkt (p, 5,
  1018   1018           "\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORI");
  1019   1019       add_srs_wkt (p, 6,
  1020   1020           "TY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"L");
  1021   1021       add_srs_wkt (p, 7,
................................................................................
  1048   1048       add_srs_wkt (p, 0,
  1049   1049           "PROJCS[\"NAD Michigan / Michigan West (deprecated)\",GEO");
  1050   1050       add_srs_wkt (p, 1,
  1051   1051           "GCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHEROID");
  1052   1052       add_srs_wkt (p, 2,
  1053   1053           "[\"Clarke 1866 Michigan\",6378450.047548896,294.97869716");
  1054   1054       add_srs_wkt (p, 3,
  1055         -        "46772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",\"");
         1055  +        "46739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",\"");
  1056   1056       add_srs_wkt (p, 4,
  1057   1057           "6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
  1058   1058       add_srs_wkt (p, 5,
  1059   1059           "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
  1060   1060       add_srs_wkt (p, 6,
  1061   1061           "G\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude");
  1062   1062       add_srs_wkt (p, 7,
................................................................................
  1091   1091       add_srs_wkt (p, 0,
  1092   1092           "PROJCS[\"NAD Michigan / Michigan North (deprecated)\",GE");
  1093   1093       add_srs_wkt (p, 1,
  1094   1094           "OGCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHEROI");
  1095   1095       add_srs_wkt (p, 2,
  1096   1096           "D[\"Clarke 1866 Michigan\",6378450.047548896,294.9786971");
  1097   1097       add_srs_wkt (p, 3,
  1098         -        "646772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",");
         1098  +        "646739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",");
  1099   1099       add_srs_wkt (p, 4,
  1100   1100           "\"6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  1101   1101       add_srs_wkt (p, 5,
  1102   1102           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  1103   1103       add_srs_wkt (p, 6,
  1104   1104           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  1105   1105       add_srs_wkt (p, 7,
................................................................................
  1136   1136       add_srs_wkt (p, 0,
  1137   1137           "PROJCS[\"NAD Michigan / Michigan Central (deprecated)\",");
  1138   1138       add_srs_wkt (p, 1,
  1139   1139           "GEOGCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHER");
  1140   1140       add_srs_wkt (p, 2,
  1141   1141           "OID[\"Clarke 1866 Michigan\",6378450.047548896,294.97869");
  1142   1142       add_srs_wkt (p, 3,
  1143         -        "71646772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\"");
         1143  +        "71646739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\"");
  1144   1144       add_srs_wkt (p, 4,
  1145   1145           ",\"6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
  1146   1146       add_srs_wkt (p, 5,
  1147   1147           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
  1148   1148       add_srs_wkt (p, 6,
  1149   1149           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
  1150   1150       add_srs_wkt (p, 7,
................................................................................
  1181   1181       add_srs_wkt (p, 0,
  1182   1182           "PROJCS[\"NAD Michigan / Michigan South (deprecated)\",GE");
  1183   1183       add_srs_wkt (p, 1,
  1184   1184           "OGCS[\"NAD27 Michigan\",DATUM[\"NAD27_Michigan\",SPHEROI");
  1185   1185       add_srs_wkt (p, 2,
  1186   1186           "D[\"Clarke 1866 Michigan\",6378450.047548896,294.9786971");
  1187   1187       add_srs_wkt (p, 3,
  1188         -        "646772,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",");
         1188  +        "646739,AUTHORITY[\"EPSG\",\"7009\"]],AUTHORITY[\"EPSG\",");
  1189   1189       add_srs_wkt (p, 4,
  1190   1190           "\"6268\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8");
  1191   1191       add_srs_wkt (p, 5,
  1192   1192           "901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"E");
  1193   1193       add_srs_wkt (p, 6,
  1194   1194           "PSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitu");
  1195   1195       add_srs_wkt (p, 7,

Changes to src/srsinit/epsg_inlined_39.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_40.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
  1105   1105           "ATF (Paris) / Nord de Guerre", 0, 0,
  1106   1106           "Plessis 1817", "Paris RGS",
  1107   1107           "Ancienne_Triangulation_Francaise_Paris", "Lambert_Conformal_Conic_1SP", "metre",
  1108   1108           "X", "East", "Y", "North");
  1109   1109       add_proj4text (p, 0,
  1110   1110           "+proj=lcc +lat_1=49.50000000000001 +lat_0=49.50000000000");
  1111   1111       add_proj4text (p, 1,
  1112         -        "001 +lon_0=5.4 +k_0=0.99950908 +x_0=500000 +y_0=300000 +");
         1112  +        "001 +lon_0=5.399999999999999 +k_0=0.99950908 +x_0=500000");
  1113   1113       add_proj4text (p, 2,
  1114         -        "a=6376523 +b=6355862.933255573 +pm=2.337208333333333 +un");
         1114  +        " +y_0=300000 +a=6376523 +b=6355862.933255573 +pm=2.33720");
  1115   1115       add_proj4text (p, 3,
  1116         -        "its=m +no_defs");
         1116  +        "8333333333 +units=m +no_defs");
  1117   1117       add_srs_wkt (p, 0,
  1118   1118           "PROJCS[\"ATF (Paris) / Nord de Guerre\",GEOGCS[\"ATF (Pa");
  1119   1119       add_srs_wkt (p, 1,
  1120   1120           "ris)\",DATUM[\"Ancienne_Triangulation_Francaise_Paris\",");
  1121   1121       add_srs_wkt (p, 2,
  1122   1122           "SPHEROID[\"Plessis 1817\",6376523,308.64,AUTHORITY[\"EPS");
  1123   1123       add_srs_wkt (p, 3,
................................................................................
  1129   1129       add_srs_wkt (p, 6,
  1130   1130           "9105\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAS");
  1131   1131       add_srs_wkt (p, 7,
  1132   1132           "T],AUTHORITY[\"EPSG\",\"4901\"]],PROJECTION[\"Lambert_Co");
  1133   1133       add_srs_wkt (p, 8,
  1134   1134           "nformal_Conic_1SP\"],PARAMETER[\"latitude_of_origin\",55");
  1135   1135       add_srs_wkt (p, 9,
  1136         -        "],PARAMETER[\"central_meridian\",6],PARAMETER[\"scale_fa");
         1136  +        "],PARAMETER[\"central_meridian\",5.999999999999998],PARA");
  1137   1137       add_srs_wkt (p, 10,
  1138         -        "ctor\",0.99950908],PARAMETER[\"false_easting\",500000],P");
         1138  +        "METER[\"scale_factor\",0.99950908],PARAMETER[\"false_eas");
  1139   1139       add_srs_wkt (p, 11,
  1140         -        "ARAMETER[\"false_northing\",300000],UNIT[\"metre\",1,AUT");
         1140  +        "ting\",500000],PARAMETER[\"false_northing\",300000],UNIT");
  1141   1141       add_srs_wkt (p, 12,
  1142         -        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",N");
         1142  +        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EA");
  1143   1143       add_srs_wkt (p, 13,
  1144         -        "ORTH],AUTHORITY[\"EPSG\",\"27500\"]]");
         1144  +        "ST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"27500\"]]");
  1145   1145       p = add_epsg_def_ex (filter, first, last, 27561, "epsg", 27561,
  1146   1146           "NTF (Paris) / Lambert Nord France", 0, 0,
  1147   1147           "Clarke 1880 (IGN)", "Paris",
  1148   1148           "Nouvelle_Triangulation_Francaise_Paris", "Lambert_Conformal_Conic_1SP", "metre",
  1149   1149           "X", "East", "Y", "North");
  1150   1150       add_proj4text (p, 0,
  1151   1151           "+proj=lcc +lat_1=49.50000000000001 +lat_0=49.50000000000");
................................................................................
  1158   1158       add_srs_wkt (p, 0,
  1159   1159           "PROJCS[\"NTF (Paris) / Lambert Nord France\",GEOGCS[\"NT");
  1160   1160       add_srs_wkt (p, 1,
  1161   1161           "F (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Par");
  1162   1162       add_srs_wkt (p, 2,
  1163   1163           "is\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.466021");
  1164   1164       add_srs_wkt (p, 3,
  1165         -        "2936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
         1165  +        "2936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,3");
  1166   1166       add_srs_wkt (p, 4,
  1167   1167           "20,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris");
  1168   1168       add_srs_wkt (p, 5,
  1169   1169           "\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\"");
  1170   1170       add_srs_wkt (p, 6,
  1171   1171           ",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[");
  1172   1172       add_srs_wkt (p, 7,
................................................................................
  1199   1199       add_srs_wkt (p, 0,
  1200   1200           "PROJCS[\"NTF (Paris) / Lambert Centre France\",GEOGCS[\"");
  1201   1201       add_srs_wkt (p, 1,
  1202   1202           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  1203   1203       add_srs_wkt (p, 2,
  1204   1204           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  1205   1205       add_srs_wkt (p, 3,
  1206         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         1206  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  1207   1207       add_srs_wkt (p, 4,
  1208   1208           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  1209   1209       add_srs_wkt (p, 5,
  1210   1210           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  1211   1211       add_srs_wkt (p, 6,
  1212   1212           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  1213   1213       add_srs_wkt (p, 7,
................................................................................
  1242   1242       add_srs_wkt (p, 0,
  1243   1243           "PROJCS[\"NTF (Paris) / Lambert Sud France\",GEOGCS[\"NTF");
  1244   1244       add_srs_wkt (p, 1,
  1245   1245           " (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Pari");
  1246   1246       add_srs_wkt (p, 2,
  1247   1247           "s\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212");
  1248   1248       add_srs_wkt (p, 3,
  1249         -        "936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
         1249  +        "936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
  1250   1250       add_srs_wkt (p, 4,
  1251   1251           "0,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\"");
  1252   1252       add_srs_wkt (p, 5,
  1253   1253           ",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",");
  1254   1254       add_srs_wkt (p, 6,
  1255   1255           "0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"");
  1256   1256       add_srs_wkt (p, 7,
................................................................................
  1285   1285       add_srs_wkt (p, 0,
  1286   1286           "PROJCS[\"NTF (Paris) / Lambert Corse\",GEOGCS[\"NTF (Par");
  1287   1287       add_srs_wkt (p, 1,
  1288   1288           "is)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\",S");
  1289   1289       add_srs_wkt (p, 2,
  1290   1290           "PHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.466021293626");
  1291   1291       add_srs_wkt (p, 3,
  1292         -        "9,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,0");
         1292  +        "5,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,0");
  1293   1293       add_srs_wkt (p, 4,
  1294   1294           ",0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2.3");
  1295   1295       add_srs_wkt (p, 5,
  1296   1296           "3722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.01");
  1297   1297       add_srs_wkt (p, 6,
  1298   1298           "570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"Lat");
  1299   1299       add_srs_wkt (p, 7,
................................................................................
  1328   1328       add_srs_wkt (p, 0,
  1329   1329           "PROJCS[\"NTF (Paris) / Lambert zone I\",GEOGCS[\"NTF (Pa");
  1330   1330       add_srs_wkt (p, 1,
  1331   1331           "ris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\",");
  1332   1332       add_srs_wkt (p, 2,
  1333   1333           "SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602129362");
  1334   1334       add_srs_wkt (p, 3,
  1335         -        "69,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,");
         1335  +        "65,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0,");
  1336   1336       add_srs_wkt (p, 4,
  1337   1337           "0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2.");
  1338   1338       add_srs_wkt (p, 5,
  1339   1339           "33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.0");
  1340   1340       add_srs_wkt (p, 6,
  1341   1341           "1570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"La");
  1342   1342       add_srs_wkt (p, 7,
................................................................................
  1369   1369       add_srs_wkt (p, 0,
  1370   1370           "PROJCS[\"NTF (Paris) / Lambert zone II\",GEOGCS[\"NTF (P");
  1371   1371       add_srs_wkt (p, 1,
  1372   1372           "aris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\"");
  1373   1373       add_srs_wkt (p, 2,
  1374   1374           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1375   1375       add_srs_wkt (p, 3,
  1376         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         1376  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  1377   1377       add_srs_wkt (p, 4,
  1378   1378           ",0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2");
  1379   1379       add_srs_wkt (p, 5,
  1380   1380           ".33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.");
  1381   1381       add_srs_wkt (p, 6,
  1382   1382           "01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"L");
  1383   1383       add_srs_wkt (p, 7,
................................................................................
  1412   1412       add_srs_wkt (p, 0,
  1413   1413           "PROJCS[\"NTF (Paris) / Lambert zone III\",GEOGCS[\"NTF (");
  1414   1414       add_srs_wkt (p, 1,
  1415   1415           "Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\"");
  1416   1416       add_srs_wkt (p, 2,
  1417   1417           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1418   1418       add_srs_wkt (p, 3,
  1419         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         1419  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  1420   1420       add_srs_wkt (p, 4,
  1421   1421           ",0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2");
  1422   1422       add_srs_wkt (p, 5,
  1423   1423           ".33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.");
  1424   1424       add_srs_wkt (p, 6,
  1425   1425           "01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"L");
  1426   1426       add_srs_wkt (p, 7,
................................................................................
  1455   1455       add_srs_wkt (p, 0,
  1456   1456           "PROJCS[\"NTF (Paris) / Lambert zone IV\",GEOGCS[\"NTF (P");
  1457   1457       add_srs_wkt (p, 1,
  1458   1458           "aris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Paris\"");
  1459   1459       add_srs_wkt (p, 2,
  1460   1460           ",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212936");
  1461   1461       add_srs_wkt (p, 3,
  1462         -        "269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
         1462  +        "265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,320,0");
  1463   1463       add_srs_wkt (p, 4,
  1464   1464           ",0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\",2");
  1465   1465       add_srs_wkt (p, 5,
  1466   1466           ".33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",0.");
  1467   1467       add_srs_wkt (p, 6,
  1468   1468           "01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"L");
  1469   1469       add_srs_wkt (p, 7,
................................................................................
  1498   1498       add_srs_wkt (p, 0,
  1499   1499           "PROJCS[\"NTF (Paris) / France I (deprecated)\",GEOGCS[\"");
  1500   1500       add_srs_wkt (p, 1,
  1501   1501           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  1502   1502       add_srs_wkt (p, 2,
  1503   1503           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  1504   1504       add_srs_wkt (p, 3,
  1505         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         1505  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  1506   1506       add_srs_wkt (p, 4,
  1507   1507           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  1508   1508       add_srs_wkt (p, 5,
  1509   1509           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  1510   1510       add_srs_wkt (p, 6,
  1511   1511           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  1512   1512       add_srs_wkt (p, 7,
................................................................................
  1539   1539       add_srs_wkt (p, 0,
  1540   1540           "PROJCS[\"NTF (Paris) / France II (deprecated)\",GEOGCS[\"");
  1541   1541       add_srs_wkt (p, 1,
  1542   1542           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  1543   1543       add_srs_wkt (p, 2,
  1544   1544           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  1545   1545       add_srs_wkt (p, 3,
  1546         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         1546  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  1547   1547       add_srs_wkt (p, 4,
  1548   1548           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  1549   1549       add_srs_wkt (p, 5,
  1550   1550           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  1551   1551       add_srs_wkt (p, 6,
  1552   1552           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  1553   1553       add_srs_wkt (p, 7,
................................................................................
  1582   1582       add_srs_wkt (p, 0,
  1583   1583           "PROJCS[\"NTF (Paris) / France III (deprecated)\",GEOGCS[");
  1584   1584       add_srs_wkt (p, 1,
  1585   1585           "\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise");
  1586   1586       add_srs_wkt (p, 2,
  1587   1587           "_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46");
  1588   1588       add_srs_wkt (p, 3,
  1589         -        "60212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
         1589  +        "60212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
  1590   1590       add_srs_wkt (p, 4,
  1591   1591           "60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"P");
  1592   1592       add_srs_wkt (p, 5,
  1593   1593           "aris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"g");
  1594   1594       add_srs_wkt (p, 6,
  1595   1595           "rad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],");
  1596   1596       add_srs_wkt (p, 7,
................................................................................
  1625   1625       add_srs_wkt (p, 0,
  1626   1626           "PROJCS[\"NTF (Paris) / France IV (deprecated)\",GEOGCS[\"");
  1627   1627       add_srs_wkt (p, 1,
  1628   1628           "NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_P");
  1629   1629       add_srs_wkt (p, 2,
  1630   1630           "aris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660");
  1631   1631       add_srs_wkt (p, 3,
  1632         -        "212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
         1632  +        "212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60");
  1633   1633       add_srs_wkt (p, 4,
  1634   1634           ",320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Par");
  1635   1635       add_srs_wkt (p, 5,
  1636   1636           "is\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"gra");
  1637   1637       add_srs_wkt (p, 6,
  1638   1638           "d\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AX");
  1639   1639       add_srs_wkt (p, 7,
................................................................................
  1668   1668       add_srs_wkt (p, 0,
  1669   1669           "PROJCS[\"NTF (Paris) / Nord France (deprecated)\",GEOGCS");
  1670   1670       add_srs_wkt (p, 1,
  1671   1671           "[\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francais");
  1672   1672       add_srs_wkt (p, 2,
  1673   1673           "e_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4");
  1674   1674       add_srs_wkt (p, 3,
  1675         -        "660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,");
         1675  +        "660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,");
  1676   1676       add_srs_wkt (p, 4,
  1677   1677           "-60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"");
  1678   1678       add_srs_wkt (p, 5,
  1679   1679           "Paris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"");
  1680   1680       add_srs_wkt (p, 6,
  1681   1681           "grad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]]");
  1682   1682       add_srs_wkt (p, 7,
................................................................................
  1709   1709       add_srs_wkt (p, 0,
  1710   1710           "PROJCS[\"NTF (Paris) / Centre France (deprecated)\",GEOG");
  1711   1711       add_srs_wkt (p, 1,
  1712   1712           "CS[\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Franca");
  1713   1713       add_srs_wkt (p, 2,
  1714   1714           "ise_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293");
  1715   1715       add_srs_wkt (p, 3,
  1716         -        ".4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-16");
         1716  +        ".4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-16");
  1717   1717       add_srs_wkt (p, 4,
  1718   1718           "8,-60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[");
  1719   1719       add_srs_wkt (p, 5,
  1720   1720           "\"Paris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[");
  1721   1721       add_srs_wkt (p, 6,
  1722   1722           "\"grad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"");
  1723   1723       add_srs_wkt (p, 7,
................................................................................
  1752   1752       add_srs_wkt (p, 0,
  1753   1753           "PROJCS[\"NTF (Paris) / Sud France (deprecated)\",GEOGCS[");
  1754   1754       add_srs_wkt (p, 1,
  1755   1755           "\"NTF (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise");
  1756   1756       add_srs_wkt (p, 2,
  1757   1757           "_Paris\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46");
  1758   1758       add_srs_wkt (p, 3,
  1759         -        "60212936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
         1759  +        "60212936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-");
  1760   1760       add_srs_wkt (p, 4,
  1761   1761           "60,320,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"P");
  1762   1762       add_srs_wkt (p, 5,
  1763   1763           "aris\",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"g");
  1764   1764       add_srs_wkt (p, 6,
  1765   1765           "rad\",0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],");
  1766   1766       add_srs_wkt (p, 7,
................................................................................
  1795   1795       add_srs_wkt (p, 0,
  1796   1796           "PROJCS[\"NTF (Paris) / Corse (deprecated)\",GEOGCS[\"NTF");
  1797   1797       add_srs_wkt (p, 1,
  1798   1798           " (Paris)\",DATUM[\"Nouvelle_Triangulation_Francaise_Pari");
  1799   1799       add_srs_wkt (p, 2,
  1800   1800           "s\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.4660212");
  1801   1801       add_srs_wkt (p, 3,
  1802         -        "936269,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
         1802  +        "936265,AUTHORITY[\"EPSG\",\"7011\"]],TOWGS84[-168,-60,32");
  1803   1803       add_srs_wkt (p, 4,
  1804   1804           "0,0,0,0,0],AUTHORITY[\"EPSG\",\"6807\"]],PRIMEM[\"Paris\"");
  1805   1805       add_srs_wkt (p, 5,
  1806   1806           ",2.33722917,AUTHORITY[\"EPSG\",\"8903\"]],UNIT[\"grad\",");
  1807   1807       add_srs_wkt (p, 6,
  1808   1808           "0.01570796326794897,AUTHORITY[\"EPSG\",\"9105\"]],AXIS[\"");
  1809   1809       add_srs_wkt (p, 7,
................................................................................
  1869   1869           "Palestine_1923", "Cassini_Soldner", "metre",
  1870   1870           "Easting", "East", "Northing", "North");
  1871   1871       add_proj4text (p, 0,
  1872   1872           "+proj=cass +lat_0=31.73409694444445 +lon_0=35.2120805555");
  1873   1873       add_proj4text (p, 1,
  1874   1874           "5556 +x_0=170251.555 +y_0=126867.909 +a=6378300.789 +b=6");
  1875   1875       add_proj4text (p, 2,
  1876         -        "356566.435 +towgs84=-275.7224,94.7824,340.8944,-8.001,-4");
         1876  +        "356566.435 +towgs84=-275.722,94.7824,340.894,-8.001,-4.4");
  1877   1877       add_proj4text (p, 3,
  1878         -        ".42,-11.821,1 +units=m +no_defs");
         1878  +        "2,-11.821,1 +units=m +no_defs");
  1879   1879       add_srs_wkt (p, 0,
  1880   1880           "PROJCS[\"Palestine 1923 / Palestine Grid\",GEOGCS[\"Pale");
  1881   1881       add_srs_wkt (p, 1,
  1882   1882           "stine 1923\",DATUM[\"Palestine_1923\",SPHEROID[\"Clarke ");
  1883   1883       add_srs_wkt (p, 2,
  1884         -        "1880 (Benoit)\",6378300.789,293.4663155389811,AUTHORITY[");
  1885         -    add_srs_wkt (p, 3,
  1886         -        "\"EPSG\",\"7010\"]],TOWGS84[-275.7224,94.7824,340.8944,-");
  1887         -    add_srs_wkt (p, 4,
  1888         -        "8.001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PRI");
  1889         -    add_srs_wkt (p, 5,
  1890         -        "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1891         -    add_srs_wkt (p, 6,
  1892         -        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1893         -    add_srs_wkt (p, 7,
  1894         -        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
  1895         -    add_srs_wkt (p, 8,
  1896         -        "ORITY[\"EPSG\",\"4281\"]],PROJECTION[\"Cassini_Soldner\"");
  1897         -    add_srs_wkt (p, 9,
  1898         -        "],PARAMETER[\"latitude_of_origin\",31.73409694444445],PA");
  1899         -    add_srs_wkt (p, 10,
  1900         -        "RAMETER[\"central_meridian\",35.21208055555556],PARAMETE");
  1901         -    add_srs_wkt (p, 11,
  1902         -        "R[\"false_easting\",170251.555],PARAMETER[\"false_northi");
  1903         -    add_srs_wkt (p, 12,
  1904         -        "ng\",126867.909],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9");
  1905         -    add_srs_wkt (p, 13,
  1906         -        "001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],");
         1884  +        "1880 (Benoit)\",6378300.789,293.4663155389802,AUTHORITY[");
         1885  +    add_srs_wkt (p, 3,
         1886  +        "\"EPSG\",\"7010\"]],TOWGS84[-275.722,94.7824,340.894,-8.");
         1887  +    add_srs_wkt (p, 4,
         1888  +        "001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PRIME");
         1889  +    add_srs_wkt (p, 5,
         1890  +        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
         1891  +    add_srs_wkt (p, 6,
         1892  +        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
         1893  +    add_srs_wkt (p, 7,
         1894  +        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
         1895  +    add_srs_wkt (p, 8,
         1896  +        "RITY[\"EPSG\",\"4281\"]],PROJECTION[\"Cassini_Soldner\"]");
         1897  +    add_srs_wkt (p, 9,
         1898  +        ",PARAMETER[\"latitude_of_origin\",31.73409694444445],PAR");
         1899  +    add_srs_wkt (p, 10,
         1900  +        "AMETER[\"central_meridian\",35.21208055555556],PARAMETER");
         1901  +    add_srs_wkt (p, 11,
         1902  +        "[\"false_easting\",170251.555],PARAMETER[\"false_northin");
         1903  +    add_srs_wkt (p, 12,
         1904  +        "g\",126867.909],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"90");
         1905  +    add_srs_wkt (p, 13,
         1906  +        "01\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],A");
  1907   1907       add_srs_wkt (p, 14,
  1908         -        "AUTHORITY[\"EPSG\",\"28191\"]]");
         1908  +        "UTHORITY[\"EPSG\",\"28191\"]]");
  1909   1909       p = add_epsg_def_ex (filter, first, last, 28192, "epsg", 28192,
  1910   1910           "Palestine 1923 / Palestine Belt", 0, 0,
  1911   1911           "Clarke 1880 (Benoit)", "Greenwich",
  1912   1912           "Palestine_1923", "Transverse_Mercator", "metre",
  1913   1913           "Easting", "East", "Northing", "North");
  1914   1914       add_proj4text (p, 0,
  1915   1915           "+proj=tmerc +lat_0=31.73409694444445 +lon_0=35.212080555");
  1916   1916       add_proj4text (p, 1,
  1917   1917           "55556 +k=1 +x_0=170251.555 +y_0=1126867.909 +a=6378300.7");
  1918   1918       add_proj4text (p, 2,
  1919         -        "89 +b=6356566.435 +towgs84=-275.7224,94.7824,340.8944,-8");
         1919  +        "89 +b=6356566.435 +towgs84=-275.722,94.7824,340.894,-8.0");
  1920   1920       add_proj4text (p, 3,
  1921         -        ".001,-4.42,-11.821,1 +units=m +no_defs");
         1921  +        "01,-4.42,-11.821,1 +units=m +no_defs");
  1922   1922       add_srs_wkt (p, 0,
  1923   1923           "PROJCS[\"Palestine 1923 / Palestine Belt\",GEOGCS[\"Pale");
  1924   1924       add_srs_wkt (p, 1,
  1925   1925           "stine 1923\",DATUM[\"Palestine_1923\",SPHEROID[\"Clarke ");
  1926   1926       add_srs_wkt (p, 2,
  1927         -        "1880 (Benoit)\",6378300.789,293.4663155389811,AUTHORITY[");
  1928         -    add_srs_wkt (p, 3,
  1929         -        "\"EPSG\",\"7010\"]],TOWGS84[-275.7224,94.7824,340.8944,-");
  1930         -    add_srs_wkt (p, 4,
  1931         -        "8.001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PRI");
  1932         -    add_srs_wkt (p, 5,
  1933         -        "MEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1934         -    add_srs_wkt (p, 6,
  1935         -        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1936         -    add_srs_wkt (p, 7,
  1937         -        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
  1938         -    add_srs_wkt (p, 8,
  1939         -        "ORITY[\"EPSG\",\"4281\"]],PROJECTION[\"Transverse_Mercat");
  1940         -    add_srs_wkt (p, 9,
  1941         -        "or\"],PARAMETER[\"latitude_of_origin\",31.73409694444445");
  1942         -    add_srs_wkt (p, 10,
  1943         -        "],PARAMETER[\"central_meridian\",35.21208055555556],PARA");
  1944         -    add_srs_wkt (p, 11,
  1945         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",17");
  1946         -    add_srs_wkt (p, 12,
  1947         -        "0251.555],PARAMETER[\"false_northing\",1126867.909],UNIT");
  1948         -    add_srs_wkt (p, 13,
  1949         -        "[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Eastin");
         1927  +        "1880 (Benoit)\",6378300.789,293.4663155389802,AUTHORITY[");
         1928  +    add_srs_wkt (p, 3,
         1929  +        "\"EPSG\",\"7010\"]],TOWGS84[-275.722,94.7824,340.894,-8.");
         1930  +    add_srs_wkt (p, 4,
         1931  +        "001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PRIME");
         1932  +    add_srs_wkt (p, 5,
         1933  +        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
         1934  +    add_srs_wkt (p, 6,
         1935  +        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
         1936  +    add_srs_wkt (p, 7,
         1937  +        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
         1938  +    add_srs_wkt (p, 8,
         1939  +        "RITY[\"EPSG\",\"4281\"]],PROJECTION[\"Transverse_Mercato");
         1940  +    add_srs_wkt (p, 9,
         1941  +        "r\"],PARAMETER[\"latitude_of_origin\",31.73409694444445]");
         1942  +    add_srs_wkt (p, 10,
         1943  +        ",PARAMETER[\"central_meridian\",35.21208055555556],PARAM");
         1944  +    add_srs_wkt (p, 11,
         1945  +        "ETER[\"scale_factor\",1],PARAMETER[\"false_easting\",170");
         1946  +    add_srs_wkt (p, 12,
         1947  +        "251.555],PARAMETER[\"false_northing\",1126867.909],UNIT[");
         1948  +    add_srs_wkt (p, 13,
         1949  +        "\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"Easting");
  1950   1950       add_srs_wkt (p, 14,
  1951         -        "g\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"");
         1951  +        "\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"EPSG\",\"2");
  1952   1952       add_srs_wkt (p, 15,
  1953         -        "28192\"]]");
         1953  +        "8192\"]]");
  1954   1954       p = add_epsg_def_ex (filter, first, last, 28193, "epsg", 28193,
  1955   1955           "Palestine 1923 / Israeli CS Grid", 0, 0,
  1956   1956           "Clarke 1880 (Benoit)", "Greenwich",
  1957   1957           "Palestine_1923", "Cassini_Soldner", "metre",
  1958   1958           "Easting", "East", "Northing", "North");
  1959   1959       add_proj4text (p, 0,
  1960   1960           "+proj=cass +lat_0=31.73409694444445 +lon_0=35.2120805555");
  1961   1961       add_proj4text (p, 1,
  1962   1962           "5556 +x_0=170251.555 +y_0=1126867.909 +a=6378300.789 +b=");
  1963   1963       add_proj4text (p, 2,
  1964         -        "6356566.435 +towgs84=-275.7224,94.7824,340.8944,-8.001,-");
         1964  +        "6356566.435 +towgs84=-275.722,94.7824,340.894,-8.001,-4.");
  1965   1965       add_proj4text (p, 3,
  1966         -        "4.42,-11.821,1 +units=m +no_defs");
         1966  +        "42,-11.821,1 +units=m +no_defs");
  1967   1967       add_srs_wkt (p, 0,
  1968   1968           "PROJCS[\"Palestine 1923 / Israeli CS Grid\",GEOGCS[\"Pal");
  1969   1969       add_srs_wkt (p, 1,
  1970   1970           "estine 1923\",DATUM[\"Palestine_1923\",SPHEROID[\"Clarke");
  1971   1971       add_srs_wkt (p, 2,
  1972         -        " 1880 (Benoit)\",6378300.789,293.4663155389811,AUTHORITY");
         1972  +        " 1880 (Benoit)\",6378300.789,293.4663155389802,AUTHORITY");
  1973   1973       add_srs_wkt (p, 3,
  1974         -        "[\"EPSG\",\"7010\"]],TOWGS84[-275.7224,94.7824,340.8944,");
         1974  +        "[\"EPSG\",\"7010\"]],TOWGS84[-275.722,94.7824,340.894,-8");
  1975   1975       add_srs_wkt (p, 4,
  1976         -        "-8.001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PR");
         1976  +        ".001,-4.42,-11.821,1],AUTHORITY[\"EPSG\",\"6281\"]],PRIM");
  1977   1977       add_srs_wkt (p, 5,
  1978         -        "IMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[");
         1978  +        "EM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"");
  1979   1979       add_srs_wkt (p, 6,
  1980         -        "\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"");
         1980  +        "degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]");
  1981   1981       add_srs_wkt (p, 7,
  1982         -        "]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUT");
         1982  +        "],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTH");
  1983   1983       add_srs_wkt (p, 8,
  1984         -        "HORITY[\"EPSG\",\"4281\"]],PROJECTION[\"Cassini_Soldner\"");
         1984  +        "ORITY[\"EPSG\",\"4281\"]],PROJECTION[\"Cassini_Soldner\"");
  1985   1985       add_srs_wkt (p, 9,
  1986   1986           "],PARAMETER[\"latitude_of_origin\",31.73409694444445],PA");
  1987   1987       add_srs_wkt (p, 10,
  1988   1988           "RAMETER[\"central_meridian\",35.21208055555556],PARAMETE");
  1989   1989       add_srs_wkt (p, 11,
  1990   1990           "R[\"false_easting\",170251.555],PARAMETER[\"false_northi");
  1991   1991       add_srs_wkt (p, 12,
................................................................................
  2004   2004       add_proj4text (p, 1,
  2005   2005           "84=-148,51,-291,0,0,0,0 +units=m +no_defs");
  2006   2006       add_srs_wkt (p, 0,
  2007   2007           "PROJCS[\"Pointe Noire / UTM zone 32S\",GEOGCS[\"Pointe N");
  2008   2008       add_srs_wkt (p, 1,
  2009   2009           "oire\",DATUM[\"Congo_1960_Pointe_Noire\",SPHEROID[\"Clar");
  2010   2010       add_srs_wkt (p, 2,
  2011         -        "ke 1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"");
         2011  +        "ke 1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"");
  2012   2012       add_srs_wkt (p, 3,
  2013   2013           "EPSG\",\"7011\"]],TOWGS84[-148,51,-291,0,0,0,0],AUTHORIT");
  2014   2014       add_srs_wkt (p, 4,
  2015   2015           "Y[\"EPSG\",\"6282\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
  2016   2016       add_srs_wkt (p, 5,
  2017   2017           "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
  2018   2018       add_srs_wkt (p, 6,
................................................................................
  2442   2442           "Pulkovo 1942 / Gauss-Kruger zone 2 (deprecated)", 0, 1,
  2443   2443           "Krassowsky 1940", "Greenwich",
  2444   2444           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2445   2445           "X", "North", "Y", "East");
  2446   2446       add_proj4text (p, 0,
  2447   2447           "+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=2500000 +y_0=0 +");
  2448   2448       add_proj4text (p, 1,
  2449         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         2449  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  2450   2450       add_proj4text (p, 2,
  2451         -        "12 +units=m +no_defs");
         2451  +        ".12 +units=m +no_defs");
  2452   2452       add_srs_wkt (p, 0,
  2453   2453           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 2 (deprecated)");
  2454   2454       add_srs_wkt (p, 1,
  2455   2455           "\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHERO");
  2456   2456       add_srs_wkt (p, 2,
  2457   2457           "ID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",");
  2458   2458       add_srs_wkt (p, 3,
  2459         -        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12");
  2460         -    add_srs_wkt (p, 4,
  2461         -        "],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,A");
  2462         -    add_srs_wkt (p, 5,
  2463         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2464         -    add_srs_wkt (p, 6,
  2465         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2466         -    add_srs_wkt (p, 7,
  2467         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"428");
  2468         -    add_srs_wkt (p, 8,
  2469         -        "4\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
  2470         -    add_srs_wkt (p, 9,
  2471         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",9],");
  2472         -    add_srs_wkt (p, 10,
  2473         -        "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
  2474         -    add_srs_wkt (p, 11,
  2475         -        ",2500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\"");
  2476         -    add_srs_wkt (p, 12,
  2477         -        ",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[");
  2478         -    add_srs_wkt (p, 13,
  2479         -        "\"Y\",EAST],AUTHORITY[\"EPSG\",\"28402\"]]");
         2459  +        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.1");
         2460  +    add_srs_wkt (p, 4,
         2461  +        "2],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,");
         2462  +    add_srs_wkt (p, 5,
         2463  +        "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
         2464  +    add_srs_wkt (p, 6,
         2465  +        "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
         2466  +    add_srs_wkt (p, 7,
         2467  +        ",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"42");
         2468  +    add_srs_wkt (p, 8,
         2469  +        "84\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"l");
         2470  +    add_srs_wkt (p, 9,
         2471  +        "atitude_of_origin\",0],PARAMETER[\"central_meridian\",9]");
         2472  +    add_srs_wkt (p, 10,
         2473  +        ",PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting");
         2474  +    add_srs_wkt (p, 11,
         2475  +        "\",2500000],PARAMETER[\"false_northing\",0],UNIT[\"metre");
         2476  +    add_srs_wkt (p, 12,
         2477  +        "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXI");
         2478  +    add_srs_wkt (p, 13,
         2479  +        "S[\"Y\",EAST],AUTHORITY[\"EPSG\",\"28402\"]]");
  2480   2480       p = add_epsg_def_ex (filter, first, last, 28403, "epsg", 28403,
  2481   2481           "Pulkovo 1942 / Gauss-Kruger zone 3 (deprecated)", 0, 1,
  2482   2482           "Krassowsky 1940", "Greenwich",
  2483   2483           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2484   2484           "X", "North", "Y", "East");
  2485   2485       add_proj4text (p, 0,
  2486   2486           "+proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=3500000 +y_0=0 ");
  2487   2487       add_proj4text (p, 1,
  2488         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2488  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2489   2489       add_proj4text (p, 2,
  2490         -        ".12 +units=m +no_defs");
         2490  +        "0.12 +units=m +no_defs");
  2491   2491       add_srs_wkt (p, 0,
  2492   2492           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 3 (deprecated)");
  2493   2493       add_srs_wkt (p, 1,
  2494   2494           "\",GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHERO");
  2495   2495       add_srs_wkt (p, 2,
  2496   2496           "ID[\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",");
  2497   2497       add_srs_wkt (p, 3,
  2498         -        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12");
  2499         -    add_srs_wkt (p, 4,
  2500         -        "],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,A");
  2501         -    add_srs_wkt (p, 5,
  2502         -        "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2503         -    add_srs_wkt (p, 6,
  2504         -        "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2505         -    add_srs_wkt (p, 7,
  2506         -        "NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"428");
  2507         -    add_srs_wkt (p, 8,
  2508         -        "4\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"la");
  2509         -    add_srs_wkt (p, 9,
  2510         -        "titude_of_origin\",0],PARAMETER[\"central_meridian\",15]");
  2511         -    add_srs_wkt (p, 10,
  2512         -        ",PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting");
  2513         -    add_srs_wkt (p, 11,
  2514         -        "\",3500000],PARAMETER[\"false_northing\",0],UNIT[\"metre");
  2515         -    add_srs_wkt (p, 12,
  2516         -        "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXI");
  2517         -    add_srs_wkt (p, 13,
  2518         -        "S[\"Y\",EAST],AUTHORITY[\"EPSG\",\"28403\"]]");
         2498  +        "\"7024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.1");
         2499  +    add_srs_wkt (p, 4,
         2500  +        "2],AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,");
         2501  +    add_srs_wkt (p, 5,
         2502  +        "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
         2503  +    add_srs_wkt (p, 6,
         2504  +        "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
         2505  +    add_srs_wkt (p, 7,
         2506  +        ",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"42");
         2507  +    add_srs_wkt (p, 8,
         2508  +        "84\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"l");
         2509  +    add_srs_wkt (p, 9,
         2510  +        "atitude_of_origin\",0],PARAMETER[\"central_meridian\",15");
         2511  +    add_srs_wkt (p, 10,
         2512  +        "],PARAMETER[\"scale_factor\",1],PARAMETER[\"false_eastin");
         2513  +    add_srs_wkt (p, 11,
         2514  +        "g\",3500000],PARAMETER[\"false_northing\",0],UNIT[\"metr");
         2515  +    add_srs_wkt (p, 12,
         2516  +        "e\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AX");
         2517  +    add_srs_wkt (p, 13,
         2518  +        "IS[\"Y\",EAST],AUTHORITY[\"EPSG\",\"28403\"]]");
  2519   2519       p = add_epsg_def_ex (filter, first, last, 28404, "epsg", 28404,
  2520   2520           "Pulkovo 1942 / Gauss-Kruger zone 4", 0, 1,
  2521   2521           "Krassowsky 1940", "Greenwich",
  2522   2522           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2523   2523           "X", "North", "Y", "East");
  2524   2524       add_proj4text (p, 0,
  2525   2525           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=4500000 +y_0=0 ");
  2526   2526       add_proj4text (p, 1,
  2527         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2527  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2528   2528       add_proj4text (p, 2,
  2529         -        ".12 +units=m +no_defs");
         2529  +        "0.12 +units=m +no_defs");
  2530   2530       add_srs_wkt (p, 0,
  2531   2531           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 4\",GEOGCS[\"P");
  2532   2532       add_srs_wkt (p, 1,
  2533   2533           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2534   2534       add_srs_wkt (p, 2,
  2535   2535           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2536   2536       add_srs_wkt (p, 3,
  2537         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2538         -    add_srs_wkt (p, 4,
  2539         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2540         -    add_srs_wkt (p, 5,
  2541         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2542         -    add_srs_wkt (p, 6,
  2543         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2544         -    add_srs_wkt (p, 7,
  2545         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2546         -    add_srs_wkt (p, 8,
  2547         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2548         -    add_srs_wkt (p, 9,
  2549         -        "in\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"s");
  2550         -    add_srs_wkt (p, 10,
  2551         -        "cale_factor\",1],PARAMETER[\"false_easting\",4500000],PA");
  2552         -    add_srs_wkt (p, 11,
  2553         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2554         -    add_srs_wkt (p, 12,
  2555         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2556         -    add_srs_wkt (p, 13,
  2557         -        "AUTHORITY[\"EPSG\",\"28404\"]]");
         2537  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2538  +    add_srs_wkt (p, 4,
         2539  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2540  +    add_srs_wkt (p, 5,
         2541  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2542  +    add_srs_wkt (p, 6,
         2543  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2544  +    add_srs_wkt (p, 7,
         2545  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2546  +    add_srs_wkt (p, 8,
         2547  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2548  +    add_srs_wkt (p, 9,
         2549  +        "igin\",0],PARAMETER[\"central_meridian\",21],PARAMETER[\"");
         2550  +    add_srs_wkt (p, 10,
         2551  +        "scale_factor\",1],PARAMETER[\"false_easting\",4500000],P");
         2552  +    add_srs_wkt (p, 11,
         2553  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2554  +    add_srs_wkt (p, 12,
         2555  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2556  +    add_srs_wkt (p, 13,
         2557  +        ",AUTHORITY[\"EPSG\",\"28404\"]]");
  2558   2558       p = add_epsg_def_ex (filter, first, last, 28405, "epsg", 28405,
  2559   2559           "Pulkovo 1942 / Gauss-Kruger zone 5", 0, 1,
  2560   2560           "Krassowsky 1940", "Greenwich",
  2561   2561           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2562   2562           "X", "North", "Y", "East");
  2563   2563       add_proj4text (p, 0,
  2564   2564           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=5500000 +y_0=0 ");
  2565   2565       add_proj4text (p, 1,
  2566         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2566  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2567   2567       add_proj4text (p, 2,
  2568         -        ".12 +units=m +no_defs");
         2568  +        "0.12 +units=m +no_defs");
  2569   2569       add_srs_wkt (p, 0,
  2570   2570           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 5\",GEOGCS[\"P");
  2571   2571       add_srs_wkt (p, 1,
  2572   2572           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2573   2573       add_srs_wkt (p, 2,
  2574   2574           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2575   2575       add_srs_wkt (p, 3,
  2576         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2577         -    add_srs_wkt (p, 4,
  2578         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2579         -    add_srs_wkt (p, 5,
  2580         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2581         -    add_srs_wkt (p, 6,
  2582         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2583         -    add_srs_wkt (p, 7,
  2584         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2585         -    add_srs_wkt (p, 8,
  2586         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2587         -    add_srs_wkt (p, 9,
  2588         -        "in\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"s");
  2589         -    add_srs_wkt (p, 10,
  2590         -        "cale_factor\",1],PARAMETER[\"false_easting\",5500000],PA");
  2591         -    add_srs_wkt (p, 11,
  2592         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2593         -    add_srs_wkt (p, 12,
  2594         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2595         -    add_srs_wkt (p, 13,
  2596         -        "AUTHORITY[\"EPSG\",\"28405\"]]");
         2576  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2577  +    add_srs_wkt (p, 4,
         2578  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2579  +    add_srs_wkt (p, 5,
         2580  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2581  +    add_srs_wkt (p, 6,
         2582  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2583  +    add_srs_wkt (p, 7,
         2584  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2585  +    add_srs_wkt (p, 8,
         2586  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2587  +    add_srs_wkt (p, 9,
         2588  +        "igin\",0],PARAMETER[\"central_meridian\",27],PARAMETER[\"");
         2589  +    add_srs_wkt (p, 10,
         2590  +        "scale_factor\",1],PARAMETER[\"false_easting\",5500000],P");
         2591  +    add_srs_wkt (p, 11,
         2592  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2593  +    add_srs_wkt (p, 12,
         2594  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2595  +    add_srs_wkt (p, 13,
         2596  +        ",AUTHORITY[\"EPSG\",\"28405\"]]");
  2597   2597       p = add_epsg_def_ex (filter, first, last, 28406, "epsg", 28406,
  2598   2598           "Pulkovo 1942 / Gauss-Kruger zone 6", 0, 1,
  2599   2599           "Krassowsky 1940", "Greenwich",
  2600   2600           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2601   2601           "X", "North", "Y", "East");
  2602   2602       add_proj4text (p, 0,
  2603   2603           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=6500000 +y_0=0 ");
  2604   2604       add_proj4text (p, 1,
  2605         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2605  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2606   2606       add_proj4text (p, 2,
  2607         -        ".12 +units=m +no_defs");
         2607  +        "0.12 +units=m +no_defs");
  2608   2608       add_srs_wkt (p, 0,
  2609   2609           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 6\",GEOGCS[\"P");
  2610   2610       add_srs_wkt (p, 1,
  2611   2611           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2612   2612       add_srs_wkt (p, 2,
  2613   2613           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2614   2614       add_srs_wkt (p, 3,
  2615         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2616         -    add_srs_wkt (p, 4,
  2617         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2618         -    add_srs_wkt (p, 5,
  2619         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2620         -    add_srs_wkt (p, 6,
  2621         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2622         -    add_srs_wkt (p, 7,
  2623         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2624         -    add_srs_wkt (p, 8,
  2625         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2626         -    add_srs_wkt (p, 9,
  2627         -        "in\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"s");
  2628         -    add_srs_wkt (p, 10,
  2629         -        "cale_factor\",1],PARAMETER[\"false_easting\",6500000],PA");
  2630         -    add_srs_wkt (p, 11,
  2631         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2632         -    add_srs_wkt (p, 12,
  2633         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2634         -    add_srs_wkt (p, 13,
  2635         -        "AUTHORITY[\"EPSG\",\"28406\"]]");
         2615  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2616  +    add_srs_wkt (p, 4,
         2617  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2618  +    add_srs_wkt (p, 5,
         2619  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2620  +    add_srs_wkt (p, 6,
         2621  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2622  +    add_srs_wkt (p, 7,
         2623  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2624  +    add_srs_wkt (p, 8,
         2625  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2626  +    add_srs_wkt (p, 9,
         2627  +        "igin\",0],PARAMETER[\"central_meridian\",33],PARAMETER[\"");
         2628  +    add_srs_wkt (p, 10,
         2629  +        "scale_factor\",1],PARAMETER[\"false_easting\",6500000],P");
         2630  +    add_srs_wkt (p, 11,
         2631  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2632  +    add_srs_wkt (p, 12,
         2633  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2634  +    add_srs_wkt (p, 13,
         2635  +        ",AUTHORITY[\"EPSG\",\"28406\"]]");
  2636   2636       p = add_epsg_def_ex (filter, first, last, 28407, "epsg", 28407,
  2637   2637           "Pulkovo 1942 / Gauss-Kruger zone 7", 0, 1,
  2638   2638           "Krassowsky 1940", "Greenwich",
  2639   2639           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2640   2640           "X", "North", "Y", "East");
  2641   2641       add_proj4text (p, 0,
  2642   2642           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=7500000 +y_0=0 ");
  2643   2643       add_proj4text (p, 1,
  2644         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2644  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2645   2645       add_proj4text (p, 2,
  2646         -        ".12 +units=m +no_defs");
         2646  +        "0.12 +units=m +no_defs");
  2647   2647       add_srs_wkt (p, 0,
  2648   2648           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 7\",GEOGCS[\"P");
  2649   2649       add_srs_wkt (p, 1,
  2650   2650           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2651   2651       add_srs_wkt (p, 2,
  2652   2652           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2653   2653       add_srs_wkt (p, 3,
  2654         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2655         -    add_srs_wkt (p, 4,
  2656         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2657         -    add_srs_wkt (p, 5,
  2658         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2659         -    add_srs_wkt (p, 6,
  2660         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2661         -    add_srs_wkt (p, 7,
  2662         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2663         -    add_srs_wkt (p, 8,
  2664         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2665         -    add_srs_wkt (p, 9,
  2666         -        "in\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"s");
  2667         -    add_srs_wkt (p, 10,
  2668         -        "cale_factor\",1],PARAMETER[\"false_easting\",7500000],PA");
  2669         -    add_srs_wkt (p, 11,
  2670         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2671         -    add_srs_wkt (p, 12,
  2672         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2673         -    add_srs_wkt (p, 13,
  2674         -        "AUTHORITY[\"EPSG\",\"28407\"]]");
         2654  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2655  +    add_srs_wkt (p, 4,
         2656  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2657  +    add_srs_wkt (p, 5,
         2658  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2659  +    add_srs_wkt (p, 6,
         2660  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2661  +    add_srs_wkt (p, 7,
         2662  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2663  +    add_srs_wkt (p, 8,
         2664  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2665  +    add_srs_wkt (p, 9,
         2666  +        "igin\",0],PARAMETER[\"central_meridian\",39],PARAMETER[\"");
         2667  +    add_srs_wkt (p, 10,
         2668  +        "scale_factor\",1],PARAMETER[\"false_easting\",7500000],P");
         2669  +    add_srs_wkt (p, 11,
         2670  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2671  +    add_srs_wkt (p, 12,
         2672  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2673  +    add_srs_wkt (p, 13,
         2674  +        ",AUTHORITY[\"EPSG\",\"28407\"]]");
  2675   2675       p = add_epsg_def_ex (filter, first, last, 28408, "epsg", 28408,
  2676   2676           "Pulkovo 1942 / Gauss-Kruger zone 8", 0, 1,
  2677   2677           "Krassowsky 1940", "Greenwich",
  2678   2678           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2679   2679           "X", "North", "Y", "East");
  2680   2680       add_proj4text (p, 0,
  2681   2681           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=8500000 +y_0=0 ");
  2682   2682       add_proj4text (p, 1,
  2683         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2683  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2684   2684       add_proj4text (p, 2,
  2685         -        ".12 +units=m +no_defs");
         2685  +        "0.12 +units=m +no_defs");
  2686   2686       add_srs_wkt (p, 0,
  2687   2687           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 8\",GEOGCS[\"P");
  2688   2688       add_srs_wkt (p, 1,
  2689   2689           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2690   2690       add_srs_wkt (p, 2,
  2691   2691           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2692   2692       add_srs_wkt (p, 3,
  2693         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2694         -    add_srs_wkt (p, 4,
  2695         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2696         -    add_srs_wkt (p, 5,
  2697         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2698         -    add_srs_wkt (p, 6,
  2699         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2700         -    add_srs_wkt (p, 7,
  2701         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2702         -    add_srs_wkt (p, 8,
  2703         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2704         -    add_srs_wkt (p, 9,
  2705         -        "in\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"s");
  2706         -    add_srs_wkt (p, 10,
  2707         -        "cale_factor\",1],PARAMETER[\"false_easting\",8500000],PA");
  2708         -    add_srs_wkt (p, 11,
  2709         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2710         -    add_srs_wkt (p, 12,
  2711         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2712         -    add_srs_wkt (p, 13,
  2713         -        "AUTHORITY[\"EPSG\",\"28408\"]]");
         2693  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
         2694  +    add_srs_wkt (p, 4,
         2695  +        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
         2696  +    add_srs_wkt (p, 5,
         2697  +        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
         2698  +    add_srs_wkt (p, 6,
         2699  +        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
         2700  +    add_srs_wkt (p, 7,
         2701  +        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
         2702  +    add_srs_wkt (p, 8,
         2703  +        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
         2704  +    add_srs_wkt (p, 9,
         2705  +        "igin\",0],PARAMETER[\"central_meridian\",45],PARAMETER[\"");
         2706  +    add_srs_wkt (p, 10,
         2707  +        "scale_factor\",1],PARAMETER[\"false_easting\",8500000],P");
         2708  +    add_srs_wkt (p, 11,
         2709  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2710  +    add_srs_wkt (p, 12,
         2711  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2712  +    add_srs_wkt (p, 13,
         2713  +        ",AUTHORITY[\"EPSG\",\"28408\"]]");
  2714   2714       p = add_epsg_def_ex (filter, first, last, 28409, "epsg", 28409,
  2715   2715           "Pulkovo 1942 / Gauss-Kruger zone 9", 0, 1,
  2716   2716           "Krassowsky 1940", "Greenwich",
  2717   2717           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2718   2718           "X", "North", "Y", "East");
  2719   2719       add_proj4text (p, 0,
  2720   2720           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=9500000 +y_0=0 ");
  2721   2721       add_proj4text (p, 1,
  2722         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
         2722  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
  2723   2723       add_proj4text (p, 2,
  2724         -        ".12 +units=m +no_defs");
         2724  +        "0.12 +units=m +no_defs");
  2725   2725       add_srs_wkt (p, 0,
  2726   2726           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 9\",GEOGCS[\"P");
  2727   2727       add_srs_wkt (p, 1,
  2728   2728           "ulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassows");
  2729   2729       add_srs_wkt (p, 2,
  2730   2730           "ky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],TO");
  2731   2731       add_srs_wkt (p, 3,
  2732         -        "WGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[\"");
  2733         -    add_srs_wkt (p, 4,
  2734         -        "EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  2735         -    add_srs_wkt (p, 5,
  2736         -        "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  2737         -    add_srs_wkt (p, 6,
  2738         -        "ITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"");
  2739         -    add_srs_wkt (p, 7,
  2740         -        "Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJECTI");
  2741         -    add_srs_wkt (p, 8,
  2742         -        "ON[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_orig");
  2743         -    add_srs_wkt (p, 9,
  2744         -        "in\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"s");
  2745         -    add_srs_wkt (p, 10,
  2746         -        "cale_factor\",1],PARAMETER[\"false_easting\",9500000],PA");
  2747         -    add_srs_wkt (p, 11,
  2748         -        "RAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY");
  2749         -    add_srs_wkt (p, 12,
  2750         -        "[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST],");
  2751         -    add_srs_wkt (p, 13,
  2752         -        "AUTHORITY[\"EPSG\",\"28409\"]]");
  2753         -    p = add_epsg_def_ex (filter, first, last, 28410, "epsg", 28410,
  2754         -        "Pulkovo 1942 / Gauss-Kruger zone 10", 0, 1,
  2755         -        "Krassowsky 1940", "Greenwich",
  2756         -        "Pulkovo_1942", "Transverse_Mercator", "metre",
  2757         -        "X", "North", "Y", "East");
  2758         -    add_proj4text (p, 0,
  2759         -        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=10500000 +y_0=0");
  2760         -    add_proj4text (p, 1,
  2761         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
  2762         -    add_proj4text (p, 2,
  2763         -        "0.12 +units=m +no_defs");
  2764         -    add_srs_wkt (p, 0,
  2765         -        "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 10\",GEOGCS[\"");
  2766         -    add_srs_wkt (p, 1,
  2767         -        "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2768         -    add_srs_wkt (p, 2,
  2769         -        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2770         -    add_srs_wkt (p, 3,
  2771         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
         2732  +        "WGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY[");
  2772   2733       add_srs_wkt (p, 4,
  2773   2734           "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2774   2735       add_srs_wkt (p, 5,
  2775   2736           "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2776   2737       add_srs_wkt (p, 6,
  2777   2738           "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2778   2739       add_srs_wkt (p, 7,
  2779   2740           "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2780   2741       add_srs_wkt (p, 8,
  2781   2742           "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2782   2743       add_srs_wkt (p, 9,
  2783         -        "igin\",0],PARAMETER[\"central_meridian\",57],PARAMETER[\"");
  2784         -    add_srs_wkt (p, 10,
  2785         -        "scale_factor\",1],PARAMETER[\"false_easting\",10500000],");
  2786         -    add_srs_wkt (p, 11,
  2787         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2788         -    add_srs_wkt (p, 12,
  2789         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2790         -    add_srs_wkt (p, 13,
  2791         -        "],AUTHORITY[\"EPSG\",\"28410\"]]");
         2744  +        "igin\",0],PARAMETER[\"central_meridian\",51],PARAMETER[\"");
         2745  +    add_srs_wkt (p, 10,
         2746  +        "scale_factor\",1],PARAMETER[\"false_easting\",9500000],P");
         2747  +    add_srs_wkt (p, 11,
         2748  +        "ARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORIT");
         2749  +    add_srs_wkt (p, 12,
         2750  +        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST]");
         2751  +    add_srs_wkt (p, 13,
         2752  +        ",AUTHORITY[\"EPSG\",\"28409\"]]");
         2753  +    p = add_epsg_def_ex (filter, first, last, 28410, "epsg", 28410,
         2754  +        "Pulkovo 1942 / Gauss-Kruger zone 10", 0, 1,
         2755  +        "Krassowsky 1940", "Greenwich",
         2756  +        "Pulkovo_1942", "Transverse_Mercator", "metre",
         2757  +        "X", "North", "Y", "East");
         2758  +    add_proj4text (p, 0,
         2759  +        "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=10500000 +y_0=0");
         2760  +    add_proj4text (p, 1,
         2761  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
         2762  +    add_proj4text (p, 2,
         2763  +        "-0.12 +units=m +no_defs");
         2764  +    add_srs_wkt (p, 0,
         2765  +        "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 10\",GEOGCS[\"");
         2766  +    add_srs_wkt (p, 1,
         2767  +        "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
         2768  +    add_srs_wkt (p, 2,
         2769  +        "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
         2770  +    add_srs_wkt (p, 3,
         2771  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2772  +    add_srs_wkt (p, 4,
         2773  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2774  +    add_srs_wkt (p, 5,
         2775  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2776  +    add_srs_wkt (p, 6,
         2777  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2778  +    add_srs_wkt (p, 7,
         2779  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2780  +    add_srs_wkt (p, 8,
         2781  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2782  +    add_srs_wkt (p, 9,
         2783  +        "rigin\",0],PARAMETER[\"central_meridian\",57],PARAMETER[");
         2784  +    add_srs_wkt (p, 10,
         2785  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",10500000");
         2786  +    add_srs_wkt (p, 11,
         2787  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2788  +    add_srs_wkt (p, 12,
         2789  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2790  +    add_srs_wkt (p, 13,
         2791  +        "ST],AUTHORITY[\"EPSG\",\"28410\"]]");
  2792   2792       p = add_epsg_def_ex (filter, first, last, 28411, "epsg", 28411,
  2793   2793           "Pulkovo 1942 / Gauss-Kruger zone 11", 0, 1,
  2794   2794           "Krassowsky 1940", "Greenwich",
  2795   2795           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2796   2796           "X", "North", "Y", "East");
  2797   2797       add_proj4text (p, 0,
  2798   2798           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=11500000 +y_0=0");
  2799   2799       add_proj4text (p, 1,
  2800         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2800  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2801   2801       add_proj4text (p, 2,
  2802         -        "0.12 +units=m +no_defs");
         2802  +        "-0.12 +units=m +no_defs");
  2803   2803       add_srs_wkt (p, 0,
  2804   2804           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 11\",GEOGCS[\"");
  2805   2805       add_srs_wkt (p, 1,
  2806   2806           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2807   2807       add_srs_wkt (p, 2,
  2808   2808           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2809   2809       add_srs_wkt (p, 3,
  2810         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  2811         -    add_srs_wkt (p, 4,
  2812         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2813         -    add_srs_wkt (p, 5,
  2814         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2815         -    add_srs_wkt (p, 6,
  2816         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2817         -    add_srs_wkt (p, 7,
  2818         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2819         -    add_srs_wkt (p, 8,
  2820         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2821         -    add_srs_wkt (p, 9,
  2822         -        "igin\",0],PARAMETER[\"central_meridian\",63],PARAMETER[\"");
  2823         -    add_srs_wkt (p, 10,
  2824         -        "scale_factor\",1],PARAMETER[\"false_easting\",11500000],");
  2825         -    add_srs_wkt (p, 11,
  2826         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2827         -    add_srs_wkt (p, 12,
  2828         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2829         -    add_srs_wkt (p, 13,
  2830         -        "],AUTHORITY[\"EPSG\",\"28411\"]]");
         2810  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2811  +    add_srs_wkt (p, 4,
         2812  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2813  +    add_srs_wkt (p, 5,
         2814  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2815  +    add_srs_wkt (p, 6,
         2816  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2817  +    add_srs_wkt (p, 7,
         2818  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2819  +    add_srs_wkt (p, 8,
         2820  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2821  +    add_srs_wkt (p, 9,
         2822  +        "rigin\",0],PARAMETER[\"central_meridian\",63],PARAMETER[");
         2823  +    add_srs_wkt (p, 10,
         2824  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",11500000");
         2825  +    add_srs_wkt (p, 11,
         2826  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2827  +    add_srs_wkt (p, 12,
         2828  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2829  +    add_srs_wkt (p, 13,
         2830  +        "ST],AUTHORITY[\"EPSG\",\"28411\"]]");
  2831   2831       p = add_epsg_def_ex (filter, first, last, 28412, "epsg", 28412,
  2832   2832           "Pulkovo 1942 / Gauss-Kruger zone 12", 0, 1,
  2833   2833           "Krassowsky 1940", "Greenwich",
  2834   2834           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2835   2835           "X", "North", "Y", "East");
  2836   2836       add_proj4text (p, 0,
  2837   2837           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=12500000 +y_0=0");
  2838   2838       add_proj4text (p, 1,
  2839         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2839  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2840   2840       add_proj4text (p, 2,
  2841         -        "0.12 +units=m +no_defs");
         2841  +        "-0.12 +units=m +no_defs");
  2842   2842       add_srs_wkt (p, 0,
  2843   2843           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 12\",GEOGCS[\"");
  2844   2844       add_srs_wkt (p, 1,
  2845   2845           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2846   2846       add_srs_wkt (p, 2,
  2847   2847           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2848   2848       add_srs_wkt (p, 3,
  2849         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  2850         -    add_srs_wkt (p, 4,
  2851         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2852         -    add_srs_wkt (p, 5,
  2853         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2854         -    add_srs_wkt (p, 6,
  2855         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2856         -    add_srs_wkt (p, 7,
  2857         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2858         -    add_srs_wkt (p, 8,
  2859         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2860         -    add_srs_wkt (p, 9,
  2861         -        "igin\",0],PARAMETER[\"central_meridian\",69],PARAMETER[\"");
  2862         -    add_srs_wkt (p, 10,
  2863         -        "scale_factor\",1],PARAMETER[\"false_easting\",12500000],");
  2864         -    add_srs_wkt (p, 11,
  2865         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2866         -    add_srs_wkt (p, 12,
  2867         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2868         -    add_srs_wkt (p, 13,
  2869         -        "],AUTHORITY[\"EPSG\",\"28412\"]]");
         2849  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2850  +    add_srs_wkt (p, 4,
         2851  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2852  +    add_srs_wkt (p, 5,
         2853  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2854  +    add_srs_wkt (p, 6,
         2855  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2856  +    add_srs_wkt (p, 7,
         2857  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2858  +    add_srs_wkt (p, 8,
         2859  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2860  +    add_srs_wkt (p, 9,
         2861  +        "rigin\",0],PARAMETER[\"central_meridian\",69],PARAMETER[");
         2862  +    add_srs_wkt (p, 10,
         2863  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",12500000");
         2864  +    add_srs_wkt (p, 11,
         2865  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2866  +    add_srs_wkt (p, 12,
         2867  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2868  +    add_srs_wkt (p, 13,
         2869  +        "ST],AUTHORITY[\"EPSG\",\"28412\"]]");
  2870   2870       p = add_epsg_def_ex (filter, first, last, 28413, "epsg", 28413,
  2871   2871           "Pulkovo 1942 / Gauss-Kruger zone 13", 0, 1,
  2872   2872           "Krassowsky 1940", "Greenwich",
  2873   2873           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2874   2874           "X", "North", "Y", "East");
  2875   2875       add_proj4text (p, 0,
  2876   2876           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=13500000 +y_0=0");
  2877   2877       add_proj4text (p, 1,
  2878         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2878  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2879   2879       add_proj4text (p, 2,
  2880         -        "0.12 +units=m +no_defs");
         2880  +        "-0.12 +units=m +no_defs");
  2881   2881       add_srs_wkt (p, 0,
  2882   2882           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 13\",GEOGCS[\"");
  2883   2883       add_srs_wkt (p, 1,
  2884   2884           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2885   2885       add_srs_wkt (p, 2,
  2886   2886           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2887   2887       add_srs_wkt (p, 3,
  2888         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  2889         -    add_srs_wkt (p, 4,
  2890         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2891         -    add_srs_wkt (p, 5,
  2892         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2893         -    add_srs_wkt (p, 6,
  2894         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2895         -    add_srs_wkt (p, 7,
  2896         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2897         -    add_srs_wkt (p, 8,
  2898         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2899         -    add_srs_wkt (p, 9,
  2900         -        "igin\",0],PARAMETER[\"central_meridian\",75],PARAMETER[\"");
  2901         -    add_srs_wkt (p, 10,
  2902         -        "scale_factor\",1],PARAMETER[\"false_easting\",13500000],");
  2903         -    add_srs_wkt (p, 11,
  2904         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2905         -    add_srs_wkt (p, 12,
  2906         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2907         -    add_srs_wkt (p, 13,
  2908         -        "],AUTHORITY[\"EPSG\",\"28413\"]]");
         2888  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2889  +    add_srs_wkt (p, 4,
         2890  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2891  +    add_srs_wkt (p, 5,
         2892  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2893  +    add_srs_wkt (p, 6,
         2894  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2895  +    add_srs_wkt (p, 7,
         2896  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2897  +    add_srs_wkt (p, 8,
         2898  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2899  +    add_srs_wkt (p, 9,
         2900  +        "rigin\",0],PARAMETER[\"central_meridian\",75],PARAMETER[");
         2901  +    add_srs_wkt (p, 10,
         2902  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",13500000");
         2903  +    add_srs_wkt (p, 11,
         2904  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2905  +    add_srs_wkt (p, 12,
         2906  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2907  +    add_srs_wkt (p, 13,
         2908  +        "ST],AUTHORITY[\"EPSG\",\"28413\"]]");
  2909   2909       p = add_epsg_def_ex (filter, first, last, 28414, "epsg", 28414,
  2910   2910           "Pulkovo 1942 / Gauss-Kruger zone 14", 0, 1,
  2911   2911           "Krassowsky 1940", "Greenwich",
  2912   2912           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2913   2913           "X", "North", "Y", "East");
  2914   2914       add_proj4text (p, 0,
  2915   2915           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=14500000 +y_0=0");
  2916   2916       add_proj4text (p, 1,
  2917         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2917  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2918   2918       add_proj4text (p, 2,
  2919         -        "0.12 +units=m +no_defs");
         2919  +        "-0.12 +units=m +no_defs");
  2920   2920       add_srs_wkt (p, 0,
  2921   2921           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 14\",GEOGCS[\"");
  2922   2922       add_srs_wkt (p, 1,
  2923   2923           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2924   2924       add_srs_wkt (p, 2,
  2925   2925           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2926   2926       add_srs_wkt (p, 3,
  2927         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  2928         -    add_srs_wkt (p, 4,
  2929         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2930         -    add_srs_wkt (p, 5,
  2931         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2932         -    add_srs_wkt (p, 6,
  2933         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2934         -    add_srs_wkt (p, 7,
  2935         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2936         -    add_srs_wkt (p, 8,
  2937         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2938         -    add_srs_wkt (p, 9,
  2939         -        "igin\",0],PARAMETER[\"central_meridian\",81],PARAMETER[\"");
  2940         -    add_srs_wkt (p, 10,
  2941         -        "scale_factor\",1],PARAMETER[\"false_easting\",14500000],");
  2942         -    add_srs_wkt (p, 11,
  2943         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2944         -    add_srs_wkt (p, 12,
  2945         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2946         -    add_srs_wkt (p, 13,
  2947         -        "],AUTHORITY[\"EPSG\",\"28414\"]]");
         2927  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2928  +    add_srs_wkt (p, 4,
         2929  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2930  +    add_srs_wkt (p, 5,
         2931  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2932  +    add_srs_wkt (p, 6,
         2933  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2934  +    add_srs_wkt (p, 7,
         2935  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2936  +    add_srs_wkt (p, 8,
         2937  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2938  +    add_srs_wkt (p, 9,
         2939  +        "rigin\",0],PARAMETER[\"central_meridian\",81],PARAMETER[");
         2940  +    add_srs_wkt (p, 10,
         2941  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",14500000");
         2942  +    add_srs_wkt (p, 11,
         2943  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2944  +    add_srs_wkt (p, 12,
         2945  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2946  +    add_srs_wkt (p, 13,
         2947  +        "ST],AUTHORITY[\"EPSG\",\"28414\"]]");
  2948   2948       p = add_epsg_def_ex (filter, first, last, 28415, "epsg", 28415,
  2949   2949           "Pulkovo 1942 / Gauss-Kruger zone 15", 0, 1,
  2950   2950           "Krassowsky 1940", "Greenwich",
  2951   2951           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2952   2952           "X", "North", "Y", "East");
  2953   2953       add_proj4text (p, 0,
  2954   2954           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=15500000 +y_0=0");
  2955   2955       add_proj4text (p, 1,
  2956         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2956  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2957   2957       add_proj4text (p, 2,
  2958         -        "0.12 +units=m +no_defs");
         2958  +        "-0.12 +units=m +no_defs");
  2959   2959       add_srs_wkt (p, 0,
  2960   2960           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 15\",GEOGCS[\"");
  2961   2961       add_srs_wkt (p, 1,
  2962   2962           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  2963   2963       add_srs_wkt (p, 2,
  2964   2964           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  2965   2965       add_srs_wkt (p, 3,
  2966         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  2967         -    add_srs_wkt (p, 4,
  2968         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  2969         -    add_srs_wkt (p, 5,
  2970         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  2971         -    add_srs_wkt (p, 6,
  2972         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  2973         -    add_srs_wkt (p, 7,
  2974         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  2975         -    add_srs_wkt (p, 8,
  2976         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  2977         -    add_srs_wkt (p, 9,
  2978         -        "igin\",0],PARAMETER[\"central_meridian\",87],PARAMETER[\"");
  2979         -    add_srs_wkt (p, 10,
  2980         -        "scale_factor\",1],PARAMETER[\"false_easting\",15500000],");
  2981         -    add_srs_wkt (p, 11,
  2982         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  2983         -    add_srs_wkt (p, 12,
  2984         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  2985         -    add_srs_wkt (p, 13,
  2986         -        "],AUTHORITY[\"EPSG\",\"28415\"]]");
         2966  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         2967  +    add_srs_wkt (p, 4,
         2968  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         2969  +    add_srs_wkt (p, 5,
         2970  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         2971  +    add_srs_wkt (p, 6,
         2972  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         2973  +    add_srs_wkt (p, 7,
         2974  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         2975  +    add_srs_wkt (p, 8,
         2976  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         2977  +    add_srs_wkt (p, 9,
         2978  +        "rigin\",0],PARAMETER[\"central_meridian\",87],PARAMETER[");
         2979  +    add_srs_wkt (p, 10,
         2980  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",15500000");
         2981  +    add_srs_wkt (p, 11,
         2982  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         2983  +    add_srs_wkt (p, 12,
         2984  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         2985  +    add_srs_wkt (p, 13,
         2986  +        "ST],AUTHORITY[\"EPSG\",\"28415\"]]");
  2987   2987       p = add_epsg_def_ex (filter, first, last, 28416, "epsg", 28416,
  2988   2988           "Pulkovo 1942 / Gauss-Kruger zone 16", 0, 1,
  2989   2989           "Krassowsky 1940", "Greenwich",
  2990   2990           "Pulkovo_1942", "Transverse_Mercator", "metre",
  2991   2991           "X", "North", "Y", "East");
  2992   2992       add_proj4text (p, 0,
  2993   2993           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=16500000 +y_0=0");
  2994   2994       add_proj4text (p, 1,
  2995         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         2995  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  2996   2996       add_proj4text (p, 2,
  2997         -        "0.12 +units=m +no_defs");
         2997  +        "-0.12 +units=m +no_defs");
  2998   2998       add_srs_wkt (p, 0,
  2999   2999           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 16\",GEOGCS[\"");
  3000   3000       add_srs_wkt (p, 1,
  3001   3001           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3002   3002       add_srs_wkt (p, 2,
  3003   3003           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3004   3004       add_srs_wkt (p, 3,
  3005         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3006         -    add_srs_wkt (p, 4,
  3007         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3008         -    add_srs_wkt (p, 5,
  3009         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3010         -    add_srs_wkt (p, 6,
  3011         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3012         -    add_srs_wkt (p, 7,
  3013         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3014         -    add_srs_wkt (p, 8,
  3015         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3016         -    add_srs_wkt (p, 9,
  3017         -        "igin\",0],PARAMETER[\"central_meridian\",93],PARAMETER[\"");
  3018         -    add_srs_wkt (p, 10,
  3019         -        "scale_factor\",1],PARAMETER[\"false_easting\",16500000],");
  3020         -    add_srs_wkt (p, 11,
  3021         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3022         -    add_srs_wkt (p, 12,
  3023         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3024         -    add_srs_wkt (p, 13,
  3025         -        "],AUTHORITY[\"EPSG\",\"28416\"]]");
         3005  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3006  +    add_srs_wkt (p, 4,
         3007  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3008  +    add_srs_wkt (p, 5,
         3009  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3010  +    add_srs_wkt (p, 6,
         3011  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3012  +    add_srs_wkt (p, 7,
         3013  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3014  +    add_srs_wkt (p, 8,
         3015  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3016  +    add_srs_wkt (p, 9,
         3017  +        "rigin\",0],PARAMETER[\"central_meridian\",93],PARAMETER[");
         3018  +    add_srs_wkt (p, 10,
         3019  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",16500000");
         3020  +    add_srs_wkt (p, 11,
         3021  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         3022  +    add_srs_wkt (p, 12,
         3023  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         3024  +    add_srs_wkt (p, 13,
         3025  +        "ST],AUTHORITY[\"EPSG\",\"28416\"]]");
  3026   3026       p = add_epsg_def_ex (filter, first, last, 28417, "epsg", 28417,
  3027   3027           "Pulkovo 1942 / Gauss-Kruger zone 17", 0, 1,
  3028   3028           "Krassowsky 1940", "Greenwich",
  3029   3029           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3030   3030           "X", "North", "Y", "East");
  3031   3031       add_proj4text (p, 0,
  3032   3032           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=17500000 +y_0=0");
  3033   3033       add_proj4text (p, 1,
  3034         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
         3034  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
  3035   3035       add_proj4text (p, 2,
  3036         -        "0.12 +units=m +no_defs");
         3036  +        "-0.12 +units=m +no_defs");
  3037   3037       add_srs_wkt (p, 0,
  3038   3038           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 17\",GEOGCS[\"");
  3039   3039       add_srs_wkt (p, 1,
  3040   3040           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3041   3041       add_srs_wkt (p, 2,
  3042   3042           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3043   3043       add_srs_wkt (p, 3,
  3044         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3045         -    add_srs_wkt (p, 4,
  3046         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3047         -    add_srs_wkt (p, 5,
  3048         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3049         -    add_srs_wkt (p, 6,
  3050         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3051         -    add_srs_wkt (p, 7,
  3052         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3053         -    add_srs_wkt (p, 8,
  3054         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3055         -    add_srs_wkt (p, 9,
  3056         -        "igin\",0],PARAMETER[\"central_meridian\",99],PARAMETER[\"");
  3057         -    add_srs_wkt (p, 10,
  3058         -        "scale_factor\",1],PARAMETER[\"false_easting\",17500000],");
  3059         -    add_srs_wkt (p, 11,
  3060         -        "PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORI");
  3061         -    add_srs_wkt (p, 12,
  3062         -        "TY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EAST");
  3063         -    add_srs_wkt (p, 13,
  3064         -        "],AUTHORITY[\"EPSG\",\"28417\"]]");
         3044  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3045  +    add_srs_wkt (p, 4,
         3046  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3047  +    add_srs_wkt (p, 5,
         3048  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3049  +    add_srs_wkt (p, 6,
         3050  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3051  +    add_srs_wkt (p, 7,
         3052  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3053  +    add_srs_wkt (p, 8,
         3054  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3055  +    add_srs_wkt (p, 9,
         3056  +        "rigin\",0],PARAMETER[\"central_meridian\",99],PARAMETER[");
         3057  +    add_srs_wkt (p, 10,
         3058  +        "\"scale_factor\",1],PARAMETER[\"false_easting\",17500000");
         3059  +    add_srs_wkt (p, 11,
         3060  +        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
         3061  +    add_srs_wkt (p, 12,
         3062  +        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
         3063  +    add_srs_wkt (p, 13,
         3064  +        "ST],AUTHORITY[\"EPSG\",\"28417\"]]");
  3065   3065       p = add_epsg_def_ex (filter, first, last, 28418, "epsg", 28418,
  3066   3066           "Pulkovo 1942 / Gauss-Kruger zone 18", 0, 1,
  3067   3067           "Krassowsky 1940", "Greenwich",
  3068   3068           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3069   3069           "X", "North", "Y", "East");
  3070   3070       add_proj4text (p, 0,
  3071   3071           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=18500000 +y_0=");
  3072   3072       add_proj4text (p, 1,
  3073         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3073  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3074   3074       add_proj4text (p, 2,
  3075         -        "-0.12 +units=m +no_defs");
         3075  +        ",-0.12 +units=m +no_defs");
  3076   3076       add_srs_wkt (p, 0,
  3077   3077           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 18\",GEOGCS[\"");
  3078   3078       add_srs_wkt (p, 1,
  3079   3079           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3080   3080       add_srs_wkt (p, 2,
  3081   3081           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3082   3082       add_srs_wkt (p, 3,
  3083         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3084         -    add_srs_wkt (p, 4,
  3085         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3086         -    add_srs_wkt (p, 5,
  3087         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3088         -    add_srs_wkt (p, 6,
  3089         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3090         -    add_srs_wkt (p, 7,
  3091         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3092         -    add_srs_wkt (p, 8,
  3093         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3094         -    add_srs_wkt (p, 9,
  3095         -        "igin\",0],PARAMETER[\"central_meridian\",105],PARAMETER[");
  3096         -    add_srs_wkt (p, 10,
  3097         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",18500000");
  3098         -    add_srs_wkt (p, 11,
  3099         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3100         -    add_srs_wkt (p, 12,
  3101         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3102         -    add_srs_wkt (p, 13,
  3103         -        "ST],AUTHORITY[\"EPSG\",\"28418\"]]");
         3083  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3084  +    add_srs_wkt (p, 4,
         3085  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3086  +    add_srs_wkt (p, 5,
         3087  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3088  +    add_srs_wkt (p, 6,
         3089  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3090  +    add_srs_wkt (p, 7,
         3091  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3092  +    add_srs_wkt (p, 8,
         3093  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3094  +    add_srs_wkt (p, 9,
         3095  +        "rigin\",0],PARAMETER[\"central_meridian\",105],PARAMETER");
         3096  +    add_srs_wkt (p, 10,
         3097  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",1850000");
         3098  +    add_srs_wkt (p, 11,
         3099  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3100  +    add_srs_wkt (p, 12,
         3101  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3102  +    add_srs_wkt (p, 13,
         3103  +        "AST],AUTHORITY[\"EPSG\",\"28418\"]]");
  3104   3104       p = add_epsg_def_ex (filter, first, last, 28419, "epsg", 28419,
  3105   3105           "Pulkovo 1942 / Gauss-Kruger zone 19", 0, 1,
  3106   3106           "Krassowsky 1940", "Greenwich",
  3107   3107           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3108   3108           "X", "North", "Y", "East");
  3109   3109       add_proj4text (p, 0,
  3110   3110           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=19500000 +y_0=");
  3111   3111       add_proj4text (p, 1,
  3112         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3112  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3113   3113       add_proj4text (p, 2,
  3114         -        "-0.12 +units=m +no_defs");
         3114  +        ",-0.12 +units=m +no_defs");
  3115   3115       add_srs_wkt (p, 0,
  3116   3116           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 19\",GEOGCS[\"");
  3117   3117       add_srs_wkt (p, 1,
  3118   3118           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3119   3119       add_srs_wkt (p, 2,
  3120   3120           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3121   3121       add_srs_wkt (p, 3,
  3122         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3123         -    add_srs_wkt (p, 4,
  3124         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3125         -    add_srs_wkt (p, 5,
  3126         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3127         -    add_srs_wkt (p, 6,
  3128         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3129         -    add_srs_wkt (p, 7,
  3130         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3131         -    add_srs_wkt (p, 8,
  3132         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3133         -    add_srs_wkt (p, 9,
  3134         -        "igin\",0],PARAMETER[\"central_meridian\",111],PARAMETER[");
  3135         -    add_srs_wkt (p, 10,
  3136         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",19500000");
  3137         -    add_srs_wkt (p, 11,
  3138         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3139         -    add_srs_wkt (p, 12,
  3140         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3141         -    add_srs_wkt (p, 13,
  3142         -        "ST],AUTHORITY[\"EPSG\",\"28419\"]]");
         3122  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3123  +    add_srs_wkt (p, 4,
         3124  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3125  +    add_srs_wkt (p, 5,
         3126  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3127  +    add_srs_wkt (p, 6,
         3128  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3129  +    add_srs_wkt (p, 7,
         3130  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3131  +    add_srs_wkt (p, 8,
         3132  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3133  +    add_srs_wkt (p, 9,
         3134  +        "rigin\",0],PARAMETER[\"central_meridian\",111],PARAMETER");
         3135  +    add_srs_wkt (p, 10,
         3136  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",1950000");
         3137  +    add_srs_wkt (p, 11,
         3138  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3139  +    add_srs_wkt (p, 12,
         3140  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3141  +    add_srs_wkt (p, 13,
         3142  +        "AST],AUTHORITY[\"EPSG\",\"28419\"]]");
  3143   3143       p = add_epsg_def_ex (filter, first, last, 28420, "epsg", 28420,
  3144   3144           "Pulkovo 1942 / Gauss-Kruger zone 20", 0, 1,
  3145   3145           "Krassowsky 1940", "Greenwich",
  3146   3146           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3147   3147           "X", "North", "Y", "East");
  3148   3148       add_proj4text (p, 0,
  3149   3149           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=20500000 +y_0=");
  3150   3150       add_proj4text (p, 1,
  3151         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3151  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3152   3152       add_proj4text (p, 2,
  3153         -        "-0.12 +units=m +no_defs");
         3153  +        ",-0.12 +units=m +no_defs");
  3154   3154       add_srs_wkt (p, 0,
  3155   3155           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 20\",GEOGCS[\"");
  3156   3156       add_srs_wkt (p, 1,
  3157   3157           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3158   3158       add_srs_wkt (p, 2,
  3159   3159           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3160   3160       add_srs_wkt (p, 3,
  3161         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3162         -    add_srs_wkt (p, 4,
  3163         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3164         -    add_srs_wkt (p, 5,
  3165         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3166         -    add_srs_wkt (p, 6,
  3167         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3168         -    add_srs_wkt (p, 7,
  3169         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3170         -    add_srs_wkt (p, 8,
  3171         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3172         -    add_srs_wkt (p, 9,
  3173         -        "igin\",0],PARAMETER[\"central_meridian\",117],PARAMETER[");
  3174         -    add_srs_wkt (p, 10,
  3175         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",20500000");
  3176         -    add_srs_wkt (p, 11,
  3177         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3178         -    add_srs_wkt (p, 12,
  3179         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3180         -    add_srs_wkt (p, 13,
  3181         -        "ST],AUTHORITY[\"EPSG\",\"28420\"]]");
         3161  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3162  +    add_srs_wkt (p, 4,
         3163  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3164  +    add_srs_wkt (p, 5,
         3165  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3166  +    add_srs_wkt (p, 6,
         3167  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3168  +    add_srs_wkt (p, 7,
         3169  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3170  +    add_srs_wkt (p, 8,
         3171  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3172  +    add_srs_wkt (p, 9,
         3173  +        "rigin\",0],PARAMETER[\"central_meridian\",117],PARAMETER");
         3174  +    add_srs_wkt (p, 10,
         3175  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2050000");
         3176  +    add_srs_wkt (p, 11,
         3177  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3178  +    add_srs_wkt (p, 12,
         3179  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3180  +    add_srs_wkt (p, 13,
         3181  +        "AST],AUTHORITY[\"EPSG\",\"28420\"]]");
  3182   3182       p = add_epsg_def_ex (filter, first, last, 28421, "epsg", 28421,
  3183   3183           "Pulkovo 1942 / Gauss-Kruger zone 21", 0, 1,
  3184   3184           "Krassowsky 1940", "Greenwich",
  3185   3185           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3186   3186           "X", "North", "Y", "East");
  3187   3187       add_proj4text (p, 0,
  3188   3188           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=21500000 +y_0=");
  3189   3189       add_proj4text (p, 1,
  3190         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3190  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3191   3191       add_proj4text (p, 2,
  3192         -        "-0.12 +units=m +no_defs");
         3192  +        ",-0.12 +units=m +no_defs");
  3193   3193       add_srs_wkt (p, 0,
  3194   3194           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 21\",GEOGCS[\"");
  3195   3195       add_srs_wkt (p, 1,
  3196   3196           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3197   3197       add_srs_wkt (p, 2,
  3198   3198           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3199   3199       add_srs_wkt (p, 3,
  3200         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3201         -    add_srs_wkt (p, 4,
  3202         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3203         -    add_srs_wkt (p, 5,
  3204         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3205         -    add_srs_wkt (p, 6,
  3206         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3207         -    add_srs_wkt (p, 7,
  3208         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3209         -    add_srs_wkt (p, 8,
  3210         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3211         -    add_srs_wkt (p, 9,
  3212         -        "igin\",0],PARAMETER[\"central_meridian\",123],PARAMETER[");
  3213         -    add_srs_wkt (p, 10,
  3214         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",21500000");
  3215         -    add_srs_wkt (p, 11,
  3216         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3217         -    add_srs_wkt (p, 12,
  3218         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3219         -    add_srs_wkt (p, 13,
  3220         -        "ST],AUTHORITY[\"EPSG\",\"28421\"]]");
         3200  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3201  +    add_srs_wkt (p, 4,
         3202  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3203  +    add_srs_wkt (p, 5,
         3204  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3205  +    add_srs_wkt (p, 6,
         3206  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3207  +    add_srs_wkt (p, 7,
         3208  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3209  +    add_srs_wkt (p, 8,
         3210  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3211  +    add_srs_wkt (p, 9,
         3212  +        "rigin\",0],PARAMETER[\"central_meridian\",123],PARAMETER");
         3213  +    add_srs_wkt (p, 10,
         3214  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2150000");
         3215  +    add_srs_wkt (p, 11,
         3216  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3217  +    add_srs_wkt (p, 12,
         3218  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3219  +    add_srs_wkt (p, 13,
         3220  +        "AST],AUTHORITY[\"EPSG\",\"28421\"]]");
  3221   3221       p = add_epsg_def_ex (filter, first, last, 28422, "epsg", 28422,
  3222   3222           "Pulkovo 1942 / Gauss-Kruger zone 22", 0, 1,
  3223   3223           "Krassowsky 1940", "Greenwich",
  3224   3224           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3225   3225           "X", "North", "Y", "East");
  3226   3226       add_proj4text (p, 0,
  3227   3227           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=22500000 +y_0=");
  3228   3228       add_proj4text (p, 1,
  3229         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3229  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3230   3230       add_proj4text (p, 2,
  3231         -        "-0.12 +units=m +no_defs");
         3231  +        ",-0.12 +units=m +no_defs");
  3232   3232       add_srs_wkt (p, 0,
  3233   3233           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 22\",GEOGCS[\"");
  3234   3234       add_srs_wkt (p, 1,
  3235   3235           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3236   3236       add_srs_wkt (p, 2,
  3237   3237           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3238   3238       add_srs_wkt (p, 3,
  3239         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3240         -    add_srs_wkt (p, 4,
  3241         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3242         -    add_srs_wkt (p, 5,
  3243         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3244         -    add_srs_wkt (p, 6,
  3245         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3246         -    add_srs_wkt (p, 7,
  3247         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3248         -    add_srs_wkt (p, 8,
  3249         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3250         -    add_srs_wkt (p, 9,
  3251         -        "igin\",0],PARAMETER[\"central_meridian\",129],PARAMETER[");
  3252         -    add_srs_wkt (p, 10,
  3253         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",22500000");
  3254         -    add_srs_wkt (p, 11,
  3255         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3256         -    add_srs_wkt (p, 12,
  3257         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3258         -    add_srs_wkt (p, 13,
  3259         -        "ST],AUTHORITY[\"EPSG\",\"28422\"]]");
         3239  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3240  +    add_srs_wkt (p, 4,
         3241  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3242  +    add_srs_wkt (p, 5,
         3243  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3244  +    add_srs_wkt (p, 6,
         3245  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3246  +    add_srs_wkt (p, 7,
         3247  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3248  +    add_srs_wkt (p, 8,
         3249  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3250  +    add_srs_wkt (p, 9,
         3251  +        "rigin\",0],PARAMETER[\"central_meridian\",129],PARAMETER");
         3252  +    add_srs_wkt (p, 10,
         3253  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2250000");
         3254  +    add_srs_wkt (p, 11,
         3255  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3256  +    add_srs_wkt (p, 12,
         3257  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3258  +    add_srs_wkt (p, 13,
         3259  +        "AST],AUTHORITY[\"EPSG\",\"28422\"]]");
  3260   3260       p = add_epsg_def_ex (filter, first, last, 28423, "epsg", 28423,
  3261   3261           "Pulkovo 1942 / Gauss-Kruger zone 23", 0, 1,
  3262   3262           "Krassowsky 1940", "Greenwich",
  3263   3263           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3264   3264           "X", "North", "Y", "East");
  3265   3265       add_proj4text (p, 0,
  3266   3266           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=23500000 +y_0=");
  3267   3267       add_proj4text (p, 1,
  3268         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3268  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3269   3269       add_proj4text (p, 2,
  3270         -        "-0.12 +units=m +no_defs");
         3270  +        ",-0.12 +units=m +no_defs");
  3271   3271       add_srs_wkt (p, 0,
  3272   3272           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 23\",GEOGCS[\"");
  3273   3273       add_srs_wkt (p, 1,
  3274   3274           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3275   3275       add_srs_wkt (p, 2,
  3276   3276           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3277   3277       add_srs_wkt (p, 3,
  3278         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3279         -    add_srs_wkt (p, 4,
  3280         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3281         -    add_srs_wkt (p, 5,
  3282         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3283         -    add_srs_wkt (p, 6,
  3284         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3285         -    add_srs_wkt (p, 7,
  3286         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3287         -    add_srs_wkt (p, 8,
  3288         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3289         -    add_srs_wkt (p, 9,
  3290         -        "igin\",0],PARAMETER[\"central_meridian\",135],PARAMETER[");
  3291         -    add_srs_wkt (p, 10,
  3292         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",23500000");
  3293         -    add_srs_wkt (p, 11,
  3294         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3295         -    add_srs_wkt (p, 12,
  3296         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3297         -    add_srs_wkt (p, 13,
  3298         -        "ST],AUTHORITY[\"EPSG\",\"28423\"]]");
         3278  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3279  +    add_srs_wkt (p, 4,
         3280  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3281  +    add_srs_wkt (p, 5,
         3282  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3283  +    add_srs_wkt (p, 6,
         3284  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3285  +    add_srs_wkt (p, 7,
         3286  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3287  +    add_srs_wkt (p, 8,
         3288  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3289  +    add_srs_wkt (p, 9,
         3290  +        "rigin\",0],PARAMETER[\"central_meridian\",135],PARAMETER");
         3291  +    add_srs_wkt (p, 10,
         3292  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2350000");
         3293  +    add_srs_wkt (p, 11,
         3294  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3295  +    add_srs_wkt (p, 12,
         3296  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3297  +    add_srs_wkt (p, 13,
         3298  +        "AST],AUTHORITY[\"EPSG\",\"28423\"]]");
  3299   3299       p = add_epsg_def_ex (filter, first, last, 28424, "epsg", 28424,
  3300   3300           "Pulkovo 1942 / Gauss-Kruger zone 24", 0, 1,
  3301   3301           "Krassowsky 1940", "Greenwich",
  3302   3302           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3303   3303           "X", "North", "Y", "East");
  3304   3304       add_proj4text (p, 0,
  3305   3305           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=24500000 +y_0=");
  3306   3306       add_proj4text (p, 1,
  3307         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3307  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3308   3308       add_proj4text (p, 2,
  3309         -        "-0.12 +units=m +no_defs");
         3309  +        ",-0.12 +units=m +no_defs");
  3310   3310       add_srs_wkt (p, 0,
  3311   3311           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 24\",GEOGCS[\"");
  3312   3312       add_srs_wkt (p, 1,
  3313   3313           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3314   3314       add_srs_wkt (p, 2,
  3315   3315           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3316   3316       add_srs_wkt (p, 3,
  3317         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3318         -    add_srs_wkt (p, 4,
  3319         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3320         -    add_srs_wkt (p, 5,
  3321         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3322         -    add_srs_wkt (p, 6,
  3323         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3324         -    add_srs_wkt (p, 7,
  3325         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3326         -    add_srs_wkt (p, 8,
  3327         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3328         -    add_srs_wkt (p, 9,
  3329         -        "igin\",0],PARAMETER[\"central_meridian\",141],PARAMETER[");
  3330         -    add_srs_wkt (p, 10,
  3331         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",24500000");
  3332         -    add_srs_wkt (p, 11,
  3333         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3334         -    add_srs_wkt (p, 12,
  3335         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3336         -    add_srs_wkt (p, 13,
  3337         -        "ST],AUTHORITY[\"EPSG\",\"28424\"]]");
         3317  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3318  +    add_srs_wkt (p, 4,
         3319  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3320  +    add_srs_wkt (p, 5,
         3321  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3322  +    add_srs_wkt (p, 6,
         3323  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3324  +    add_srs_wkt (p, 7,
         3325  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3326  +    add_srs_wkt (p, 8,
         3327  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3328  +    add_srs_wkt (p, 9,
         3329  +        "rigin\",0],PARAMETER[\"central_meridian\",141],PARAMETER");
         3330  +    add_srs_wkt (p, 10,
         3331  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2450000");
         3332  +    add_srs_wkt (p, 11,
         3333  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3334  +    add_srs_wkt (p, 12,
         3335  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3336  +    add_srs_wkt (p, 13,
         3337  +        "AST],AUTHORITY[\"EPSG\",\"28424\"]]");
  3338   3338       p = add_epsg_def_ex (filter, first, last, 28425, "epsg", 28425,
  3339   3339           "Pulkovo 1942 / Gauss-Kruger zone 25", 0, 1,
  3340   3340           "Krassowsky 1940", "Greenwich",
  3341   3341           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3342   3342           "X", "North", "Y", "East");
  3343   3343       add_proj4text (p, 0,
  3344   3344           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=25500000 +y_0=");
  3345   3345       add_proj4text (p, 1,
  3346         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3346  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3347   3347       add_proj4text (p, 2,
  3348         -        "-0.12 +units=m +no_defs");
         3348  +        ",-0.12 +units=m +no_defs");
  3349   3349       add_srs_wkt (p, 0,
  3350   3350           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 25\",GEOGCS[\"");
  3351   3351       add_srs_wkt (p, 1,
  3352   3352           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3353   3353       add_srs_wkt (p, 2,
  3354   3354           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3355   3355       add_srs_wkt (p, 3,
  3356         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3357         -    add_srs_wkt (p, 4,
  3358         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3359         -    add_srs_wkt (p, 5,
  3360         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3361         -    add_srs_wkt (p, 6,
  3362         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3363         -    add_srs_wkt (p, 7,
  3364         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3365         -    add_srs_wkt (p, 8,
  3366         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3367         -    add_srs_wkt (p, 9,
  3368         -        "igin\",0],PARAMETER[\"central_meridian\",147],PARAMETER[");
  3369         -    add_srs_wkt (p, 10,
  3370         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",25500000");
  3371         -    add_srs_wkt (p, 11,
  3372         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3373         -    add_srs_wkt (p, 12,
  3374         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3375         -    add_srs_wkt (p, 13,
  3376         -        "ST],AUTHORITY[\"EPSG\",\"28425\"]]");
         3356  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3357  +    add_srs_wkt (p, 4,
         3358  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3359  +    add_srs_wkt (p, 5,
         3360  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3361  +    add_srs_wkt (p, 6,
         3362  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3363  +    add_srs_wkt (p, 7,
         3364  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3365  +    add_srs_wkt (p, 8,
         3366  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3367  +    add_srs_wkt (p, 9,
         3368  +        "rigin\",0],PARAMETER[\"central_meridian\",147],PARAMETER");
         3369  +    add_srs_wkt (p, 10,
         3370  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2550000");
         3371  +    add_srs_wkt (p, 11,
         3372  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3373  +    add_srs_wkt (p, 12,
         3374  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3375  +    add_srs_wkt (p, 13,
         3376  +        "AST],AUTHORITY[\"EPSG\",\"28425\"]]");
  3377   3377       p = add_epsg_def_ex (filter, first, last, 28426, "epsg", 28426,
  3378   3378           "Pulkovo 1942 / Gauss-Kruger zone 26", 0, 1,
  3379   3379           "Krassowsky 1940", "Greenwich",
  3380   3380           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3381   3381           "X", "North", "Y", "East");
  3382   3382       add_proj4text (p, 0,
  3383   3383           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=26500000 +y_0=");
  3384   3384       add_proj4text (p, 1,
  3385         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3385  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3386   3386       add_proj4text (p, 2,
  3387         -        "-0.12 +units=m +no_defs");
         3387  +        ",-0.12 +units=m +no_defs");
  3388   3388       add_srs_wkt (p, 0,
  3389   3389           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 26\",GEOGCS[\"");
  3390   3390       add_srs_wkt (p, 1,
  3391   3391           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3392   3392       add_srs_wkt (p, 2,
  3393   3393           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3394   3394       add_srs_wkt (p, 3,
  3395         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3396         -    add_srs_wkt (p, 4,
  3397         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3398         -    add_srs_wkt (p, 5,
  3399         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3400         -    add_srs_wkt (p, 6,
  3401         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3402         -    add_srs_wkt (p, 7,
  3403         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3404         -    add_srs_wkt (p, 8,
  3405         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3406         -    add_srs_wkt (p, 9,
  3407         -        "igin\",0],PARAMETER[\"central_meridian\",153],PARAMETER[");
  3408         -    add_srs_wkt (p, 10,
  3409         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",26500000");
  3410         -    add_srs_wkt (p, 11,
  3411         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3412         -    add_srs_wkt (p, 12,
  3413         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3414         -    add_srs_wkt (p, 13,
  3415         -        "ST],AUTHORITY[\"EPSG\",\"28426\"]]");
         3395  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3396  +    add_srs_wkt (p, 4,
         3397  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3398  +    add_srs_wkt (p, 5,
         3399  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3400  +    add_srs_wkt (p, 6,
         3401  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3402  +    add_srs_wkt (p, 7,
         3403  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3404  +    add_srs_wkt (p, 8,
         3405  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3406  +    add_srs_wkt (p, 9,
         3407  +        "rigin\",0],PARAMETER[\"central_meridian\",153],PARAMETER");
         3408  +    add_srs_wkt (p, 10,
         3409  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2650000");
         3410  +    add_srs_wkt (p, 11,
         3411  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3412  +    add_srs_wkt (p, 12,
         3413  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3414  +    add_srs_wkt (p, 13,
         3415  +        "AST],AUTHORITY[\"EPSG\",\"28426\"]]");
  3416   3416       p = add_epsg_def_ex (filter, first, last, 28427, "epsg", 28427,
  3417   3417           "Pulkovo 1942 / Gauss-Kruger zone 27", 0, 1,
  3418   3418           "Krassowsky 1940", "Greenwich",
  3419   3419           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3420   3420           "X", "North", "Y", "East");
  3421   3421       add_proj4text (p, 0,
  3422   3422           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=27500000 +y_0=");
  3423   3423       add_proj4text (p, 1,
  3424         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3424  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3425   3425       add_proj4text (p, 2,
  3426         -        "-0.12 +units=m +no_defs");
         3426  +        ",-0.12 +units=m +no_defs");
  3427   3427       add_srs_wkt (p, 0,
  3428   3428           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 27\",GEOGCS[\"");
  3429   3429       add_srs_wkt (p, 1,
  3430   3430           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3431   3431       add_srs_wkt (p, 2,
  3432   3432           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3433   3433       add_srs_wkt (p, 3,
  3434         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3435         -    add_srs_wkt (p, 4,
  3436         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3437         -    add_srs_wkt (p, 5,
  3438         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3439         -    add_srs_wkt (p, 6,
  3440         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3441         -    add_srs_wkt (p, 7,
  3442         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3443         -    add_srs_wkt (p, 8,
  3444         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3445         -    add_srs_wkt (p, 9,
  3446         -        "igin\",0],PARAMETER[\"central_meridian\",159],PARAMETER[");
  3447         -    add_srs_wkt (p, 10,
  3448         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",27500000");
  3449         -    add_srs_wkt (p, 11,
  3450         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3451         -    add_srs_wkt (p, 12,
  3452         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3453         -    add_srs_wkt (p, 13,
  3454         -        "ST],AUTHORITY[\"EPSG\",\"28427\"]]");
         3434  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3435  +    add_srs_wkt (p, 4,
         3436  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3437  +    add_srs_wkt (p, 5,
         3438  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3439  +    add_srs_wkt (p, 6,
         3440  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3441  +    add_srs_wkt (p, 7,
         3442  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3443  +    add_srs_wkt (p, 8,
         3444  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3445  +    add_srs_wkt (p, 9,
         3446  +        "rigin\",0],PARAMETER[\"central_meridian\",159],PARAMETER");
         3447  +    add_srs_wkt (p, 10,
         3448  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2750000");
         3449  +    add_srs_wkt (p, 11,
         3450  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3451  +    add_srs_wkt (p, 12,
         3452  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3453  +    add_srs_wkt (p, 13,
         3454  +        "AST],AUTHORITY[\"EPSG\",\"28427\"]]");
  3455   3455       p = add_epsg_def_ex (filter, first, last, 28428, "epsg", 28428,
  3456   3456           "Pulkovo 1942 / Gauss-Kruger zone 28", 0, 1,
  3457   3457           "Krassowsky 1940", "Greenwich",
  3458   3458           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3459   3459           "X", "North", "Y", "East");
  3460   3460       add_proj4text (p, 0,
  3461   3461           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=28500000 +y_0=");
  3462   3462       add_proj4text (p, 1,
  3463         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3463  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3464   3464       add_proj4text (p, 2,
  3465         -        "-0.12 +units=m +no_defs");
         3465  +        ",-0.12 +units=m +no_defs");
  3466   3466       add_srs_wkt (p, 0,
  3467   3467           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 28\",GEOGCS[\"");
  3468   3468       add_srs_wkt (p, 1,
  3469   3469           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3470   3470       add_srs_wkt (p, 2,
  3471   3471           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3472   3472       add_srs_wkt (p, 3,
  3473         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3474         -    add_srs_wkt (p, 4,
  3475         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3476         -    add_srs_wkt (p, 5,
  3477         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3478         -    add_srs_wkt (p, 6,
  3479         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3480         -    add_srs_wkt (p, 7,
  3481         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3482         -    add_srs_wkt (p, 8,
  3483         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3484         -    add_srs_wkt (p, 9,
  3485         -        "igin\",0],PARAMETER[\"central_meridian\",165],PARAMETER[");
  3486         -    add_srs_wkt (p, 10,
  3487         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",28500000");
  3488         -    add_srs_wkt (p, 11,
  3489         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3490         -    add_srs_wkt (p, 12,
  3491         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3492         -    add_srs_wkt (p, 13,
  3493         -        "ST],AUTHORITY[\"EPSG\",\"28428\"]]");
         3473  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3474  +    add_srs_wkt (p, 4,
         3475  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3476  +    add_srs_wkt (p, 5,
         3477  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3478  +    add_srs_wkt (p, 6,
         3479  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3480  +    add_srs_wkt (p, 7,
         3481  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3482  +    add_srs_wkt (p, 8,
         3483  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3484  +    add_srs_wkt (p, 9,
         3485  +        "rigin\",0],PARAMETER[\"central_meridian\",165],PARAMETER");
         3486  +    add_srs_wkt (p, 10,
         3487  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2850000");
         3488  +    add_srs_wkt (p, 11,
         3489  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3490  +    add_srs_wkt (p, 12,
         3491  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3492  +    add_srs_wkt (p, 13,
         3493  +        "AST],AUTHORITY[\"EPSG\",\"28428\"]]");
  3494   3494       p = add_epsg_def_ex (filter, first, last, 28429, "epsg", 28429,
  3495   3495           "Pulkovo 1942 / Gauss-Kruger zone 29", 0, 1,
  3496   3496           "Krassowsky 1940", "Greenwich",
  3497   3497           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3498   3498           "X", "North", "Y", "East");
  3499   3499       add_proj4text (p, 0,
  3500   3500           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=29500000 +y_0=");
  3501   3501       add_proj4text (p, 1,
  3502         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3502  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3503   3503       add_proj4text (p, 2,
  3504         -        "-0.12 +units=m +no_defs");
         3504  +        ",-0.12 +units=m +no_defs");
  3505   3505       add_srs_wkt (p, 0,
  3506   3506           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 29\",GEOGCS[\"");
  3507   3507       add_srs_wkt (p, 1,
  3508   3508           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3509   3509       add_srs_wkt (p, 2,
  3510   3510           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3511   3511       add_srs_wkt (p, 3,
  3512         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3513         -    add_srs_wkt (p, 4,
  3514         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3515         -    add_srs_wkt (p, 5,
  3516         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3517         -    add_srs_wkt (p, 6,
  3518         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3519         -    add_srs_wkt (p, 7,
  3520         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3521         -    add_srs_wkt (p, 8,
  3522         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3523         -    add_srs_wkt (p, 9,
  3524         -        "igin\",0],PARAMETER[\"central_meridian\",171],PARAMETER[");
  3525         -    add_srs_wkt (p, 10,
  3526         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",29500000");
  3527         -    add_srs_wkt (p, 11,
  3528         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3529         -    add_srs_wkt (p, 12,
  3530         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3531         -    add_srs_wkt (p, 13,
  3532         -        "ST],AUTHORITY[\"EPSG\",\"28429\"]]");
         3512  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3513  +    add_srs_wkt (p, 4,
         3514  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3515  +    add_srs_wkt (p, 5,
         3516  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3517  +    add_srs_wkt (p, 6,
         3518  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3519  +    add_srs_wkt (p, 7,
         3520  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3521  +    add_srs_wkt (p, 8,
         3522  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3523  +    add_srs_wkt (p, 9,
         3524  +        "rigin\",0],PARAMETER[\"central_meridian\",171],PARAMETER");
         3525  +    add_srs_wkt (p, 10,
         3526  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",2950000");
         3527  +    add_srs_wkt (p, 11,
         3528  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3529  +    add_srs_wkt (p, 12,
         3530  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3531  +    add_srs_wkt (p, 13,
         3532  +        "AST],AUTHORITY[\"EPSG\",\"28429\"]]");
  3533   3533       p = add_epsg_def_ex (filter, first, last, 28430, "epsg", 28430,
  3534   3534           "Pulkovo 1942 / Gauss-Kruger zone 30", 0, 1,
  3535   3535           "Krassowsky 1940", "Greenwich",
  3536   3536           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3537   3537           "X", "North", "Y", "East");
  3538   3538       add_proj4text (p, 0,
  3539   3539           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=30500000 +y_0=");
  3540   3540       add_proj4text (p, 1,
  3541         -        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,");
         3541  +        "0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82");
  3542   3542       add_proj4text (p, 2,
  3543         -        "-0.12 +units=m +no_defs");
         3543  +        ",-0.12 +units=m +no_defs");
  3544   3544       add_srs_wkt (p, 0,
  3545   3545           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 30\",GEOGCS[\"");
  3546   3546       add_srs_wkt (p, 1,
  3547   3547           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3548   3548       add_srs_wkt (p, 2,
  3549   3549           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3550   3550       add_srs_wkt (p, 3,
  3551         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3552         -    add_srs_wkt (p, 4,
  3553         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3554         -    add_srs_wkt (p, 5,
  3555         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3556         -    add_srs_wkt (p, 6,
  3557         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3558         -    add_srs_wkt (p, 7,
  3559         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3560         -    add_srs_wkt (p, 8,
  3561         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3562         -    add_srs_wkt (p, 9,
  3563         -        "igin\",0],PARAMETER[\"central_meridian\",177],PARAMETER[");
  3564         -    add_srs_wkt (p, 10,
  3565         -        "\"scale_factor\",1],PARAMETER[\"false_easting\",30500000");
  3566         -    add_srs_wkt (p, 11,
  3567         -        "],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHO");
  3568         -    add_srs_wkt (p, 12,
  3569         -        "RITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",EA");
  3570         -    add_srs_wkt (p, 13,
  3571         -        "ST],AUTHORITY[\"EPSG\",\"28430\"]]");
         3551  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3552  +    add_srs_wkt (p, 4,
         3553  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3554  +    add_srs_wkt (p, 5,
         3555  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3556  +    add_srs_wkt (p, 6,
         3557  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3558  +    add_srs_wkt (p, 7,
         3559  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3560  +    add_srs_wkt (p, 8,
         3561  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3562  +    add_srs_wkt (p, 9,
         3563  +        "rigin\",0],PARAMETER[\"central_meridian\",177],PARAMETER");
         3564  +    add_srs_wkt (p, 10,
         3565  +        "[\"scale_factor\",1],PARAMETER[\"false_easting\",3050000");
         3566  +    add_srs_wkt (p, 11,
         3567  +        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
         3568  +    add_srs_wkt (p, 12,
         3569  +        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
         3570  +    add_srs_wkt (p, 13,
         3571  +        "AST],AUTHORITY[\"EPSG\",\"28430\"]]");
  3572   3572       p = add_epsg_def_ex (filter, first, last, 28431, "epsg", 28431,
  3573   3573           "Pulkovo 1942 / Gauss-Kruger zone 31", 0, 1,
  3574   3574           "Krassowsky 1940", "Greenwich",
  3575   3575           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3576   3576           "X", "North", "Y", "East");
  3577   3577       add_proj4text (p, 0,
  3578   3578           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=31500000 +y_0");
  3579   3579       add_proj4text (p, 1,
  3580         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         3580  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  3581   3581       add_proj4text (p, 2,
  3582         -        ",-0.12 +units=m +no_defs");
         3582  +        "2,-0.12 +units=m +no_defs");
  3583   3583       add_srs_wkt (p, 0,
  3584   3584           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 31\",GEOGCS[\"");
  3585   3585       add_srs_wkt (p, 1,
  3586   3586           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3587   3587       add_srs_wkt (p, 2,
  3588   3588           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3589   3589       add_srs_wkt (p, 3,
  3590         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3591         -    add_srs_wkt (p, 4,
  3592         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3593         -    add_srs_wkt (p, 5,
  3594         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3595         -    add_srs_wkt (p, 6,
  3596         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3597         -    add_srs_wkt (p, 7,
  3598         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3599         -    add_srs_wkt (p, 8,
  3600         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3601         -    add_srs_wkt (p, 9,
  3602         -        "igin\",0],PARAMETER[\"central_meridian\",-177],PARAMETER");
  3603         -    add_srs_wkt (p, 10,
  3604         -        "[\"scale_factor\",1],PARAMETER[\"false_easting\",3150000");
  3605         -    add_srs_wkt (p, 11,
  3606         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  3607         -    add_srs_wkt (p, 12,
  3608         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
  3609         -    add_srs_wkt (p, 13,
  3610         -        "AST],AUTHORITY[\"EPSG\",\"28431\"]]");
         3590  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3591  +    add_srs_wkt (p, 4,
         3592  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3593  +    add_srs_wkt (p, 5,
         3594  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3595  +    add_srs_wkt (p, 6,
         3596  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3597  +    add_srs_wkt (p, 7,
         3598  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3599  +    add_srs_wkt (p, 8,
         3600  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3601  +    add_srs_wkt (p, 9,
         3602  +        "rigin\",0],PARAMETER[\"central_meridian\",-177],PARAMETE");
         3603  +    add_srs_wkt (p, 10,
         3604  +        "R[\"scale_factor\",1],PARAMETER[\"false_easting\",315000");
         3605  +    add_srs_wkt (p, 11,
         3606  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
         3607  +    add_srs_wkt (p, 12,
         3608  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
         3609  +    add_srs_wkt (p, 13,
         3610  +        "EAST],AUTHORITY[\"EPSG\",\"28431\"]]");
  3611   3611       p = add_epsg_def_ex (filter, first, last, 28432, "epsg", 28432,
  3612   3612           "Pulkovo 1942 / Gauss-Kruger zone 32", 0, 1,
  3613   3613           "Krassowsky 1940", "Greenwich",
  3614   3614           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3615   3615           "X", "North", "Y", "East");
  3616   3616       add_proj4text (p, 0,
  3617   3617           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=32500000 +y_0");
  3618   3618       add_proj4text (p, 1,
  3619         -        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82");
         3619  +        "=0 +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.8");
  3620   3620       add_proj4text (p, 2,
  3621         -        ",-0.12 +units=m +no_defs");
         3621  +        "2,-0.12 +units=m +no_defs");
  3622   3622       add_srs_wkt (p, 0,
  3623   3623           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger zone 32\",GEOGCS[\"");
  3624   3624       add_srs_wkt (p, 1,
  3625   3625           "Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"Krassow");
  3626   3626       add_srs_wkt (p, 2,
  3627   3627           "sky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7024\"]],T");
  3628   3628       add_srs_wkt (p, 3,
  3629         -        "OWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUTHORITY[");
  3630         -    add_srs_wkt (p, 4,
  3631         -        "\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"E");
  3632         -    add_srs_wkt (p, 5,
  3633         -        "PSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTH");
  3634         -    add_srs_wkt (p, 6,
  3635         -        "ORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[");
  3636         -    add_srs_wkt (p, 7,
  3637         -        "\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJEC");
  3638         -    add_srs_wkt (p, 8,
  3639         -        "TION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_or");
  3640         -    add_srs_wkt (p, 9,
  3641         -        "igin\",0],PARAMETER[\"central_meridian\",-171],PARAMETER");
  3642         -    add_srs_wkt (p, 10,
  3643         -        "[\"scale_factor\",1],PARAMETER[\"false_easting\",3250000");
  3644         -    add_srs_wkt (p, 11,
  3645         -        "0],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTH");
  3646         -    add_srs_wkt (p, 12,
  3647         -        "ORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",E");
  3648         -    add_srs_wkt (p, 13,
  3649         -        "AST],AUTHORITY[\"EPSG\",\"28432\"]]");
         3629  +        "OWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AUTHORITY");
         3630  +    add_srs_wkt (p, 4,
         3631  +        "[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"");
         3632  +    add_srs_wkt (p, 5,
         3633  +        "EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUT");
         3634  +    add_srs_wkt (p, 6,
         3635  +        "HORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS");
         3636  +    add_srs_wkt (p, 7,
         3637  +        "[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]],PROJE");
         3638  +    add_srs_wkt (p, 8,
         3639  +        "CTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_o");
         3640  +    add_srs_wkt (p, 9,
         3641  +        "rigin\",0],PARAMETER[\"central_meridian\",-171],PARAMETE");
         3642  +    add_srs_wkt (p, 10,
         3643  +        "R[\"scale_factor\",1],PARAMETER[\"false_easting\",325000");
         3644  +    add_srs_wkt (p, 11,
         3645  +        "00],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUT");
         3646  +    add_srs_wkt (p, 12,
         3647  +        "HORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\",");
         3648  +    add_srs_wkt (p, 13,
         3649  +        "EAST],AUTHORITY[\"EPSG\",\"28432\"]]");
  3650   3650       p = add_epsg_def_ex (filter, first, last, 28462, "epsg", 28462,
  3651   3651           "Pulkovo 1942 / Gauss-Kruger 2N (deprecated)", 0, 1,
  3652   3652           "Krassowsky 1940", "Greenwich",
  3653   3653           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3654   3654           "X", "North", "Y", "East");
  3655   3655       add_proj4text (p, 0,
  3656   3656           "+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=500000 +y_0=0 +e");
  3657   3657       add_proj4text (p, 1,
  3658         -        "llps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.1");
         3658  +        "llps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0.");
  3659   3659       add_proj4text (p, 2,
  3660         -        "2 +units=m +no_defs");
         3660  +        "12 +units=m +no_defs");
  3661   3661       add_srs_wkt (p, 0,
  3662   3662           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 2N (deprecated)\",G");
  3663   3663       add_srs_wkt (p, 1,
  3664   3664           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3665   3665       add_srs_wkt (p, 2,
  3666   3666           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3667   3667       add_srs_wkt (p, 3,
  3668         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3668  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3669   3669       add_srs_wkt (p, 4,
  3670         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3670  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3671   3671       add_srs_wkt (p, 5,
  3672         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3672  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3673   3673       add_srs_wkt (p, 6,
  3674         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3674  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3675   3675       add_srs_wkt (p, 7,
  3676         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3676  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3677   3677       add_srs_wkt (p, 8,
  3678         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3678  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3679   3679       add_srs_wkt (p, 9,
  3680         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",9],PARAM");
         3680  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",9],PARA");
  3681   3681       add_srs_wkt (p, 10,
  3682         -        "ETER[\"scale_factor\",1],PARAMETER[\"false_easting\",500");
         3682  +        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
  3683   3683       add_srs_wkt (p, 11,
  3684         -        "000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AU");
         3684  +        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
  3685   3685       add_srs_wkt (p, 12,
  3686         -        "THORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3686  +        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
  3687   3687       add_srs_wkt (p, 13,
  3688   3688           ",EAST],AUTHORITY[\"EPSG\",\"28462\"]]");
  3689   3689       p = add_epsg_def_ex (filter, first, last, 28463, "epsg", 28463,
  3690   3690           "Pulkovo 1942 / Gauss-Kruger 3N (deprecated)", 0, 1,
  3691   3691           "Krassowsky 1940", "Greenwich",
  3692   3692           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3693   3693           "X", "North", "Y", "East");
  3694   3694       add_proj4text (p, 0,
  3695   3695           "+proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=500000 +y_0=0 +");
  3696   3696       add_proj4text (p, 1,
  3697         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3697  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3698   3698       add_proj4text (p, 2,
  3699         -        "12 +units=m +no_defs");
         3699  +        ".12 +units=m +no_defs");
  3700   3700       add_srs_wkt (p, 0,
  3701   3701           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 3N (deprecated)\",G");
  3702   3702       add_srs_wkt (p, 1,
  3703   3703           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3704   3704       add_srs_wkt (p, 2,
  3705   3705           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3706   3706       add_srs_wkt (p, 3,
  3707         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3707  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3708   3708       add_srs_wkt (p, 4,
  3709         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3709  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3710   3710       add_srs_wkt (p, 5,
  3711         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3711  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3712   3712       add_srs_wkt (p, 6,
  3713         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3713  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3714   3714       add_srs_wkt (p, 7,
  3715         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3715  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3716   3716       add_srs_wkt (p, 8,
  3717         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3717  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3718   3718       add_srs_wkt (p, 9,
  3719         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",15],PARA");
         3719  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",15],PAR");
  3720   3720       add_srs_wkt (p, 10,
  3721         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3721  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3722   3722       add_srs_wkt (p, 11,
  3723         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3723  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3724   3724       add_srs_wkt (p, 12,
  3725         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3725  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3726   3726       add_srs_wkt (p, 13,
  3727         -        ",EAST],AUTHORITY[\"EPSG\",\"28463\"]]");
         3727  +        "\",EAST],AUTHORITY[\"EPSG\",\"28463\"]]");
  3728   3728       p = add_epsg_def_ex (filter, first, last, 28464, "epsg", 28464,
  3729   3729           "Pulkovo 1942 / Gauss-Kruger 4N (deprecated)", 0, 1,
  3730   3730           "Krassowsky 1940", "Greenwich",
  3731   3731           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3732   3732           "X", "North", "Y", "East");
  3733   3733       add_proj4text (p, 0,
  3734   3734           "+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=500000 +y_0=0 +");
  3735   3735       add_proj4text (p, 1,
  3736         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3736  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3737   3737       add_proj4text (p, 2,
  3738         -        "12 +units=m +no_defs");
         3738  +        ".12 +units=m +no_defs");
  3739   3739       add_srs_wkt (p, 0,
  3740   3740           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 4N (deprecated)\",G");
  3741   3741       add_srs_wkt (p, 1,
  3742   3742           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3743   3743       add_srs_wkt (p, 2,
  3744   3744           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3745   3745       add_srs_wkt (p, 3,
  3746         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3746  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3747   3747       add_srs_wkt (p, 4,
  3748         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3748  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3749   3749       add_srs_wkt (p, 5,
  3750         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3750  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3751   3751       add_srs_wkt (p, 6,
  3752         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3752  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3753   3753       add_srs_wkt (p, 7,
  3754         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3754  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3755   3755       add_srs_wkt (p, 8,
  3756         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3756  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3757   3757       add_srs_wkt (p, 9,
  3758         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",21],PARA");
         3758  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",21],PAR");
  3759   3759       add_srs_wkt (p, 10,
  3760         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3760  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3761   3761       add_srs_wkt (p, 11,
  3762         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3762  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3763   3763       add_srs_wkt (p, 12,
  3764         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3764  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3765   3765       add_srs_wkt (p, 13,
  3766         -        ",EAST],AUTHORITY[\"EPSG\",\"28464\"]]");
         3766  +        "\",EAST],AUTHORITY[\"EPSG\",\"28464\"]]");
  3767   3767       p = add_epsg_def_ex (filter, first, last, 28465, "epsg", 28465,
  3768   3768           "Pulkovo 1942 / Gauss-Kruger 5N (deprecated)", 0, 1,
  3769   3769           "Krassowsky 1940", "Greenwich",
  3770   3770           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3771   3771           "X", "North", "Y", "East");
  3772   3772       add_proj4text (p, 0,
  3773   3773           "+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=500000 +y_0=0 +");
  3774   3774       add_proj4text (p, 1,
  3775         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3775  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3776   3776       add_proj4text (p, 2,
  3777         -        "12 +units=m +no_defs");
         3777  +        ".12 +units=m +no_defs");
  3778   3778       add_srs_wkt (p, 0,
  3779   3779           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 5N (deprecated)\",G");
  3780   3780       add_srs_wkt (p, 1,
  3781   3781           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3782   3782       add_srs_wkt (p, 2,
  3783   3783           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3784   3784       add_srs_wkt (p, 3,
  3785         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3785  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3786   3786       add_srs_wkt (p, 4,
  3787         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3787  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3788   3788       add_srs_wkt (p, 5,
  3789         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3789  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3790   3790       add_srs_wkt (p, 6,
  3791         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3791  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3792   3792       add_srs_wkt (p, 7,
  3793         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3793  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3794   3794       add_srs_wkt (p, 8,
  3795         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3795  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3796   3796       add_srs_wkt (p, 9,
  3797         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",27],PARA");
         3797  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",27],PAR");
  3798   3798       add_srs_wkt (p, 10,
  3799         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3799  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3800   3800       add_srs_wkt (p, 11,
  3801         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3801  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3802   3802       add_srs_wkt (p, 12,
  3803         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3803  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3804   3804       add_srs_wkt (p, 13,
  3805         -        ",EAST],AUTHORITY[\"EPSG\",\"28465\"]]");
         3805  +        "\",EAST],AUTHORITY[\"EPSG\",\"28465\"]]");
  3806   3806       p = add_epsg_def_ex (filter, first, last, 28466, "epsg", 28466,
  3807   3807           "Pulkovo 1942 / Gauss-Kruger 6N (deprecated)", 0, 1,
  3808   3808           "Krassowsky 1940", "Greenwich",
  3809   3809           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3810   3810           "X", "North", "Y", "East");
  3811   3811       add_proj4text (p, 0,
  3812   3812           "+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=500000 +y_0=0 +");
  3813   3813       add_proj4text (p, 1,
  3814         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3814  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3815   3815       add_proj4text (p, 2,
  3816         -        "12 +units=m +no_defs");
         3816  +        ".12 +units=m +no_defs");
  3817   3817       add_srs_wkt (p, 0,
  3818   3818           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 6N (deprecated)\",G");
  3819   3819       add_srs_wkt (p, 1,
  3820   3820           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3821   3821       add_srs_wkt (p, 2,
  3822   3822           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3823   3823       add_srs_wkt (p, 3,
  3824         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3824  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3825   3825       add_srs_wkt (p, 4,
  3826         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3826  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3827   3827       add_srs_wkt (p, 5,
  3828         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3828  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3829   3829       add_srs_wkt (p, 6,
  3830         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3830  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3831   3831       add_srs_wkt (p, 7,
  3832         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3832  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3833   3833       add_srs_wkt (p, 8,
  3834         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3834  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3835   3835       add_srs_wkt (p, 9,
  3836         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",33],PARA");
         3836  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",33],PAR");
  3837   3837       add_srs_wkt (p, 10,
  3838         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3838  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3839   3839       add_srs_wkt (p, 11,
  3840         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3840  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3841   3841       add_srs_wkt (p, 12,
  3842         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3842  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3843   3843       add_srs_wkt (p, 13,
  3844         -        ",EAST],AUTHORITY[\"EPSG\",\"28466\"]]");
         3844  +        "\",EAST],AUTHORITY[\"EPSG\",\"28466\"]]");
  3845   3845       p = add_epsg_def_ex (filter, first, last, 28467, "epsg", 28467,
  3846   3846           "Pulkovo 1942 / Gauss-Kruger 7N (deprecated)", 0, 1,
  3847   3847           "Krassowsky 1940", "Greenwich",
  3848   3848           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3849   3849           "X", "North", "Y", "East");
  3850   3850       add_proj4text (p, 0,
  3851   3851           "+proj=tmerc +lat_0=0 +lon_0=39 +k=1 +x_0=500000 +y_0=0 +");
  3852   3852       add_proj4text (p, 1,
  3853         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3853  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3854   3854       add_proj4text (p, 2,
  3855         -        "12 +units=m +no_defs");
         3855  +        ".12 +units=m +no_defs");
  3856   3856       add_srs_wkt (p, 0,
  3857   3857           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 7N (deprecated)\",G");
  3858   3858       add_srs_wkt (p, 1,
  3859   3859           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3860   3860       add_srs_wkt (p, 2,
  3861   3861           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3862   3862       add_srs_wkt (p, 3,
  3863         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3863  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3864   3864       add_srs_wkt (p, 4,
  3865         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3865  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3866   3866       add_srs_wkt (p, 5,
  3867         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3867  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3868   3868       add_srs_wkt (p, 6,
  3869         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3869  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3870   3870       add_srs_wkt (p, 7,
  3871         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3871  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3872   3872       add_srs_wkt (p, 8,
  3873         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3873  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3874   3874       add_srs_wkt (p, 9,
  3875         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",39],PARA");
         3875  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",39],PAR");
  3876   3876       add_srs_wkt (p, 10,
  3877         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3877  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3878   3878       add_srs_wkt (p, 11,
  3879         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3879  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3880   3880       add_srs_wkt (p, 12,
  3881         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3881  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3882   3882       add_srs_wkt (p, 13,
  3883         -        ",EAST],AUTHORITY[\"EPSG\",\"28467\"]]");
         3883  +        "\",EAST],AUTHORITY[\"EPSG\",\"28467\"]]");
  3884   3884       p = add_epsg_def_ex (filter, first, last, 28468, "epsg", 28468,
  3885   3885           "Pulkovo 1942 / Gauss-Kruger 8N (deprecated)", 0, 1,
  3886   3886           "Krassowsky 1940", "Greenwich",
  3887   3887           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3888   3888           "X", "North", "Y", "East");
  3889   3889       add_proj4text (p, 0,
  3890   3890           "+proj=tmerc +lat_0=0 +lon_0=45 +k=1 +x_0=500000 +y_0=0 +");
  3891   3891       add_proj4text (p, 1,
  3892         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3892  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3893   3893       add_proj4text (p, 2,
  3894         -        "12 +units=m +no_defs");
         3894  +        ".12 +units=m +no_defs");
  3895   3895       add_srs_wkt (p, 0,
  3896   3896           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 8N (deprecated)\",G");
  3897   3897       add_srs_wkt (p, 1,
  3898   3898           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3899   3899       add_srs_wkt (p, 2,
  3900   3900           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3901   3901       add_srs_wkt (p, 3,
  3902         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3902  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3903   3903       add_srs_wkt (p, 4,
  3904         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3904  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3905   3905       add_srs_wkt (p, 5,
  3906         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3906  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3907   3907       add_srs_wkt (p, 6,
  3908         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3908  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3909   3909       add_srs_wkt (p, 7,
  3910         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3910  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3911   3911       add_srs_wkt (p, 8,
  3912         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3912  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3913   3913       add_srs_wkt (p, 9,
  3914         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",45],PARA");
         3914  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",45],PAR");
  3915   3915       add_srs_wkt (p, 10,
  3916         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3916  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3917   3917       add_srs_wkt (p, 11,
  3918         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3918  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3919   3919       add_srs_wkt (p, 12,
  3920         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3920  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3921   3921       add_srs_wkt (p, 13,
  3922         -        ",EAST],AUTHORITY[\"EPSG\",\"28468\"]]");
         3922  +        "\",EAST],AUTHORITY[\"EPSG\",\"28468\"]]");
  3923   3923       p = add_epsg_def_ex (filter, first, last, 28469, "epsg", 28469,
  3924   3924           "Pulkovo 1942 / Gauss-Kruger 9N (deprecated)", 0, 1,
  3925   3925           "Krassowsky 1940", "Greenwich",
  3926   3926           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3927   3927           "X", "North", "Y", "East");
  3928   3928       add_proj4text (p, 0,
  3929   3929           "+proj=tmerc +lat_0=0 +lon_0=51 +k=1 +x_0=500000 +y_0=0 +");
  3930   3930       add_proj4text (p, 1,
  3931         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3931  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3932   3932       add_proj4text (p, 2,
  3933         -        "12 +units=m +no_defs");
         3933  +        ".12 +units=m +no_defs");
  3934   3934       add_srs_wkt (p, 0,
  3935   3935           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 9N (deprecated)\",G");
  3936   3936       add_srs_wkt (p, 1,
  3937   3937           "EOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[\"");
  3938   3938       add_srs_wkt (p, 2,
  3939   3939           "Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"702");
  3940   3940       add_srs_wkt (p, 3,
  3941         -        "4\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],AUT");
         3941  +        "4\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],AU");
  3942   3942       add_srs_wkt (p, 4,
  3943         -        "HORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
         3943  +        "THORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3944   3944       add_srs_wkt (p, 5,
  3945         -        "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
         3945  +        "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3946   3946       add_srs_wkt (p, 6,
  3947         -        "33,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH");
         3947  +        "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3948   3948       add_srs_wkt (p, 7,
  3949         -        "],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]]");
         3949  +        "H],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"]");
  3950   3950       add_srs_wkt (p, 8,
  3951         -        ",PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitud");
         3951  +        "],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitu");
  3952   3952       add_srs_wkt (p, 9,
  3953         -        "e_of_origin\",0],PARAMETER[\"central_meridian\",51],PARA");
         3953  +        "de_of_origin\",0],PARAMETER[\"central_meridian\",51],PAR");
  3954   3954       add_srs_wkt (p, 10,
  3955         -        "METER[\"scale_factor\",1],PARAMETER[\"false_easting\",50");
         3955  +        "AMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",5");
  3956   3956       add_srs_wkt (p, 11,
  3957         -        "0000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,A");
         3957  +        "00000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,");
  3958   3958       add_srs_wkt (p, 12,
  3959         -        "UTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y\"");
         3959  +        "AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",NORTH],AXIS[\"Y");
  3960   3960       add_srs_wkt (p, 13,
  3961         -        ",EAST],AUTHORITY[\"EPSG\",\"28469\"]]");
         3961  +        "\",EAST],AUTHORITY[\"EPSG\",\"28469\"]]");
  3962   3962       p = add_epsg_def_ex (filter, first, last, 28470, "epsg", 28470,
  3963   3963           "Pulkovo 1942 / Gauss-Kruger 10N (deprecated)", 0, 1,
  3964   3964           "Krassowsky 1940", "Greenwich",
  3965   3965           "Pulkovo_1942", "Transverse_Mercator", "metre",
  3966   3966           "X", "North", "Y", "East");
  3967   3967       add_proj4text (p, 0,
  3968   3968           "+proj=tmerc +lat_0=0 +lon_0=57 +k=1 +x_0=500000 +y_0=0 +");
  3969   3969       add_proj4text (p, 1,
  3970         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         3970  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  3971   3971       add_proj4text (p, 2,
  3972         -        "12 +units=m +no_defs");
         3972  +        ".12 +units=m +no_defs");
  3973   3973       add_srs_wkt (p, 0,
  3974   3974           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 10N (deprecated)\",");
  3975   3975       add_srs_wkt (p, 1,
  3976   3976           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  3977   3977       add_srs_wkt (p, 2,
  3978   3978           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  3979   3979       add_srs_wkt (p, 3,
  3980         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         3980  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  3981   3981       add_srs_wkt (p, 4,
  3982         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         3982  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  3983   3983       add_srs_wkt (p, 5,
  3984         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         3984  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  3985   3985       add_srs_wkt (p, 6,
  3986         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         3986  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  3987   3987       add_srs_wkt (p, 7,
  3988         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         3988  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  3989   3989       add_srs_wkt (p, 8,
  3990   3990           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  3991   3991       add_srs_wkt (p, 9,
  3992   3992           "ude_of_origin\",0],PARAMETER[\"central_meridian\",57],PA");
  3993   3993       add_srs_wkt (p, 10,
  3994   3994           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  3995   3995       add_srs_wkt (p, 11,
................................................................................
  4002   4002           "Pulkovo 1942 / Gauss-Kruger 11N (deprecated)", 0, 1,
  4003   4003           "Krassowsky 1940", "Greenwich",
  4004   4004           "Pulkovo_1942", "Transverse_Mercator", "metre",
  4005   4005           "X", "North", "Y", "East");
  4006   4006       add_proj4text (p, 0,
  4007   4007           "+proj=tmerc +lat_0=0 +lon_0=63 +k=1 +x_0=500000 +y_0=0 +");
  4008   4008       add_proj4text (p, 1,
  4009         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         4009  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  4010   4010       add_proj4text (p, 2,
  4011         -        "12 +units=m +no_defs");
         4011  +        ".12 +units=m +no_defs");
  4012   4012       add_srs_wkt (p, 0,
  4013   4013           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 11N (deprecated)\",");
  4014   4014       add_srs_wkt (p, 1,
  4015   4015           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  4016   4016       add_srs_wkt (p, 2,
  4017   4017           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  4018   4018       add_srs_wkt (p, 3,
  4019         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         4019  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  4020   4020       add_srs_wkt (p, 4,
  4021         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         4021  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  4022   4022       add_srs_wkt (p, 5,
  4023         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         4023  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  4024   4024       add_srs_wkt (p, 6,
  4025         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         4025  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  4026   4026       add_srs_wkt (p, 7,
  4027         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         4027  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  4028   4028       add_srs_wkt (p, 8,
  4029   4029           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  4030   4030       add_srs_wkt (p, 9,
  4031   4031           "ude_of_origin\",0],PARAMETER[\"central_meridian\",63],PA");
  4032   4032       add_srs_wkt (p, 10,
  4033   4033           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  4034   4034       add_srs_wkt (p, 11,
................................................................................
  4041   4041           "Pulkovo 1942 / Gauss-Kruger 12N (deprecated)", 0, 1,
  4042   4042           "Krassowsky 1940", "Greenwich",
  4043   4043           "Pulkovo_1942", "Transverse_Mercator", "metre",
  4044   4044           "X", "North", "Y", "East");
  4045   4045       add_proj4text (p, 0,
  4046   4046           "+proj=tmerc +lat_0=0 +lon_0=69 +k=1 +x_0=500000 +y_0=0 +");
  4047   4047       add_proj4text (p, 1,
  4048         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         4048  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  4049   4049       add_proj4text (p, 2,
  4050         -        "12 +units=m +no_defs");
         4050  +        ".12 +units=m +no_defs");
  4051   4051       add_srs_wkt (p, 0,
  4052   4052           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 12N (deprecated)\",");
  4053   4053       add_srs_wkt (p, 1,
  4054   4054           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  4055   4055       add_srs_wkt (p, 2,
  4056   4056           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  4057   4057       add_srs_wkt (p, 3,
  4058         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         4058  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  4059   4059       add_srs_wkt (p, 4,
  4060         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         4060  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  4061   4061       add_srs_wkt (p, 5,
  4062         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         4062  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  4063   4063       add_srs_wkt (p, 6,
  4064         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         4064  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  4065   4065       add_srs_wkt (p, 7,
  4066         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         4066  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  4067   4067       add_srs_wkt (p, 8,
  4068   4068           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  4069   4069       add_srs_wkt (p, 9,
  4070   4070           "ude_of_origin\",0],PARAMETER[\"central_meridian\",69],PA");
  4071   4071       add_srs_wkt (p, 10,
  4072   4072           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  4073   4073       add_srs_wkt (p, 11,
................................................................................
  4080   4080           "Pulkovo 1942 / Gauss-Kruger 13N (deprecated)", 0, 1,
  4081   4081           "Krassowsky 1940", "Greenwich",
  4082   4082           "Pulkovo_1942", "Transverse_Mercator", "metre",
  4083   4083           "X", "North", "Y", "East");
  4084   4084       add_proj4text (p, 0,
  4085   4085           "+proj=tmerc +lat_0=0 +lon_0=75 +k=1 +x_0=500000 +y_0=0 +");
  4086   4086       add_proj4text (p, 1,
  4087         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
         4087  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
  4088   4088       add_proj4text (p, 2,
  4089         -        "12 +units=m +no_defs");
         4089  +        ".12 +units=m +no_defs");
  4090   4090       add_srs_wkt (p, 0,
  4091   4091           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 13N (deprecated)\",");
  4092   4092       add_srs_wkt (p, 1,
  4093   4093           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
  4094   4094       add_srs_wkt (p, 2,
  4095   4095           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
  4096   4096       add_srs_wkt (p, 3,
  4097         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
         4097  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
  4098   4098       add_srs_wkt (p, 4,
  4099         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
         4099  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
  4100   4100       add_srs_wkt (p, 5,
  4101         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
         4101  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
  4102   4102       add_srs_wkt (p, 6,
  4103         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
         4103  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
  4104   4104       add_srs_wkt (p, 7,
  4105         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
         4105  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
  4106   4106       add_srs_wkt (p, 8,
  4107   4107           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
  4108   4108       add_srs_wkt (p, 9,
  4109   4109           "ude_of_origin\",0],PARAMETER[\"central_meridian\",75],PA");
  4110   4110       add_srs_wkt (p, 10,
  4111   4111           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
  4112   4112       add_srs_wkt (p, 11,

Changes to src/srsinit/epsg_inlined_41.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    58     58           "Pulkovo 1942 / Gauss-Kruger 14N (deprecated)", 0, 1,
    59     59           "Krassowsky 1940", "Greenwich",
    60     60           "Pulkovo_1942", "Transverse_Mercator", "metre",
    61     61           "X", "North", "Y", "East");
    62     62       add_proj4text (p, 0,
    63     63           "+proj=tmerc +lat_0=0 +lon_0=81 +k=1 +x_0=500000 +y_0=0 +");
    64     64       add_proj4text (p, 1,
    65         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
           65  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
    66     66       add_proj4text (p, 2,
    67         -        "12 +units=m +no_defs");
           67  +        ".12 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 14N (deprecated)\",");
    70     70       add_srs_wkt (p, 1,
    71     71           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
    72     72       add_srs_wkt (p, 2,
    73     73           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
    74     74       add_srs_wkt (p, 3,
    75         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
           75  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
    76     76       add_srs_wkt (p, 4,
    77         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
           77  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
    78     78       add_srs_wkt (p, 5,
    79         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
           79  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
    80     80       add_srs_wkt (p, 6,
    81         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
           81  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
    82     82       add_srs_wkt (p, 7,
    83         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
           83  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
    84     84       add_srs_wkt (p, 8,
    85     85           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
    86     86       add_srs_wkt (p, 9,
    87     87           "ude_of_origin\",0],PARAMETER[\"central_meridian\",81],PA");
    88     88       add_srs_wkt (p, 10,
    89     89           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
    90     90       add_srs_wkt (p, 11,
................................................................................
    97     97           "Pulkovo 1942 / Gauss-Kruger 15N (deprecated)", 0, 1,
    98     98           "Krassowsky 1940", "Greenwich",
    99     99           "Pulkovo_1942", "Transverse_Mercator", "metre",
   100    100           "X", "North", "Y", "East");
   101    101       add_proj4text (p, 0,
   102    102           "+proj=tmerc +lat_0=0 +lon_0=87 +k=1 +x_0=500000 +y_0=0 +");
   103    103       add_proj4text (p, 1,
   104         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
          104  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
   105    105       add_proj4text (p, 2,
   106         -        "12 +units=m +no_defs");
          106  +        ".12 +units=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 15N (deprecated)\",");
   109    109       add_srs_wkt (p, 1,
   110    110           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   111    111       add_srs_wkt (p, 2,
   112    112           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   113    113       add_srs_wkt (p, 3,
   114         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          114  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   115    115       add_srs_wkt (p, 4,
   116         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          116  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   117    117       add_srs_wkt (p, 5,
   118         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          118  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   119    119       add_srs_wkt (p, 6,
   120         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          120  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   121    121       add_srs_wkt (p, 7,
   122         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          122  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   123    123       add_srs_wkt (p, 8,
   124    124           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   125    125       add_srs_wkt (p, 9,
   126    126           "ude_of_origin\",0],PARAMETER[\"central_meridian\",87],PA");
   127    127       add_srs_wkt (p, 10,
   128    128           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   129    129       add_srs_wkt (p, 11,
................................................................................
   136    136           "Pulkovo 1942 / Gauss-Kruger 16N (deprecated)", 0, 1,
   137    137           "Krassowsky 1940", "Greenwich",
   138    138           "Pulkovo_1942", "Transverse_Mercator", "metre",
   139    139           "X", "North", "Y", "East");
   140    140       add_proj4text (p, 0,
   141    141           "+proj=tmerc +lat_0=0 +lon_0=93 +k=1 +x_0=500000 +y_0=0 +");
   142    142       add_proj4text (p, 1,
   143         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
          143  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
   144    144       add_proj4text (p, 2,
   145         -        "12 +units=m +no_defs");
          145  +        ".12 +units=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 16N (deprecated)\",");
   148    148       add_srs_wkt (p, 1,
   149    149           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   150    150       add_srs_wkt (p, 2,
   151    151           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   152    152       add_srs_wkt (p, 3,
   153         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          153  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   154    154       add_srs_wkt (p, 4,
   155         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          155  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   156    156       add_srs_wkt (p, 5,
   157         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          157  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   158    158       add_srs_wkt (p, 6,
   159         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          159  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   160    160       add_srs_wkt (p, 7,
   161         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          161  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   162    162       add_srs_wkt (p, 8,
   163    163           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   164    164       add_srs_wkt (p, 9,
   165    165           "ude_of_origin\",0],PARAMETER[\"central_meridian\",93],PA");
   166    166       add_srs_wkt (p, 10,
   167    167           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   168    168       add_srs_wkt (p, 11,
................................................................................
   175    175           "Pulkovo 1942 / Gauss-Kruger 17N (deprecated)", 0, 1,
   176    176           "Krassowsky 1940", "Greenwich",
   177    177           "Pulkovo_1942", "Transverse_Mercator", "metre",
   178    178           "X", "North", "Y", "East");
   179    179       add_proj4text (p, 0,
   180    180           "+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=500000 +y_0=0 +");
   181    181       add_proj4text (p, 1,
   182         -        "ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.");
          182  +        "ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-0");
   183    183       add_proj4text (p, 2,
   184         -        "12 +units=m +no_defs");
          184  +        ".12 +units=m +no_defs");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 17N (deprecated)\",");
   187    187       add_srs_wkt (p, 1,
   188    188           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   189    189       add_srs_wkt (p, 2,
   190    190           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   191    191       add_srs_wkt (p, 3,
   192         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          192  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   193    193       add_srs_wkt (p, 4,
   194         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          194  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   195    195       add_srs_wkt (p, 5,
   196         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          196  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   197    197       add_srs_wkt (p, 6,
   198         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          198  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   199    199       add_srs_wkt (p, 7,
   200         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          200  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   201    201       add_srs_wkt (p, 8,
   202    202           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   203    203       add_srs_wkt (p, 9,
   204    204           "ude_of_origin\",0],PARAMETER[\"central_meridian\",99],PA");
   205    205       add_srs_wkt (p, 10,
   206    206           "RAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",");
   207    207       add_srs_wkt (p, 11,
................................................................................
   214    214           "Pulkovo 1942 / Gauss-Kruger 18N (deprecated)", 0, 1,
   215    215           "Krassowsky 1940", "Greenwich",
   216    216           "Pulkovo_1942", "Transverse_Mercator", "metre",
   217    217           "X", "North", "Y", "East");
   218    218       add_proj4text (p, 0,
   219    219           "+proj=tmerc +lat_0=0 +lon_0=105 +k=1 +x_0=500000 +y_0=0 ");
   220    220       add_proj4text (p, 1,
   221         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          221  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   222    222       add_proj4text (p, 2,
   223         -        ".12 +units=m +no_defs");
          223  +        "0.12 +units=m +no_defs");
   224    224       add_srs_wkt (p, 0,
   225    225           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 18N (deprecated)\",");
   226    226       add_srs_wkt (p, 1,
   227    227           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   228    228       add_srs_wkt (p, 2,
   229    229           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   230    230       add_srs_wkt (p, 3,
   231         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          231  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   232    232       add_srs_wkt (p, 4,
   233         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          233  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   234    234       add_srs_wkt (p, 5,
   235         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          235  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   236    236       add_srs_wkt (p, 6,
   237         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          237  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   238    238       add_srs_wkt (p, 7,
   239         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          239  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   240    240       add_srs_wkt (p, 8,
   241    241           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   242    242       add_srs_wkt (p, 9,
   243    243           "ude_of_origin\",0],PARAMETER[\"central_meridian\",105],P");
   244    244       add_srs_wkt (p, 10,
   245    245           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   246    246       add_srs_wkt (p, 11,
................................................................................
   253    253           "Pulkovo 1942 / Gauss-Kruger 19N (deprecated)", 0, 1,
   254    254           "Krassowsky 1940", "Greenwich",
   255    255           "Pulkovo_1942", "Transverse_Mercator", "metre",
   256    256           "X", "North", "Y", "East");
   257    257       add_proj4text (p, 0,
   258    258           "+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=500000 +y_0=0 ");
   259    259       add_proj4text (p, 1,
   260         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          260  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   261    261       add_proj4text (p, 2,
   262         -        ".12 +units=m +no_defs");
          262  +        "0.12 +units=m +no_defs");
   263    263       add_srs_wkt (p, 0,
   264    264           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 19N (deprecated)\",");
   265    265       add_srs_wkt (p, 1,
   266    266           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   267    267       add_srs_wkt (p, 2,
   268    268           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   269    269       add_srs_wkt (p, 3,
   270         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          270  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   271    271       add_srs_wkt (p, 4,
   272         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          272  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   273    273       add_srs_wkt (p, 5,
   274         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          274  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   275    275       add_srs_wkt (p, 6,
   276         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          276  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   277    277       add_srs_wkt (p, 7,
   278         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          278  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   279    279       add_srs_wkt (p, 8,
   280    280           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   281    281       add_srs_wkt (p, 9,
   282    282           "ude_of_origin\",0],PARAMETER[\"central_meridian\",111],P");
   283    283       add_srs_wkt (p, 10,
   284    284           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   285    285       add_srs_wkt (p, 11,
................................................................................
   292    292           "Pulkovo 1942 / Gauss-Kruger 20N (deprecated)", 0, 1,
   293    293           "Krassowsky 1940", "Greenwich",
   294    294           "Pulkovo_1942", "Transverse_Mercator", "metre",
   295    295           "X", "North", "Y", "East");
   296    296       add_proj4text (p, 0,
   297    297           "+proj=tmerc +lat_0=0 +lon_0=117 +k=1 +x_0=500000 +y_0=0 ");
   298    298       add_proj4text (p, 1,
   299         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          299  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   300    300       add_proj4text (p, 2,
   301         -        ".12 +units=m +no_defs");
          301  +        "0.12 +units=m +no_defs");
   302    302       add_srs_wkt (p, 0,
   303    303           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 20N (deprecated)\",");
   304    304       add_srs_wkt (p, 1,
   305    305           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   306    306       add_srs_wkt (p, 2,
   307    307           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   308    308       add_srs_wkt (p, 3,
   309         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          309  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   310    310       add_srs_wkt (p, 4,
   311         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          311  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   312    312       add_srs_wkt (p, 5,
   313         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          313  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   314    314       add_srs_wkt (p, 6,
   315         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          315  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   316    316       add_srs_wkt (p, 7,
   317         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          317  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   318    318       add_srs_wkt (p, 8,
   319    319           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   320    320       add_srs_wkt (p, 9,
   321    321           "ude_of_origin\",0],PARAMETER[\"central_meridian\",117],P");
   322    322       add_srs_wkt (p, 10,
   323    323           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   324    324       add_srs_wkt (p, 11,
................................................................................
   331    331           "Pulkovo 1942 / Gauss-Kruger 21N (deprecated)", 0, 1,
   332    332           "Krassowsky 1940", "Greenwich",
   333    333           "Pulkovo_1942", "Transverse_Mercator", "metre",
   334    334           "X", "North", "Y", "East");
   335    335       add_proj4text (p, 0,
   336    336           "+proj=tmerc +lat_0=0 +lon_0=123 +k=1 +x_0=500000 +y_0=0 ");
   337    337       add_proj4text (p, 1,
   338         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          338  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   339    339       add_proj4text (p, 2,
   340         -        ".12 +units=m +no_defs");
          340  +        "0.12 +units=m +no_defs");
   341    341       add_srs_wkt (p, 0,
   342    342           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 21N (deprecated)\",");
   343    343       add_srs_wkt (p, 1,
   344    344           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   345    345       add_srs_wkt (p, 2,
   346    346           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   347    347       add_srs_wkt (p, 3,
   348         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          348  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   349    349       add_srs_wkt (p, 4,
   350         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          350  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   351    351       add_srs_wkt (p, 5,
   352         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          352  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   353    353       add_srs_wkt (p, 6,
   354         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          354  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   355    355       add_srs_wkt (p, 7,
   356         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          356  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   357    357       add_srs_wkt (p, 8,
   358    358           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   359    359       add_srs_wkt (p, 9,
   360    360           "ude_of_origin\",0],PARAMETER[\"central_meridian\",123],P");
   361    361       add_srs_wkt (p, 10,
   362    362           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   363    363       add_srs_wkt (p, 11,
................................................................................
   370    370           "Pulkovo 1942 / Gauss-Kruger 22N (deprecated)", 0, 1,
   371    371           "Krassowsky 1940", "Greenwich",
   372    372           "Pulkovo_1942", "Transverse_Mercator", "metre",
   373    373           "X", "North", "Y", "East");
   374    374       add_proj4text (p, 0,
   375    375           "+proj=tmerc +lat_0=0 +lon_0=129 +k=1 +x_0=500000 +y_0=0 ");
   376    376       add_proj4text (p, 1,
   377         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          377  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   378    378       add_proj4text (p, 2,
   379         -        ".12 +units=m +no_defs");
          379  +        "0.12 +units=m +no_defs");
   380    380       add_srs_wkt (p, 0,
   381    381           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 22N (deprecated)\",");
   382    382       add_srs_wkt (p, 1,
   383    383           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   384    384       add_srs_wkt (p, 2,
   385    385           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   386    386       add_srs_wkt (p, 3,
   387         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          387  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   388    388       add_srs_wkt (p, 4,
   389         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          389  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   390    390       add_srs_wkt (p, 5,
   391         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          391  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   392    392       add_srs_wkt (p, 6,
   393         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          393  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   394    394       add_srs_wkt (p, 7,
   395         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          395  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   396    396       add_srs_wkt (p, 8,
   397    397           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   398    398       add_srs_wkt (p, 9,
   399    399           "ude_of_origin\",0],PARAMETER[\"central_meridian\",129],P");
   400    400       add_srs_wkt (p, 10,
   401    401           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   402    402       add_srs_wkt (p, 11,
................................................................................
   409    409           "Pulkovo 1942 / Gauss-Kruger 23N (deprecated)", 0, 1,
   410    410           "Krassowsky 1940", "Greenwich",
   411    411           "Pulkovo_1942", "Transverse_Mercator", "metre",
   412    412           "X", "North", "Y", "East");
   413    413       add_proj4text (p, 0,
   414    414           "+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 ");
   415    415       add_proj4text (p, 1,
   416         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          416  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   417    417       add_proj4text (p, 2,
   418         -        ".12 +units=m +no_defs");
          418  +        "0.12 +units=m +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 23N (deprecated)\",");
   421    421       add_srs_wkt (p, 1,
   422    422           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   423    423       add_srs_wkt (p, 2,
   424    424           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   425    425       add_srs_wkt (p, 3,
   426         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          426  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   427    427       add_srs_wkt (p, 4,
   428         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          428  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   429    429       add_srs_wkt (p, 5,
   430         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          430  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   431    431       add_srs_wkt (p, 6,
   432         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          432  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   433    433       add_srs_wkt (p, 7,
   434         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          434  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   435    435       add_srs_wkt (p, 8,
   436    436           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   437    437       add_srs_wkt (p, 9,
   438    438           "ude_of_origin\",0],PARAMETER[\"central_meridian\",135],P");
   439    439       add_srs_wkt (p, 10,
   440    440           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   441    441       add_srs_wkt (p, 11,
................................................................................
   448    448           "Pulkovo 1942 / Gauss-Kruger 24N (deprecated)", 0, 1,
   449    449           "Krassowsky 1940", "Greenwich",
   450    450           "Pulkovo_1942", "Transverse_Mercator", "metre",
   451    451           "X", "North", "Y", "East");
   452    452       add_proj4text (p, 0,
   453    453           "+proj=tmerc +lat_0=0 +lon_0=141 +k=1 +x_0=500000 +y_0=0 ");
   454    454       add_proj4text (p, 1,
   455         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          455  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   456    456       add_proj4text (p, 2,
   457         -        ".12 +units=m +no_defs");
          457  +        "0.12 +units=m +no_defs");
   458    458       add_srs_wkt (p, 0,
   459    459           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 24N (deprecated)\",");
   460    460       add_srs_wkt (p, 1,
   461    461           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   462    462       add_srs_wkt (p, 2,
   463    463           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   464    464       add_srs_wkt (p, 3,
   465         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          465  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   466    466       add_srs_wkt (p, 4,
   467         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          467  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   468    468       add_srs_wkt (p, 5,
   469         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          469  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   470    470       add_srs_wkt (p, 6,
   471         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          471  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   472    472       add_srs_wkt (p, 7,
   473         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          473  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   474    474       add_srs_wkt (p, 8,
   475    475           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   476    476       add_srs_wkt (p, 9,
   477    477           "ude_of_origin\",0],PARAMETER[\"central_meridian\",141],P");
   478    478       add_srs_wkt (p, 10,
   479    479           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   480    480       add_srs_wkt (p, 11,
................................................................................
   487    487           "Pulkovo 1942 / Gauss-Kruger 25N (deprecated)", 0, 1,
   488    488           "Krassowsky 1940", "Greenwich",
   489    489           "Pulkovo_1942", "Transverse_Mercator", "metre",
   490    490           "X", "North", "Y", "East");
   491    491       add_proj4text (p, 0,
   492    492           "+proj=tmerc +lat_0=0 +lon_0=147 +k=1 +x_0=500000 +y_0=0 ");
   493    493       add_proj4text (p, 1,
   494         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          494  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   495    495       add_proj4text (p, 2,
   496         -        ".12 +units=m +no_defs");
          496  +        "0.12 +units=m +no_defs");
   497    497       add_srs_wkt (p, 0,
   498    498           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 25N (deprecated)\",");
   499    499       add_srs_wkt (p, 1,
   500    500           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   501    501       add_srs_wkt (p, 2,
   502    502           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   503    503       add_srs_wkt (p, 3,
   504         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          504  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   505    505       add_srs_wkt (p, 4,
   506         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          506  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   507    507       add_srs_wkt (p, 5,
   508         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          508  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   509    509       add_srs_wkt (p, 6,
   510         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          510  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   511    511       add_srs_wkt (p, 7,
   512         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          512  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   513    513       add_srs_wkt (p, 8,
   514    514           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   515    515       add_srs_wkt (p, 9,
   516    516           "ude_of_origin\",0],PARAMETER[\"central_meridian\",147],P");
   517    517       add_srs_wkt (p, 10,
   518    518           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   519    519       add_srs_wkt (p, 11,
................................................................................
   526    526           "Pulkovo 1942 / Gauss-Kruger 26N (deprecated)", 0, 1,
   527    527           "Krassowsky 1940", "Greenwich",
   528    528           "Pulkovo_1942", "Transverse_Mercator", "metre",
   529    529           "X", "North", "Y", "East");
   530    530       add_proj4text (p, 0,
   531    531           "+proj=tmerc +lat_0=0 +lon_0=153 +k=1 +x_0=500000 +y_0=0 ");
   532    532       add_proj4text (p, 1,
   533         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          533  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   534    534       add_proj4text (p, 2,
   535         -        ".12 +units=m +no_defs");
          535  +        "0.12 +units=m +no_defs");
   536    536       add_srs_wkt (p, 0,
   537    537           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 26N (deprecated)\",");
   538    538       add_srs_wkt (p, 1,
   539    539           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   540    540       add_srs_wkt (p, 2,
   541    541           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   542    542       add_srs_wkt (p, 3,
   543         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          543  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   544    544       add_srs_wkt (p, 4,
   545         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          545  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   546    546       add_srs_wkt (p, 5,
   547         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          547  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   548    548       add_srs_wkt (p, 6,
   549         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          549  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   550    550       add_srs_wkt (p, 7,
   551         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          551  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   552    552       add_srs_wkt (p, 8,
   553    553           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   554    554       add_srs_wkt (p, 9,
   555    555           "ude_of_origin\",0],PARAMETER[\"central_meridian\",153],P");
   556    556       add_srs_wkt (p, 10,
   557    557           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   558    558       add_srs_wkt (p, 11,
................................................................................
   565    565           "Pulkovo 1942 / Gauss-Kruger 27N (deprecated)", 0, 1,
   566    566           "Krassowsky 1940", "Greenwich",
   567    567           "Pulkovo_1942", "Transverse_Mercator", "metre",
   568    568           "X", "North", "Y", "East");
   569    569       add_proj4text (p, 0,
   570    570           "+proj=tmerc +lat_0=0 +lon_0=159 +k=1 +x_0=500000 +y_0=0 ");
   571    571       add_proj4text (p, 1,
   572         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          572  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   573    573       add_proj4text (p, 2,
   574         -        ".12 +units=m +no_defs");
          574  +        "0.12 +units=m +no_defs");
   575    575       add_srs_wkt (p, 0,
   576    576           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 27N (deprecated)\",");
   577    577       add_srs_wkt (p, 1,
   578    578           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   579    579       add_srs_wkt (p, 2,
   580    580           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   581    581       add_srs_wkt (p, 3,
   582         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          582  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   583    583       add_srs_wkt (p, 4,
   584         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          584  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   585    585       add_srs_wkt (p, 5,
   586         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          586  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   587    587       add_srs_wkt (p, 6,
   588         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          588  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   589    589       add_srs_wkt (p, 7,
   590         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          590  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   591    591       add_srs_wkt (p, 8,
   592    592           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   593    593       add_srs_wkt (p, 9,
   594    594           "ude_of_origin\",0],PARAMETER[\"central_meridian\",159],P");
   595    595       add_srs_wkt (p, 10,
   596    596           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   597    597       add_srs_wkt (p, 11,
................................................................................
   604    604           "Pulkovo 1942 / Gauss-Kruger 28N (deprecated)", 0, 1,
   605    605           "Krassowsky 1940", "Greenwich",
   606    606           "Pulkovo_1942", "Transverse_Mercator", "metre",
   607    607           "X", "North", "Y", "East");
   608    608       add_proj4text (p, 0,
   609    609           "+proj=tmerc +lat_0=0 +lon_0=165 +k=1 +x_0=500000 +y_0=0 ");
   610    610       add_proj4text (p, 1,
   611         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          611  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   612    612       add_proj4text (p, 2,
   613         -        ".12 +units=m +no_defs");
          613  +        "0.12 +units=m +no_defs");
   614    614       add_srs_wkt (p, 0,
   615    615           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 28N (deprecated)\",");
   616    616       add_srs_wkt (p, 1,
   617    617           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   618    618       add_srs_wkt (p, 2,
   619    619           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   620    620       add_srs_wkt (p, 3,
   621         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          621  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   622    622       add_srs_wkt (p, 4,
   623         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          623  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   624    624       add_srs_wkt (p, 5,
   625         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          625  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   626    626       add_srs_wkt (p, 6,
   627         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          627  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   628    628       add_srs_wkt (p, 7,
   629         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          629  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   630    630       add_srs_wkt (p, 8,
   631    631           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   632    632       add_srs_wkt (p, 9,
   633    633           "ude_of_origin\",0],PARAMETER[\"central_meridian\",165],P");
   634    634       add_srs_wkt (p, 10,
   635    635           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   636    636       add_srs_wkt (p, 11,
................................................................................
   643    643           "Pulkovo 1942 / Gauss-Kruger 29N (deprecated)", 0, 1,
   644    644           "Krassowsky 1940", "Greenwich",
   645    645           "Pulkovo_1942", "Transverse_Mercator", "metre",
   646    646           "X", "North", "Y", "East");
   647    647       add_proj4text (p, 0,
   648    648           "+proj=tmerc +lat_0=0 +lon_0=171 +k=1 +x_0=500000 +y_0=0 ");
   649    649       add_proj4text (p, 1,
   650         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          650  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   651    651       add_proj4text (p, 2,
   652         -        ".12 +units=m +no_defs");
          652  +        "0.12 +units=m +no_defs");
   653    653       add_srs_wkt (p, 0,
   654    654           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 29N (deprecated)\",");
   655    655       add_srs_wkt (p, 1,
   656    656           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   657    657       add_srs_wkt (p, 2,
   658    658           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   659    659       add_srs_wkt (p, 3,
   660         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          660  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   661    661       add_srs_wkt (p, 4,
   662         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          662  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   663    663       add_srs_wkt (p, 5,
   664         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          664  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   665    665       add_srs_wkt (p, 6,
   666         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          666  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   667    667       add_srs_wkt (p, 7,
   668         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          668  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   669    669       add_srs_wkt (p, 8,
   670    670           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   671    671       add_srs_wkt (p, 9,
   672    672           "ude_of_origin\",0],PARAMETER[\"central_meridian\",171],P");
   673    673       add_srs_wkt (p, 10,
   674    674           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   675    675       add_srs_wkt (p, 11,
................................................................................
   682    682           "Pulkovo 1942 / Gauss-Kruger 30N (deprecated)", 0, 1,
   683    683           "Krassowsky 1940", "Greenwich",
   684    684           "Pulkovo_1942", "Transverse_Mercator", "metre",
   685    685           "X", "North", "Y", "East");
   686    686       add_proj4text (p, 0,
   687    687           "+proj=tmerc +lat_0=0 +lon_0=177 +k=1 +x_0=500000 +y_0=0 ");
   688    688       add_proj4text (p, 1,
   689         -        "+ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0");
          689  +        "+ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,-");
   690    690       add_proj4text (p, 2,
   691         -        ".12 +units=m +no_defs");
          691  +        "0.12 +units=m +no_defs");
   692    692       add_srs_wkt (p, 0,
   693    693           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 30N (deprecated)\",");
   694    694       add_srs_wkt (p, 1,
   695    695           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   696    696       add_srs_wkt (p, 2,
   697    697           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   698    698       add_srs_wkt (p, 3,
   699         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          699  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   700    700       add_srs_wkt (p, 4,
   701         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          701  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   702    702       add_srs_wkt (p, 5,
   703         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          703  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   704    704       add_srs_wkt (p, 6,
   705         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          705  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   706    706       add_srs_wkt (p, 7,
   707         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          707  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   708    708       add_srs_wkt (p, 8,
   709    709           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   710    710       add_srs_wkt (p, 9,
   711    711           "ude_of_origin\",0],PARAMETER[\"central_meridian\",177],P");
   712    712       add_srs_wkt (p, 10,
   713    713           "ARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   714    714       add_srs_wkt (p, 11,
................................................................................
   721    721           "Pulkovo 1942 / Gauss-Kruger 31N (deprecated)", 0, 1,
   722    722           "Krassowsky 1940", "Greenwich",
   723    723           "Pulkovo_1942", "Transverse_Mercator", "metre",
   724    724           "X", "North", "Y", "East");
   725    725       add_proj4text (p, 0,
   726    726           "+proj=tmerc +lat_0=0 +lon_0=-177 +k=1 +x_0=500000 +y_0=0");
   727    727       add_proj4text (p, 1,
   728         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          728  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   729    729       add_proj4text (p, 2,
   730         -        "0.12 +units=m +no_defs");
          730  +        "-0.12 +units=m +no_defs");
   731    731       add_srs_wkt (p, 0,
   732    732           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 31N (deprecated)\",");
   733    733       add_srs_wkt (p, 1,
   734    734           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   735    735       add_srs_wkt (p, 2,
   736    736           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   737    737       add_srs_wkt (p, 3,
   738         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          738  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   739    739       add_srs_wkt (p, 4,
   740         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          740  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   741    741       add_srs_wkt (p, 5,
   742         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          742  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   743    743       add_srs_wkt (p, 6,
   744         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          744  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   745    745       add_srs_wkt (p, 7,
   746         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          746  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   747    747       add_srs_wkt (p, 8,
   748    748           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   749    749       add_srs_wkt (p, 9,
   750    750           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-177],");
   751    751       add_srs_wkt (p, 10,
   752    752           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   753    753       add_srs_wkt (p, 11,
................................................................................
   760    760           "Pulkovo 1942 / Gauss-Kruger 32N (deprecated)", 0, 1,
   761    761           "Krassowsky 1940", "Greenwich",
   762    762           "Pulkovo_1942", "Transverse_Mercator", "metre",
   763    763           "X", "North", "Y", "East");
   764    764       add_proj4text (p, 0,
   765    765           "+proj=tmerc +lat_0=0 +lon_0=-171 +k=1 +x_0=500000 +y_0=0");
   766    766       add_proj4text (p, 1,
   767         -        " +ellps=krass +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-");
          767  +        " +ellps=krass +towgs84=23.92,-141.27,-80.9,-0,0.35,0.82,");
   768    768       add_proj4text (p, 2,
   769         -        "0.12 +units=m +no_defs");
          769  +        "-0.12 +units=m +no_defs");
   770    770       add_srs_wkt (p, 0,
   771    771           "PROJCS[\"Pulkovo 1942 / Gauss-Kruger 32N (deprecated)\",");
   772    772       add_srs_wkt (p, 1,
   773    773           "GEOGCS[\"Pulkovo 1942\",DATUM[\"Pulkovo_1942\",SPHEROID[");
   774    774       add_srs_wkt (p, 2,
   775    775           "\"Krassowsky 1940\",6378245,298.3,AUTHORITY[\"EPSG\",\"7");
   776    776       add_srs_wkt (p, 3,
   777         -        "024\"]],TOWGS84[23.92,-141.27,-80.9,0,0.35,0.82,-0.12],A");
          777  +        "024\"]],TOWGS84[23.92,-141.27,-80.9,-0,0.35,0.82,-0.12],");
   778    778       add_srs_wkt (p, 4,
   779         -        "UTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUTH");
          779  +        "AUTHORITY[\"EPSG\",\"6284\"]],PRIMEM[\"Greenwich\",0,AUT");
   780    780       add_srs_wkt (p, 5,
   781         -        "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
          781  +        "HORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251");
   782    782       add_srs_wkt (p, 6,
   783         -        "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
          783  +        "99433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NO");
   784    784       add_srs_wkt (p, 7,
   785         -        "TH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
          785  +        "RTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4284\"");
   786    786       add_srs_wkt (p, 8,
   787    787           "]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latit");
   788    788       add_srs_wkt (p, 9,
   789    789           "ude_of_origin\",0],PARAMETER[\"central_meridian\",-171],");
   790    790       add_srs_wkt (p, 10,
   791    791           "PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\"");
   792    792       add_srs_wkt (p, 11,
................................................................................
   842    842           "Amersfoort", "Oblique_Stereographic", "metre",
   843    843           "X", "East", "Y", "North");
   844    844       add_proj4text (p, 0,
   845    845           "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.387638888");
   846    846       add_proj4text (p, 1,
   847    847           "88889 +k=0.9999079 +x_0=0 +y_0=0 +ellps=bessel +towgs84=");
   848    848       add_proj4text (p, 2,
   849         -        "565.4171,50.3319,465.5524,-0.398957388243134,0.343987817");
          849  +        "565.417,50.3319,465.552,-0.398957,0.343988,-1.8774,4.072");
   850    850       add_proj4text (p, 3,
   851         -        "378283,-1.87740163998045,4.0725 +units=m +no_defs");
          851  +        "5 +units=m +no_defs");
   852    852       add_srs_wkt (p, 0,
   853    853           "PROJCS[\"Amersfoort / RD Old\",GEOGCS[\"Amersfoort\",DAT");
   854    854       add_srs_wkt (p, 1,
   855    855           "UM[\"Amersfoort\",SPHEROID[\"Bessel 1841\",6377397.155,2");
   856    856       add_srs_wkt (p, 2,
   857    857           "99.1528128,AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.417");
   858    858       add_srs_wkt (p, 3,
   859         -        "1,50.3319,465.5524,-0.398957388243134,0.343987817378283,");
   860         -    add_srs_wkt (p, 4,
   861         -        "-1.87740163998045,4.0725],AUTHORITY[\"EPSG\",\"6289\"]],");
   862         -    add_srs_wkt (p, 5,
   863         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   864         -    add_srs_wkt (p, 6,
   865         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   866         -    add_srs_wkt (p, 7,
   867         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
   868         -    add_srs_wkt (p, 8,
   869         -        "AUTHORITY[\"EPSG\",\"4289\"]],PROJECTION[\"Oblique_Stere");
   870         -    add_srs_wkt (p, 9,
   871         -        "ographic\"],PARAMETER[\"latitude_of_origin\",52.15616055");
   872         -    add_srs_wkt (p, 10,
   873         -        "555555],PARAMETER[\"central_meridian\",5.38763888888889]");
   874         -    add_srs_wkt (p, 11,
   875         -        ",PARAMETER[\"scale_factor\",0.9999079],PARAMETER[\"false");
   876         -    add_srs_wkt (p, 12,
   877         -        "_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"met");
   878         -    add_srs_wkt (p, 13,
   879         -        "re\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AX");
          859  +        ",50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725],AUTH");
          860  +    add_srs_wkt (p, 4,
          861  +        "ORITY[\"EPSG\",\"6289\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
          862  +    add_srs_wkt (p, 5,
          863  +        "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
          864  +    add_srs_wkt (p, 6,
          865  +        "3,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH]");
          866  +    add_srs_wkt (p, 7,
          867  +        ",AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4289\"]],");
          868  +    add_srs_wkt (p, 8,
          869  +        "PROJECTION[\"Oblique_Stereographic\"],PARAMETER[\"latitu");
          870  +    add_srs_wkt (p, 9,
          871  +        "de_of_origin\",52.15616055555555],PARAMETER[\"central_me");
          872  +    add_srs_wkt (p, 10,
          873  +        "ridian\",5.38763888888889],PARAMETER[\"scale_factor\",0.");
          874  +    add_srs_wkt (p, 11,
          875  +        "9999079],PARAMETER[\"false_easting\",0],PARAMETER[\"fals");
          876  +    add_srs_wkt (p, 12,
          877  +        "e_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"90");
          878  +    add_srs_wkt (p, 13,
          879  +        "01\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EP");
   880    880       add_srs_wkt (p, 14,
   881         -        "IS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"28991\"]]");
          881  +        "SG\",\"28991\"]]");
   882    882       p = add_epsg_def_ex (filter, first, last, 28992, "epsg", 28992,
   883    883           "Amersfoort / RD New", 0, 0,
   884    884           "Bessel 1841", "Greenwich",
   885    885           "Amersfoort", "Oblique_Stereographic", "metre",
   886    886           "X", "East", "Y", "North");
   887    887       add_proj4text (p, 0,
   888    888           "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.387638888");
   889    889       add_proj4text (p, 1,
   890    890           "88889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel");
   891    891       add_proj4text (p, 2,
   892         -        " +towgs84=565.4171,50.3319,465.5524,-0.398957388243134,0");
          892  +        " +towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.");
   893    893       add_proj4text (p, 3,
   894         -        ".343987817378283,-1.87740163998045,4.0725 +units=m +no_d");
   895         -    add_proj4text (p, 4,
   896         -        "efs");
          894  +        "8774,4.0725 +units=m +no_defs");
   897    895       add_srs_wkt (p, 0,
   898    896           "PROJCS[\"Amersfoort / RD New\",GEOGCS[\"Amersfoort\",DAT");
   899    897       add_srs_wkt (p, 1,
   900    898           "UM[\"Amersfoort\",SPHEROID[\"Bessel 1841\",6377397.155,2");
   901    899       add_srs_wkt (p, 2,
   902    900           "99.1528128,AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[565.417");
   903    901       add_srs_wkt (p, 3,
   904         -        "1,50.3319,465.5524,-0.398957388243134,0.343987817378283,");
   905         -    add_srs_wkt (p, 4,
   906         -        "-1.87740163998045,4.0725],AUTHORITY[\"EPSG\",\"6289\"]],");
   907         -    add_srs_wkt (p, 5,
   908         -        "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNI");
   909         -    add_srs_wkt (p, 6,
   910         -        "T[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"912");
   911         -    add_srs_wkt (p, 7,
   912         -        "2\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],");
   913         -    add_srs_wkt (p, 8,
   914         -        "AUTHORITY[\"EPSG\",\"4289\"]],PROJECTION[\"Oblique_Stere");
   915         -    add_srs_wkt (p, 9,
   916         -        "ographic\"],PARAMETER[\"latitude_of_origin\",52.15616055");
   917         -    add_srs_wkt (p, 10,
   918         -        "555555],PARAMETER[\"central_meridian\",5.38763888888889]");
   919         -    add_srs_wkt (p, 11,
   920         -        ",PARAMETER[\"scale_factor\",0.9999079],PARAMETER[\"false");
   921         -    add_srs_wkt (p, 12,
   922         -        "_easting\",155000],PARAMETER[\"false_northing\",463000],");
   923         -    add_srs_wkt (p, 13,
   924         -        "UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\"");
          902  +        ",50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725],AUTH");
          903  +    add_srs_wkt (p, 4,
          904  +        "ORITY[\"EPSG\",\"6289\"]],PRIMEM[\"Greenwich\",0,AUTHORI");
          905  +    add_srs_wkt (p, 5,
          906  +        "TY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519943");
          907  +    add_srs_wkt (p, 6,
          908  +        "3,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH]");
          909  +    add_srs_wkt (p, 7,
          910  +        ",AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"4289\"]],");
          911  +    add_srs_wkt (p, 8,
          912  +        "PROJECTION[\"Oblique_Stereographic\"],PARAMETER[\"latitu");
          913  +    add_srs_wkt (p, 9,
          914  +        "de_of_origin\",52.15616055555555],PARAMETER[\"central_me");
          915  +    add_srs_wkt (p, 10,
          916  +        "ridian\",5.38763888888889],PARAMETER[\"scale_factor\",0.");
          917  +    add_srs_wkt (p, 11,
          918  +        "9999079],PARAMETER[\"false_easting\",155000],PARAMETER[\"");
          919  +    add_srs_wkt (p, 12,
          920  +        "false_northing\",463000],UNIT[\"metre\",1,AUTHORITY[\"EP");
          921  +    add_srs_wkt (p, 13,
          922  +        "SG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHO");
   925    923       add_srs_wkt (p, 14,
   926         -        ",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"28992\"]]");
          924  +        "RITY[\"EPSG\",\"28992\"]]");
   927    925       p = add_epsg_def_ex (filter, first, last, 29100, "epsg", 29100,
   928    926           "SAD69 / Brazil Polyconic (deprecated)", 0, 0,
   929    927           "GRS 1967", "Greenwich",
   930    928           "South_American_Datum_1969", "Polyconic", "metre",
   931    929           "X", "East", "Y", "North");
   932    930       add_proj4text (p, 0,
   933    931           "+proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=1000000");
................................................................................
  2467   2465       add_proj4text (p, 1,
  2468   2466           "defs");
  2469   2467       add_srs_wkt (p, 0,
  2470   2468           "PROJCS[\"Sudan / UTM zone 35N (deprecated)\",GEOGCS[\"Su");
  2471   2469       add_srs_wkt (p, 1,
  2472   2470           "dan\",DATUM[\"Sudan\",SPHEROID[\"Clarke 1880 (IGN)\",637");
  2473   2471       add_srs_wkt (p, 2,
  2474         -        "8249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],A");
         2472  +        "8249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],A");
  2475   2473       add_srs_wkt (p, 3,
  2476   2474           "UTHORITY[\"EPSG\",\"6296\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2477   2475       add_srs_wkt (p, 4,
  2478   2476           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2479   2477       add_srs_wkt (p, 5,
  2480   2478           "9433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Latitude\",NOR");
  2481   2479       add_srs_wkt (p, 6,
................................................................................
  2504   2502       add_proj4text (p, 1,
  2505   2503           "defs");
  2506   2504       add_srs_wkt (p, 0,
  2507   2505           "PROJCS[\"Sudan / UTM zone 36N (deprecated)\",GEOGCS[\"Su");
  2508   2506       add_srs_wkt (p, 1,
  2509   2507           "dan\",DATUM[\"Sudan\",SPHEROID[\"Clarke 1880 (IGN)\",637");
  2510   2508       add_srs_wkt (p, 2,
  2511         -        "8249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"7011\"]],A");
         2509  +        "8249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"7011\"]],A");
  2512   2510       add_srs_wkt (p, 3,
  2513   2511           "UTHORITY[\"EPSG\",\"6296\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2514   2512       add_srs_wkt (p, 4,
  2515   2513           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2516   2514       add_srs_wkt (p, 5,
  2517   2515           "9433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Latitude\",NOR");
  2518   2516       add_srs_wkt (p, 6,
................................................................................
  3825   3823       add_proj4text (p, 3,
  3826   3824           "88,472.052,0,0,0,0 +to_meter=0.201166195164 +no_defs");
  3827   3825       add_srs_wkt (p, 0,
  3828   3826           "PROJCS[\"Trinidad 1903 / Trinidad Grid\",GEOGCS[\"Trinid");
  3829   3827       add_srs_wkt (p, 1,
  3830   3828           "ad 1903\",DATUM[\"Trinidad_1903\",SPHEROID[\"Clarke 1858");
  3831   3829       add_srs_wkt (p, 2,
  3832         -        "\",6378293.645208759,294.2606763692606,AUTHORITY[\"EPSG\"");
         3830  +        "\",6378293.645208759,294.2606763692569,AUTHORITY[\"EPSG\"");
  3833   3831       add_srs_wkt (p, 3,
  3834   3832           ",\"7007\"]],TOWGS84[-61.702,284.488,472.052,0,0,0,0],AUT");
  3835   3833       add_srs_wkt (p, 4,
  3836   3834           "HORITY[\"EPSG\",\"6302\"]],PRIMEM[\"Greenwich\",0,AUTHOR");
  3837   3835       add_srs_wkt (p, 5,
  3838   3836           "ITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994");
  3839   3837       add_srs_wkt (p, 6,
................................................................................
  3932   3930       add_proj4text (p, 2,
  3933   3931           "84=-73,-247,227,0,0,0,0 +units=m +no_defs");
  3934   3932       add_srs_wkt (p, 0,
  3935   3933           "PROJCS[\"Voirol 1875 / Nord Algerie (ancienne)\",GEOGCS[");
  3936   3934       add_srs_wkt (p, 1,
  3937   3935           "\"Voirol 1875\",DATUM[\"Voirol_1875\",SPHEROID[\"Clarke ");
  3938   3936       add_srs_wkt (p, 2,
  3939         -        "1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPS");
         3937  +        "1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPS");
  3940   3938       add_srs_wkt (p, 3,
  3941   3939           "G\",\"7011\"]],TOWGS84[-73,-247,227,0,0,0,0],AUTHORITY[\"");
  3942   3940       add_srs_wkt (p, 4,
  3943   3941           "EPSG\",\"6304\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPS");
  3944   3942       add_srs_wkt (p, 5,
  3945   3943           "G\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHOR");
  3946   3944       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_42.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    66     66       add_proj4text (p, 2,
    67     67           "owgs84=-73,-247,227,0,0,0,0 +units=m +no_defs");
    68     68       add_srs_wkt (p, 0,
    69     69           "PROJCS[\"Voirol 1875 / Sud Algerie (ancienne)\",GEOGCS[\"");
    70     70       add_srs_wkt (p, 1,
    71     71           "Voirol 1875\",DATUM[\"Voirol_1875\",SPHEROID[\"Clarke 18");
    72     72       add_srs_wkt (p, 2,
    73         -        "80 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
           73  +        "80 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
    74     74       add_srs_wkt (p, 3,
    75     75           ",\"7011\"]],TOWGS84[-73,-247,227,0,0,0,0],AUTHORITY[\"EP");
    76     76       add_srs_wkt (p, 4,
    77     77           "SG\",\"6304\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\"");
    78     78       add_srs_wkt (p, 5,
    79     79           ",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY");
    80     80       add_srs_wkt (p, 6,
................................................................................
   105    105       add_proj4text (p, 2,
   106    106           "=m +no_defs");
   107    107       add_srs_wkt (p, 0,
   108    108           "PROJCS[\"Voirol 1879 / Nord Algerie (ancienne)\",GEOGCS[");
   109    109       add_srs_wkt (p, 1,
   110    110           "\"Voirol 1879\",DATUM[\"Voirol_1879\",SPHEROID[\"Clarke ");
   111    111       add_srs_wkt (p, 2,
   112         -        "1880 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPS");
          112  +        "1880 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPS");
   113    113       add_srs_wkt (p, 3,
   114    114           "G\",\"7011\"]],AUTHORITY[\"EPSG\",\"6671\"]],PRIMEM[\"Gr");
   115    115       add_srs_wkt (p, 4,
   116    116           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
   117    117       add_srs_wkt (p, 5,
   118    118           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
   119    119       add_srs_wkt (p, 6,
................................................................................
   144    144       add_proj4text (p, 2,
   145    145           "nits=m +no_defs");
   146    146       add_srs_wkt (p, 0,
   147    147           "PROJCS[\"Voirol 1879 / Sud Algerie (ancienne)\",GEOGCS[\"");
   148    148       add_srs_wkt (p, 1,
   149    149           "Voirol 1879\",DATUM[\"Voirol_1879\",SPHEROID[\"Clarke 18");
   150    150       add_srs_wkt (p, 2,
   151         -        "80 (IGN)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\"");
          151  +        "80 (IGN)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\"");
   152    152       add_srs_wkt (p, 3,
   153    153           ",\"7011\"]],AUTHORITY[\"EPSG\",\"6671\"]],PRIMEM[\"Green");
   154    154       add_srs_wkt (p, 4,
   155    155           "wich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0");
   156    156       add_srs_wkt (p, 5,
   157    157           ".0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"L");
   158    158       add_srs_wkt (p, 6,
................................................................................
   173    173           "ITY[\"EPSG\",\"30494\"]]");
   174    174       p = add_epsg_def_ex (filter, first, last, 30729, "epsg", 30729,
   175    175           "Nord Sahara 1959 / UTM zone 29N", 0, 0,
   176    176           "Clarke 1880 (RGS)", "Greenwich",
   177    177           "Nord_Sahara_1959", "Transverse_Mercator", "metre",
   178    178           "Easting", "East", "Northing", "North");
   179    179       add_proj4text (p, 0,
   180         -        "+proj=utm +zone=29 +ellps=clrk80 +towgs84=-209.3622,-87.");
          180  +        "+proj=utm +zone=29 +ellps=clrk80 +towgs84=-209.362,-87.8");
   181    181       add_proj4text (p, 1,
   182         -        "8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +no_");
          182  +        "162,404.62,0.0046,3.4784,0.5805,-1.4547 +units=m +no_def");
   183    183       add_proj4text (p, 2,
   184         -        "defs");
          184  +        "s");
   185    185       add_srs_wkt (p, 0,
   186    186           "PROJCS[\"Nord Sahara 1959 / UTM zone 29N\",GEOGCS[\"Nord");
   187    187       add_srs_wkt (p, 1,
   188    188           " Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Cla");
   189    189       add_srs_wkt (p, 2,
   190    190           "rke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",");
   191    191       add_srs_wkt (p, 3,
   192         -        "\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.");
   193         -    add_srs_wkt (p, 4,
   194         -        "4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIME");
   195         -    add_srs_wkt (p, 5,
   196         -        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   197         -    add_srs_wkt (p, 6,
   198         -        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   199         -    add_srs_wkt (p, 7,
   200         -        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   201         -    add_srs_wkt (p, 8,
   202         -        "RITY[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercato");
   203         -    add_srs_wkt (p, 9,
   204         -        "r\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"cen");
   205         -    add_srs_wkt (p, 10,
   206         -        "tral_meridian\",-9],PARAMETER[\"scale_factor\",0.9996],P");
   207         -    add_srs_wkt (p, 11,
   208         -        "ARAMETER[\"false_easting\",500000],PARAMETER[\"false_nor");
   209         -    add_srs_wkt (p, 12,
   210         -        "thing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
   211         -    add_srs_wkt (p, 13,
   212         -        "],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHOR");
   213         -    add_srs_wkt (p, 14,
   214         -        "ITY[\"EPSG\",\"30729\"]]");
          192  +        "\"7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.478");
          193  +    add_srs_wkt (p, 4,
          194  +        "4,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"");
          195  +    add_srs_wkt (p, 5,
          196  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
          197  +    add_srs_wkt (p, 6,
          198  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
          199  +    add_srs_wkt (p, 7,
          200  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
          201  +    add_srs_wkt (p, 8,
          202  +        "[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercator\"]");
          203  +    add_srs_wkt (p, 9,
          204  +        ",PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central");
          205  +    add_srs_wkt (p, 10,
          206  +        "_meridian\",-9],PARAMETER[\"scale_factor\",0.9996],PARAM");
          207  +    add_srs_wkt (p, 11,
          208  +        "ETER[\"false_easting\",500000],PARAMETER[\"false_northin");
          209  +    add_srs_wkt (p, 12,
          210  +        "g\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AX");
          211  +    add_srs_wkt (p, 13,
          212  +        "IS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[");
          213  +    add_srs_wkt (p, 14,
          214  +        "\"EPSG\",\"30729\"]]");
   215    215       p = add_epsg_def_ex (filter, first, last, 30730, "epsg", 30730,
   216    216           "Nord Sahara 1959 / UTM zone 30N", 0, 0,
   217    217           "Clarke 1880 (RGS)", "Greenwich",
   218    218           "Nord_Sahara_1959", "Transverse_Mercator", "metre",
   219    219           "Easting", "East", "Northing", "North");
   220    220       add_proj4text (p, 0,
   221         -        "+proj=utm +zone=30 +ellps=clrk80 +towgs84=-209.3622,-87.");
          221  +        "+proj=utm +zone=30 +ellps=clrk80 +towgs84=-209.362,-87.8");
   222    222       add_proj4text (p, 1,
   223         -        "8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +no_");
          223  +        "162,404.62,0.0046,3.4784,0.5805,-1.4547 +units=m +no_def");
   224    224       add_proj4text (p, 2,
   225         -        "defs");
          225  +        "s");
   226    226       add_srs_wkt (p, 0,
   227    227           "PROJCS[\"Nord Sahara 1959 / UTM zone 30N\",GEOGCS[\"Nord");
   228    228       add_srs_wkt (p, 1,
   229    229           " Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Cla");
   230    230       add_srs_wkt (p, 2,
   231    231           "rke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",");
   232    232       add_srs_wkt (p, 3,
   233         -        "\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.");
   234         -    add_srs_wkt (p, 4,
   235         -        "4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIME");
   236         -    add_srs_wkt (p, 5,
   237         -        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   238         -    add_srs_wkt (p, 6,
   239         -        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   240         -    add_srs_wkt (p, 7,
   241         -        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   242         -    add_srs_wkt (p, 8,
   243         -        "RITY[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercato");
   244         -    add_srs_wkt (p, 9,
   245         -        "r\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"cen");
   246         -    add_srs_wkt (p, 10,
   247         -        "tral_meridian\",-3],PARAMETER[\"scale_factor\",0.9996],P");
   248         -    add_srs_wkt (p, 11,
   249         -        "ARAMETER[\"false_easting\",500000],PARAMETER[\"false_nor");
   250         -    add_srs_wkt (p, 12,
   251         -        "thing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
   252         -    add_srs_wkt (p, 13,
   253         -        "],AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHOR");
   254         -    add_srs_wkt (p, 14,
   255         -        "ITY[\"EPSG\",\"30730\"]]");
          233  +        "\"7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.478");
          234  +    add_srs_wkt (p, 4,
          235  +        "4,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"");
          236  +    add_srs_wkt (p, 5,
          237  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
          238  +    add_srs_wkt (p, 6,
          239  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
          240  +    add_srs_wkt (p, 7,
          241  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
          242  +    add_srs_wkt (p, 8,
          243  +        "[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercator\"]");
          244  +    add_srs_wkt (p, 9,
          245  +        ",PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central");
          246  +    add_srs_wkt (p, 10,
          247  +        "_meridian\",-3],PARAMETER[\"scale_factor\",0.9996],PARAM");
          248  +    add_srs_wkt (p, 11,
          249  +        "ETER[\"false_easting\",500000],PARAMETER[\"false_northin");
          250  +    add_srs_wkt (p, 12,
          251  +        "g\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AX");
          252  +    add_srs_wkt (p, 13,
          253  +        "IS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[");
          254  +    add_srs_wkt (p, 14,
          255  +        "\"EPSG\",\"30730\"]]");
   256    256       p = add_epsg_def_ex (filter, first, last, 30731, "epsg", 30731,
   257    257           "Nord Sahara 1959 / UTM zone 31N", 0, 0,
   258    258           "Clarke 1880 (RGS)", "Greenwich",
   259    259           "Nord_Sahara_1959", "Transverse_Mercator", "metre",
   260    260           "Easting", "East", "Northing", "North");
   261    261       add_proj4text (p, 0,
   262         -        "+proj=utm +zone=31 +ellps=clrk80 +towgs84=-209.3622,-87.");
          262  +        "+proj=utm +zone=31 +ellps=clrk80 +towgs84=-209.362,-87.8");
   263    263       add_proj4text (p, 1,
   264         -        "8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +no_");
          264  +        "162,404.62,0.0046,3.4784,0.5805,-1.4547 +units=m +no_def");
   265    265       add_proj4text (p, 2,
   266         -        "defs");
          266  +        "s");
   267    267       add_srs_wkt (p, 0,
   268    268           "PROJCS[\"Nord Sahara 1959 / UTM zone 31N\",GEOGCS[\"Nord");
   269    269       add_srs_wkt (p, 1,
   270    270           " Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Cla");
   271    271       add_srs_wkt (p, 2,
   272    272           "rke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",");
   273    273       add_srs_wkt (p, 3,
   274         -        "\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.");
   275         -    add_srs_wkt (p, 4,
   276         -        "4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIME");
   277         -    add_srs_wkt (p, 5,
   278         -        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   279         -    add_srs_wkt (p, 6,
   280         -        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   281         -    add_srs_wkt (p, 7,
   282         -        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   283         -    add_srs_wkt (p, 8,
   284         -        "RITY[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercato");
   285         -    add_srs_wkt (p, 9,
   286         -        "r\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"cen");
   287         -    add_srs_wkt (p, 10,
   288         -        "tral_meridian\",3],PARAMETER[\"scale_factor\",0.9996],PA");
   289         -    add_srs_wkt (p, 11,
   290         -        "RAMETER[\"false_easting\",500000],PARAMETER[\"false_nort");
   291         -    add_srs_wkt (p, 12,
   292         -        "hing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]]");
   293         -    add_srs_wkt (p, 13,
   294         -        ",AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORI");
   295         -    add_srs_wkt (p, 14,
   296         -        "TY[\"EPSG\",\"30731\"]]");
          274  +        "\"7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.478");
          275  +    add_srs_wkt (p, 4,
          276  +        "4,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"");
          277  +    add_srs_wkt (p, 5,
          278  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
          279  +    add_srs_wkt (p, 6,
          280  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
          281  +    add_srs_wkt (p, 7,
          282  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
          283  +    add_srs_wkt (p, 8,
          284  +        "[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercator\"]");
          285  +    add_srs_wkt (p, 9,
          286  +        ",PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central");
          287  +    add_srs_wkt (p, 10,
          288  +        "_meridian\",3],PARAMETER[\"scale_factor\",0.9996],PARAME");
          289  +    add_srs_wkt (p, 11,
          290  +        "TER[\"false_easting\",500000],PARAMETER[\"false_northing");
          291  +    add_srs_wkt (p, 12,
          292  +        "\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXI");
          293  +    add_srs_wkt (p, 13,
          294  +        "S[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"");
          295  +    add_srs_wkt (p, 14,
          296  +        "EPSG\",\"30731\"]]");
   297    297       p = add_epsg_def_ex (filter, first, last, 30732, "epsg", 30732,
   298    298           "Nord Sahara 1959 / UTM zone 32N", 0, 0,
   299    299           "Clarke 1880 (RGS)", "Greenwich",
   300    300           "Nord_Sahara_1959", "Transverse_Mercator", "metre",
   301    301           "Easting", "East", "Northing", "North");
   302    302       add_proj4text (p, 0,
   303         -        "+proj=utm +zone=32 +ellps=clrk80 +towgs84=-209.3622,-87.");
          303  +        "+proj=utm +zone=32 +ellps=clrk80 +towgs84=-209.362,-87.8");
   304    304       add_proj4text (p, 1,
   305         -        "8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +no_");
          305  +        "162,404.62,0.0046,3.4784,0.5805,-1.4547 +units=m +no_def");
   306    306       add_proj4text (p, 2,
   307         -        "defs");
          307  +        "s");
   308    308       add_srs_wkt (p, 0,
   309    309           "PROJCS[\"Nord Sahara 1959 / UTM zone 32N\",GEOGCS[\"Nord");
   310    310       add_srs_wkt (p, 1,
   311    311           " Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Cla");
   312    312       add_srs_wkt (p, 2,
   313    313           "rke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",");
   314    314       add_srs_wkt (p, 3,
   315         -        "\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.");
   316         -    add_srs_wkt (p, 4,
   317         -        "4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIME");
   318         -    add_srs_wkt (p, 5,
   319         -        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   320         -    add_srs_wkt (p, 6,
   321         -        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   322         -    add_srs_wkt (p, 7,
   323         -        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   324         -    add_srs_wkt (p, 8,
   325         -        "RITY[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercato");
   326         -    add_srs_wkt (p, 9,
   327         -        "r\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"cen");
   328         -    add_srs_wkt (p, 10,
   329         -        "tral_meridian\",9],PARAMETER[\"scale_factor\",0.9996],PA");
   330         -    add_srs_wkt (p, 11,
   331         -        "RAMETER[\"false_easting\",500000],PARAMETER[\"false_nort");
   332         -    add_srs_wkt (p, 12,
   333         -        "hing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]]");
   334         -    add_srs_wkt (p, 13,
   335         -        ",AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORI");
   336         -    add_srs_wkt (p, 14,
   337         -        "TY[\"EPSG\",\"30732\"]]");
          315  +        "\"7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.478");
          316  +    add_srs_wkt (p, 4,
          317  +        "4,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"");
          318  +    add_srs_wkt (p, 5,
          319  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
          320  +    add_srs_wkt (p, 6,
          321  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
          322  +    add_srs_wkt (p, 7,
          323  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
          324  +    add_srs_wkt (p, 8,
          325  +        "[\"EPSG\",\"4307\"]],PROJECTION[\"Transverse_Mercator\"]");
          326  +    add_srs_wkt (p, 9,
          327  +        ",PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central");
          328  +    add_srs_wkt (p, 10,
          329  +        "_meridian\",9],PARAMETER[\"scale_factor\",0.9996],PARAME");
          330  +    add_srs_wkt (p, 11,
          331  +        "TER[\"false_easting\",500000],PARAMETER[\"false_northing");
          332  +    add_srs_wkt (p, 12,
          333  +        "\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXI");
          334  +    add_srs_wkt (p, 13,
          335  +        "S[\"Easting\",EAST],AXIS[\"Northing\",NORTH],AUTHORITY[\"");
          336  +    add_srs_wkt (p, 14,
          337  +        "EPSG\",\"30732\"]]");
   338    338       p = add_epsg_def_ex (filter, first, last, 30791, "epsg", 30791,
   339    339           "Nord Sahara 1959 / Nord Algerie", 0, 0,
   340    340           "Clarke 1880 (RGS)", "Greenwich",
   341    341           "Nord_Sahara_1959", "Lambert_Conformal_Conic_1SP", "metre",
   342    342           "X", "East", "Y", "North");
   343    343       add_proj4text (p, 0,
   344    344           "+proj=lcc +lat_1=36 +lat_0=36 +lon_0=2.7 +k_0=0.99962554");
   345    345       add_proj4text (p, 1,
   346    346           "4 +x_0=500135 +y_0=300090 +ellps=clrk80 +towgs84=-209.36");
   347    347       add_proj4text (p, 2,
   348         -        "22,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units");
          348  +        "2,-87.8162,404.62,0.0046,3.4784,0.5805,-1.4547 +units=m ");
   349    349       add_proj4text (p, 3,
   350         -        "=m +no_defs");
          350  +        "+no_defs");
   351    351       add_srs_wkt (p, 0,
   352    352           "PROJCS[\"Nord Sahara 1959 / Nord Algerie\",GEOGCS[\"Nord");
   353    353       add_srs_wkt (p, 1,
   354    354           " Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Cla");
   355    355       add_srs_wkt (p, 2,
   356    356           "rke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",");
   357    357       add_srs_wkt (p, 3,
   358         -        "\"7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.");
   359         -    add_srs_wkt (p, 4,
   360         -        "4784,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIME");
   361         -    add_srs_wkt (p, 5,
   362         -        "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
   363         -    add_srs_wkt (p, 6,
   364         -        "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
   365         -    add_srs_wkt (p, 7,
   366         -        ",AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHO");
   367         -    add_srs_wkt (p, 8,
   368         -        "RITY[\"EPSG\",\"4307\"]],PROJECTION[\"Lambert_Conformal_");
   369         -    add_srs_wkt (p, 9,
   370         -        "Conic_1SP\"],PARAMETER[\"latitude_of_origin\",36],PARAME");
   371         -    add_srs_wkt (p, 10,
   372         -        "TER[\"central_meridian\",2.7],PARAMETER[\"scale_factor\"");
   373         -    add_srs_wkt (p, 11,
   374         -        ",0.999625544],PARAMETER[\"false_easting\",500135],PARAME");
   375         -    add_srs_wkt (p, 12,
   376         -        "TER[\"false_northing\",300090],UNIT[\"metre\",1,AUTHORIT");
   377         -    add_srs_wkt (p, 13,
   378         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
   379         -    add_srs_wkt (p, 14,
   380         -        ",AUTHORITY[\"EPSG\",\"30791\"]]");
          358  +        "\"7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.478");
          359  +    add_srs_wkt (p, 4,
          360  +        "4,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"");
          361  +    add_srs_wkt (p, 5,
          362  +        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
          363  +    add_srs_wkt (p, 6,
          364  +        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
          365  +    add_srs_wkt (p, 7,
          366  +        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
          367  +    add_srs_wkt (p, 8,
          368  +        "[\"EPSG\",\"4307\"]],PROJECTION[\"Lambert_Conformal_Coni");
          369  +    add_srs_wkt (p, 9,
          370  +        "c_1SP\"],PARAMETER[\"latitude_of_origin\",36],PARAMETER[");
          371  +    add_srs_wkt (p, 10,
          372  +        "\"central_meridian\",2.7],PARAMETER[\"scale_factor\",0.9");
          373  +    add_srs_wkt (p, 11,
          374  +        "99625544],PARAMETER[\"false_easting\",500135],PARAMETER[");
          375  +    add_srs_wkt (p, 12,
          376  +        "\"false_northing\",300090],UNIT[\"metre\",1,AUTHORITY[\"");
          377  +    add_srs_wkt (p, 13,
          378  +        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
          379  +    add_srs_wkt (p, 14,
          380  +        "HORITY[\"EPSG\",\"30791\"]]");
   381    381       p = add_epsg_def_ex (filter, first, last, 30792, "epsg", 30792,
   382    382           "Nord Sahara 1959 / Sud Algerie", 0, 0,
   383    383           "Clarke 1880 (RGS)", "Greenwich",
   384    384           "Nord_Sahara_1959", "Lambert_Conformal_Conic_1SP", "metre",
   385    385           "X", "East", "Y", "North");
   386    386       add_proj4text (p, 0,
   387    387           "+proj=lcc +lat_1=33.3 +lat_0=33.3 +lon_0=2.7 +k_0=0.9996");
   388    388       add_proj4text (p, 1,
   389    389           "25769 +x_0=500135 +y_0=300090 +ellps=clrk80 +towgs84=-20");
   390    390       add_proj4text (p, 2,
   391         -        "9.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +u");
          391  +        "9.362,-87.8162,404.62,0.0046,3.4784,0.5805,-1.4547 +unit");
   392    392       add_proj4text (p, 3,
   393         -        "nits=m +no_defs");
          393  +        "s=m +no_defs");
   394    394       add_srs_wkt (p, 0,
   395    395           "PROJCS[\"Nord Sahara 1959 / Sud Algerie\",GEOGCS[\"Nord ");
   396    396       add_srs_wkt (p, 1,
   397    397           "Sahara 1959\",DATUM[\"Nord_Sahara_1959\",SPHEROID[\"Clar");
   398    398       add_srs_wkt (p, 2,
   399    399           "ke 1880 (RGS)\",6378249.145,293.465,AUTHORITY[\"EPSG\",\"");
   400    400       add_srs_wkt (p, 3,
   401         -        "7012\"]],TOWGS84[-209.3622,-87.8162,404.6198,0.0046,3.47");
   402         -    add_srs_wkt (p, 4,
   403         -        "84,0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[");
   404         -    add_srs_wkt (p, 5,
   405         -        "\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"deg");
   406         -    add_srs_wkt (p, 6,
   407         -        "ree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],A");
   408         -    add_srs_wkt (p, 7,
   409         -        "XIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORI");
   410         -    add_srs_wkt (p, 8,
   411         -        "TY[\"EPSG\",\"4307\"]],PROJECTION[\"Lambert_Conformal_Co");
   412         -    add_srs_wkt (p, 9,
   413         -        "nic_1SP\"],PARAMETER[\"latitude_of_origin\",33.3],PARAME");
   414         -    add_srs_wkt (p, 10,
   415         -        "TER[\"central_meridian\",2.7],PARAMETER[\"scale_factor\"");
   416         -    add_srs_wkt (p, 11,
   417         -        ",0.999625769],PARAMETER[\"false_easting\",500135],PARAME");
   418         -    add_srs_wkt (p, 12,
   419         -        "TER[\"false_northing\",300090],UNIT[\"metre\",1,AUTHORIT");
   420         -    add_srs_wkt (p, 13,
   421         -        "Y[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]");
   422         -    add_srs_wkt (p, 14,
   423         -        ",AUTHORITY[\"EPSG\",\"30792\"]]");
          401  +        "7012\"]],TOWGS84[-209.362,-87.8162,404.62,0.0046,3.4784,");
          402  +    add_srs_wkt (p, 4,
          403  +        "0.5805,-1.4547],AUTHORITY[\"EPSG\",\"6307\"]],PRIMEM[\"G");
          404  +    add_srs_wkt (p, 5,
          405  +        "reenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree");
          406  +    add_srs_wkt (p, 6,
          407  +        "\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS");
          408  +    add_srs_wkt (p, 7,
          409  +        "[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[");
          410  +    add_srs_wkt (p, 8,
          411  +        "\"EPSG\",\"4307\"]],PROJECTION[\"Lambert_Conformal_Conic");
          412  +    add_srs_wkt (p, 9,
          413  +        "_1SP\"],PARAMETER[\"latitude_of_origin\",33.3],PARAMETER");
          414  +    add_srs_wkt (p, 10,
          415  +        "[\"central_meridian\",2.7],PARAMETER[\"scale_factor\",0.");
          416  +    add_srs_wkt (p, 11,
          417  +        "999625769],PARAMETER[\"false_easting\",500135],PARAMETER");
          418  +    add_srs_wkt (p, 12,
          419  +        "[\"false_northing\",300090],UNIT[\"metre\",1,AUTHORITY[\"");
          420  +    add_srs_wkt (p, 13,
          421  +        "EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUT");
          422  +    add_srs_wkt (p, 14,
          423  +        "HORITY[\"EPSG\",\"30792\"]]");
   424    424       p = add_epsg_def_ex (filter, first, last, 30800, "epsg", 30800,
   425    425           "RT38 2.5 gon W (deprecated)", 0, 1,
   426    426           "Bessel 1841", "Greenwich",
   427    427           "Stockholm_1938", "Transverse_Mercator", "metre",
   428    428           "X", "North", "Y", "East");
   429    429       add_proj4text (p, 0,
   430    430           "+proj=tmerc +lat_0=0 +lon_0=15.80827777777778 +k=1 +x_0=");
................................................................................
   466    466       add_proj4text (p, 1,
   467    467           "defs");
   468    468       add_srs_wkt (p, 0,
   469    469           "PROJCS[\"Yoff / UTM zone 28N\",GEOGCS[\"Yoff\",DATUM[\"Y");
   470    470       add_srs_wkt (p, 1,
   471    471           "off\",SPHEROID[\"Clarke 1880 (IGN)\",6378249.2,293.46602");
   472    472       add_srs_wkt (p, 2,
   473         -        "12936269,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\"");
          473  +        "12936265,AUTHORITY[\"EPSG\",\"7011\"]],AUTHORITY[\"EPSG\"");
   474    474       add_srs_wkt (p, 3,
   475    475           ",\"6310\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"");
   476    476       add_srs_wkt (p, 4,
   477    477           "8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"");
   478    478       add_srs_wkt (p, 5,
   479    479           "EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longit");
   480    480       add_srs_wkt (p, 6,
................................................................................
  2072   2072           "Reseau_National_Belge_1972", "Lambert_Conformal_Conic_2SP_Belgium", "metre",
  2073   2073           "X", "East", "Y", "North");
  2074   2074       add_proj4text (p, 0,
  2075   2075           "+proj=lcc +lat_1=49.83333333333334 +lat_2=51.16666666666");
  2076   2076       add_proj4text (p, 1,
  2077   2077           "666 +lat_0=90 +lon_0=4.356939722222222 +x_0=150000.01256");
  2078   2078       add_proj4text (p, 2,
  2079         -        " +y_0=5400088.4378 +ellps=intl +towgs84=-106.8686,52.297");
         2079  +        " +y_0=5400088.4378 +ellps=intl +towgs84=-106.869,52.2978");
  2080   2080       add_proj4text (p, 3,
  2081         -        "8,-103.7239,0.3366,-0.457,1.8422,-1.2747 +units=m +no_de");
  2082         -    add_proj4text (p, 4,
  2083         -        "fs");
         2081  +        ",-103.724,0.3366,-0.457,1.8422,-1.2747 +units=m +no_defs");
  2084   2082       add_srs_wkt (p, 0,
  2085   2083           "PROJCS[\"Belge 1972 / Belge Lambert 72\",GEOGCS[\"Belge ");
  2086   2084       add_srs_wkt (p, 1,
  2087   2085           "1972\",DATUM[\"Reseau_National_Belge_1972\",SPHEROID[\"I");
  2088   2086       add_srs_wkt (p, 2,
  2089   2087           "nternational 1924\",6378388,297,AUTHORITY[\"EPSG\",\"702");
  2090   2088       add_srs_wkt (p, 3,
  2091         -        "2\"]],TOWGS84[-106.8686,52.2978,-103.7239,0.3366,-0.457,");
  2092         -    add_srs_wkt (p, 4,
  2093         -        "1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIMEM[\"G");
  2094         -    add_srs_wkt (p, 5,
  2095         -        "reenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree");
  2096         -    add_srs_wkt (p, 6,
  2097         -        "\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS");
  2098         -    add_srs_wkt (p, 7,
  2099         -        "[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[");
  2100         -    add_srs_wkt (p, 8,
  2101         -        "\"EPSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal_Conic");
  2102         -    add_srs_wkt (p, 9,
  2103         -        "_2SP_Belgium\"],PARAMETER[\"standard_parallel_1\",49.833");
  2104         -    add_srs_wkt (p, 10,
  2105         -        "33333333334],PARAMETER[\"standard_parallel_2\",51.166666");
  2106         -    add_srs_wkt (p, 11,
  2107         -        "66666666],PARAMETER[\"latitude_of_origin\",90],PARAMETER");
  2108         -    add_srs_wkt (p, 12,
  2109         -        "[\"central_meridian\",4.356939722222222],PARAMETER[\"fal");
  2110         -    add_srs_wkt (p, 13,
  2111         -        "se_easting\",150000.01256],PARAMETER[\"false_northing\",");
  2112         -    add_srs_wkt (p, 14,
  2113         -        "5400088.4378],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001");
         2089  +        "2\"]],TOWGS84[-106.869,52.2978,-103.724,0.3366,-0.457,1.");
         2090  +    add_srs_wkt (p, 4,
         2091  +        "8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIMEM[\"Gre");
         2092  +    add_srs_wkt (p, 5,
         2093  +        "enwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
         2094  +    add_srs_wkt (p, 6,
         2095  +        ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
         2096  +    add_srs_wkt (p, 7,
         2097  +        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
         2098  +    add_srs_wkt (p, 8,
         2099  +        "PSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal_Conic_2S");
         2100  +    add_srs_wkt (p, 9,
         2101  +        "P_Belgium\"],PARAMETER[\"standard_parallel_1\",49.833333");
         2102  +    add_srs_wkt (p, 10,
         2103  +        "33333334],PARAMETER[\"standard_parallel_2\",51.166666666");
         2104  +    add_srs_wkt (p, 11,
         2105  +        "66666],PARAMETER[\"latitude_of_origin\",90],PARAMETER[\"");
         2106  +    add_srs_wkt (p, 12,
         2107  +        "central_meridian\",4.356939722222222],PARAMETER[\"false_");
         2108  +    add_srs_wkt (p, 13,
         2109  +        "easting\",150000.01256],PARAMETER[\"false_northing\",540");
         2110  +    add_srs_wkt (p, 14,
         2111  +        "0088.4378],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]");
  2114   2112       add_srs_wkt (p, 15,
  2115         -        "\"]],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG");
         2113  +        "],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",");
  2116   2114       add_srs_wkt (p, 16,
  2117         -        "\",\"31300\"]]");
         2115  +        "\"31300\"]]");
  2118   2116       p = add_epsg_def_ex (filter, first, last, 31370, "epsg", 31370,
  2119   2117           "Belge 1972 / Belgian Lambert 72", 0, 0,
  2120   2118           "International 1924", "Greenwich",
  2121   2119           "Reseau_National_Belge_1972", "Lambert_Conformal_Conic_2SP", "metre",
  2122   2120           "X", "East", "Y", "North");
  2123   2121       add_proj4text (p, 0,
  2124   2122           "+proj=lcc +lat_1=51.16666723333333 +lat_2=49.8333339 +la");
  2125   2123       add_proj4text (p, 1,
  2126   2124           "t_0=90 +lon_0=4.367486666666666 +x_0=150000.013 +y_0=540");
  2127   2125       add_proj4text (p, 2,
  2128         -        "0088.438 +ellps=intl +towgs84=-106.8686,52.2978,-103.723");
         2126  +        "0088.438 +ellps=intl +towgs84=-106.869,52.2978,-103.724,");
  2129   2127       add_proj4text (p, 3,
  2130         -        "9,0.3366,-0.457,1.8422,-1.2747 +units=m +no_defs");
         2128  +        "0.3366,-0.457,1.8422,-1.2747 +units=m +no_defs");
  2131   2129       add_srs_wkt (p, 0,
  2132   2130           "PROJCS[\"Belge 1972 / Belgian Lambert 72\",GEOGCS[\"Belg");
  2133   2131       add_srs_wkt (p, 1,
  2134   2132           "e 1972\",DATUM[\"Reseau_National_Belge_1972\",SPHEROID[\"");
  2135   2133       add_srs_wkt (p, 2,
  2136   2134           "International 1924\",6378388,297,AUTHORITY[\"EPSG\",\"70");
  2137   2135       add_srs_wkt (p, 3,
  2138         -        "22\"]],TOWGS84[-106.8686,52.2978,-103.7239,0.3366,-0.457");
  2139         -    add_srs_wkt (p, 4,
  2140         -        ",1.8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIMEM[\"");
  2141         -    add_srs_wkt (p, 5,
  2142         -        "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
  2143         -    add_srs_wkt (p, 6,
  2144         -        "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
  2145         -    add_srs_wkt (p, 7,
  2146         -        "S[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY");
  2147         -    add_srs_wkt (p, 8,
  2148         -        "[\"EPSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal_Coni");
  2149         -    add_srs_wkt (p, 9,
  2150         -        "c_2SP\"],PARAMETER[\"standard_parallel_1\",51.1666672333");
  2151         -    add_srs_wkt (p, 10,
  2152         -        "3333],PARAMETER[\"standard_parallel_2\",49.8333339],PARA");
  2153         -    add_srs_wkt (p, 11,
  2154         -        "METER[\"latitude_of_origin\",90],PARAMETER[\"central_mer");
  2155         -    add_srs_wkt (p, 12,
  2156         -        "idian\",4.367486666666666],PARAMETER[\"false_easting\",1");
  2157         -    add_srs_wkt (p, 13,
  2158         -        "50000.013],PARAMETER[\"false_northing\",5400088.438],UNI");
  2159         -    add_srs_wkt (p, 14,
  2160         -        "T[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",E");
         2136  +        "22\"]],TOWGS84[-106.869,52.2978,-103.724,0.3366,-0.457,1");
         2137  +    add_srs_wkt (p, 4,
         2138  +        ".8422,-1.2747],AUTHORITY[\"EPSG\",\"6313\"]],PRIMEM[\"Gr");
         2139  +    add_srs_wkt (p, 5,
         2140  +        "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
         2141  +    add_srs_wkt (p, 6,
         2142  +        ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
         2143  +    add_srs_wkt (p, 7,
         2144  +        "Latitude\",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"E");
         2145  +    add_srs_wkt (p, 8,
         2146  +        "PSG\",\"4313\"]],PROJECTION[\"Lambert_Conformal_Conic_2S");
         2147  +    add_srs_wkt (p, 9,
         2148  +        "P\"],PARAMETER[\"standard_parallel_1\",51.16666723333333");
         2149  +    add_srs_wkt (p, 10,
         2150  +        "],PARAMETER[\"standard_parallel_2\",49.8333339],PARAMETE");
         2151  +    add_srs_wkt (p, 11,
         2152  +        "R[\"latitude_of_origin\",90],PARAMETER[\"central_meridia");
         2153  +    add_srs_wkt (p, 12,
         2154  +        "n\",4.367486666666666],PARAMETER[\"false_easting\",15000");
         2155  +    add_srs_wkt (p, 13,
         2156  +        "0.013],PARAMETER[\"false_northing\",5400088.438],UNIT[\"");
         2157  +    add_srs_wkt (p, 14,
         2158  +        "metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST]");
  2161   2159       add_srs_wkt (p, 15,
  2162         -        "AST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"31370\"]]");
         2160  +        ",AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"31370\"]]");
  2163   2161       p = add_epsg_def_ex (filter, first, last, 31461, "epsg", 31461,
  2164   2162           "DHDN / 3-degree Gauss zone 1 (deprecated)", 0, 0,
  2165   2163           "Bessel 1841", "Greenwich",
  2166   2164           "Deutsches_Hauptdreiecksnetz", "Transverse_Mercator", "metre",
  2167   2165           "X", "East", "Y", "North");
  2168   2166       add_proj4text (p, 0,
  2169   2167           "+proj=tmerc +lat_0=0 +lon_0=3 +k=1 +x_0=1500000 +y_0=0 +");
................................................................................
  2656   2654       add_proj4text (p, 1,
  2657   2655           "259,-9,0,0,0,0 +units=m +no_defs");
  2658   2656       add_srs_wkt (p, 0,
  2659   2657           "PROJCS[\"Conakry 1905 / UTM zone 28N\",GEOGCS[\"Conakry ");
  2660   2658       add_srs_wkt (p, 1,
  2661   2659           "1905\",DATUM[\"Conakry_1905\",SPHEROID[\"Clarke 1880 (IG");
  2662   2660       add_srs_wkt (p, 2,
  2663         -        "N)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"70");
         2661  +        "N)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"70");
  2664   2662       add_srs_wkt (p, 3,
  2665   2663           "11\"]],TOWGS84[-23,259,-9,0,0,0,0],AUTHORITY[\"EPSG\",\"");
  2666   2664       add_srs_wkt (p, 4,
  2667   2665           "6315\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
  2668   2666       add_srs_wkt (p, 5,
  2669   2667           "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
  2670   2668       add_srs_wkt (p, 6,
................................................................................
  2693   2691       add_proj4text (p, 1,
  2694   2692           "259,-9,0,0,0,0 +units=m +no_defs");
  2695   2693       add_srs_wkt (p, 0,
  2696   2694           "PROJCS[\"Conakry 1905 / UTM zone 29N\",GEOGCS[\"Conakry ");
  2697   2695       add_srs_wkt (p, 1,
  2698   2696           "1905\",DATUM[\"Conakry_1905\",SPHEROID[\"Clarke 1880 (IG");
  2699   2697       add_srs_wkt (p, 2,
  2700         -        "N)\",6378249.2,293.4660212936269,AUTHORITY[\"EPSG\",\"70");
         2698  +        "N)\",6378249.2,293.4660212936265,AUTHORITY[\"EPSG\",\"70");
  2701   2699       add_srs_wkt (p, 3,
  2702   2700           "11\"]],TOWGS84[-23,259,-9,0,0,0,0],AUTHORITY[\"EPSG\",\"");
  2703   2701       add_srs_wkt (p, 4,
  2704   2702           "6315\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"890");
  2705   2703       add_srs_wkt (p, 5,
  2706   2704           "1\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPS");
  2707   2705       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_43.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
   417    417       add_proj4text (p, 2,
   418    418           "27 +units=us-ft +no_defs");
   419    419       add_srs_wkt (p, 0,
   420    420           "PROJCS[\"NAD27 / Montana North\",GEOGCS[\"NAD27\",DATUM[");
   421    421       add_srs_wkt (p, 1,
   422    422           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   423    423       add_srs_wkt (p, 2,
   424         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          424  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   425    425       add_srs_wkt (p, 3,
   426    426           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   427    427       add_srs_wkt (p, 4,
   428    428           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   429    429       add_srs_wkt (p, 5,
   430    430           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   431    431       add_srs_wkt (p, 6,
................................................................................
   458    458       add_proj4text (p, 2,
   459    459           "_0=0 +datum=NAD27 +units=us-ft +no_defs");
   460    460       add_srs_wkt (p, 0,
   461    461           "PROJCS[\"NAD27 / Montana Central\",GEOGCS[\"NAD27\",DATU");
   462    462       add_srs_wkt (p, 1,
   463    463           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   464    464       add_srs_wkt (p, 2,
   465         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          465  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   466    466       add_srs_wkt (p, 3,
   467    467           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   468    468       add_srs_wkt (p, 4,
   469    469           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   470    470       add_srs_wkt (p, 5,
   471    471           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   472    472       add_srs_wkt (p, 6,
................................................................................
   499    499       add_proj4text (p, 2,
   500    500           "7 +units=us-ft +no_defs");
   501    501       add_srs_wkt (p, 0,
   502    502           "PROJCS[\"NAD27 / Montana South\",GEOGCS[\"NAD27\",DATUM[");
   503    503       add_srs_wkt (p, 1,
   504    504           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   505    505       add_srs_wkt (p, 2,
   506         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          506  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   507    507       add_srs_wkt (p, 3,
   508    508           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   509    509       add_srs_wkt (p, 4,
   510    510           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   511    511       add_srs_wkt (p, 5,
   512    512           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   513    513       add_srs_wkt (p, 6,
................................................................................
   540    540       add_proj4text (p, 2,
   541    541           "=0 +datum=NAD27 +units=us-ft +no_defs");
   542    542       add_srs_wkt (p, 0,
   543    543           "PROJCS[\"NAD27 / Nebraska North\",GEOGCS[\"NAD27\",DATUM");
   544    544       add_srs_wkt (p, 1,
   545    545           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   546    546       add_srs_wkt (p, 2,
   547         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          547  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   548    548       add_srs_wkt (p, 3,
   549    549           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   550    550       add_srs_wkt (p, 4,
   551    551           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   552    552       add_srs_wkt (p, 5,
   553    553           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   554    554       add_srs_wkt (p, 6,
................................................................................
   581    581       add_proj4text (p, 2,
   582    582           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   583    583       add_srs_wkt (p, 0,
   584    584           "PROJCS[\"NAD27 / Nebraska South\",GEOGCS[\"NAD27\",DATUM");
   585    585       add_srs_wkt (p, 1,
   586    586           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   587    587       add_srs_wkt (p, 2,
   588         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          588  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   589    589       add_srs_wkt (p, 3,
   590    590           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   591    591       add_srs_wkt (p, 4,
   592    592           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   593    593       add_srs_wkt (p, 5,
   594    594           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   595    595       add_srs_wkt (p, 6,
................................................................................
   624    624       add_proj4text (p, 2,
   625    625           "s-ft +no_defs");
   626    626       add_srs_wkt (p, 0,
   627    627           "PROJCS[\"NAD27 / Nevada East\",GEOGCS[\"NAD27\",DATUM[\"");
   628    628       add_srs_wkt (p, 1,
   629    629           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
   630    630       add_srs_wkt (p, 2,
   631         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
          631  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
   632    632       add_srs_wkt (p, 3,
   633    633           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
   634    634       add_srs_wkt (p, 4,
   635    635           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
   636    636       add_srs_wkt (p, 5,
   637    637           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
   638    638       add_srs_wkt (p, 6,
................................................................................
   663    663       add_proj4text (p, 2,
   664    664           "s-ft +no_defs");
   665    665       add_srs_wkt (p, 0,
   666    666           "PROJCS[\"NAD27 / Nevada Central\",GEOGCS[\"NAD27\",DATUM");
   667    667       add_srs_wkt (p, 1,
   668    668           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
   669    669       add_srs_wkt (p, 2,
   670         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
          670  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
   671    671       add_srs_wkt (p, 3,
   672    672           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
   673    673       add_srs_wkt (p, 4,
   674    674           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
   675    675       add_srs_wkt (p, 5,
   676    676           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
   677    677       add_srs_wkt (p, 6,
................................................................................
   702    702       add_proj4text (p, 2,
   703    703           "s-ft +no_defs");
   704    704       add_srs_wkt (p, 0,
   705    705           "PROJCS[\"NAD27 / Nevada West\",GEOGCS[\"NAD27\",DATUM[\"");
   706    706       add_srs_wkt (p, 1,
   707    707           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
   708    708       add_srs_wkt (p, 2,
   709         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
          709  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
   710    710       add_srs_wkt (p, 3,
   711    711           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
   712    712       add_srs_wkt (p, 4,
   713    713           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
   714    714       add_srs_wkt (p, 5,
   715    715           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
   716    716       add_srs_wkt (p, 6,
................................................................................
   741    741       add_proj4text (p, 2,
   742    742           "ts=us-ft +no_defs");
   743    743       add_srs_wkt (p, 0,
   744    744           "PROJCS[\"NAD27 / New Hampshire\",GEOGCS[\"NAD27\",DATUM[");
   745    745       add_srs_wkt (p, 1,
   746    746           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   747    747       add_srs_wkt (p, 2,
   748         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          748  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   749    749       add_srs_wkt (p, 3,
   750    750           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   751    751       add_srs_wkt (p, 4,
   752    752           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   753    753       add_srs_wkt (p, 5,
   754    754           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   755    755       add_srs_wkt (p, 6,
................................................................................
   780    780       add_proj4text (p, 2,
   781    781           "=0 +datum=NAD27 +units=us-ft +no_defs");
   782    782       add_srs_wkt (p, 0,
   783    783           "PROJCS[\"NAD27 / New Jersey\",GEOGCS[\"NAD27\",DATUM[\"N");
   784    784       add_srs_wkt (p, 1,
   785    785           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
   786    786       add_srs_wkt (p, 2,
   787         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
          787  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
   788    788       add_srs_wkt (p, 3,
   789    789           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
   790    790       add_srs_wkt (p, 4,
   791    791           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
   792    792       add_srs_wkt (p, 5,
   793    793           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
   794    794       add_srs_wkt (p, 6,
................................................................................
   819    819       add_proj4text (p, 2,
   820    820           "=us-ft +no_defs");
   821    821       add_srs_wkt (p, 0,
   822    822           "PROJCS[\"NAD27 / New Mexico East\",GEOGCS[\"NAD27\",DATU");
   823    823       add_srs_wkt (p, 1,
   824    824           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   825    825       add_srs_wkt (p, 2,
   826         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          826  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   827    827       add_srs_wkt (p, 3,
   828    828           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   829    829       add_srs_wkt (p, 4,
   830    830           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   831    831       add_srs_wkt (p, 5,
   832    832           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   833    833       add_srs_wkt (p, 6,
................................................................................
   856    856       add_proj4text (p, 1,
   857    857           "00.3048006096 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
   858    858       add_srs_wkt (p, 0,
   859    859           "PROJCS[\"NAD27 / New Mexico Central\",GEOGCS[\"NAD27\",D");
   860    860       add_srs_wkt (p, 1,
   861    861           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
   862    862       add_srs_wkt (p, 2,
   863         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
          863  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
   864    864       add_srs_wkt (p, 3,
   865    865           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
   866    866       add_srs_wkt (p, 4,
   867    867           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
   868    868       add_srs_wkt (p, 5,
   869    869           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
   870    870       add_srs_wkt (p, 6,
................................................................................
   895    895       add_proj4text (p, 2,
   896    896           "=us-ft +no_defs");
   897    897       add_srs_wkt (p, 0,
   898    898           "PROJCS[\"NAD27 / New Mexico West\",GEOGCS[\"NAD27\",DATU");
   899    899       add_srs_wkt (p, 1,
   900    900           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   901    901       add_srs_wkt (p, 2,
   902         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          902  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   903    903       add_srs_wkt (p, 3,
   904    904           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   905    905       add_srs_wkt (p, 4,
   906    906           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   907    907       add_srs_wkt (p, 5,
   908    908           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   909    909       add_srs_wkt (p, 6,
................................................................................
   934    934       add_proj4text (p, 2,
   935    935           "=us-ft +no_defs");
   936    936       add_srs_wkt (p, 0,
   937    937           "PROJCS[\"NAD27 / New York East\",GEOGCS[\"NAD27\",DATUM[");
   938    938       add_srs_wkt (p, 1,
   939    939           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
   940    940       add_srs_wkt (p, 2,
   941         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
          941  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
   942    942       add_srs_wkt (p, 3,
   943    943           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
   944    944       add_srs_wkt (p, 4,
   945    945           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
   946    946       add_srs_wkt (p, 5,
   947    947           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
   948    948       add_srs_wkt (p, 6,
................................................................................
   973    973       add_proj4text (p, 2,
   974    974           "s-ft +no_defs");
   975    975       add_srs_wkt (p, 0,
   976    976           "PROJCS[\"NAD27 / New York Central\",GEOGCS[\"NAD27\",DAT");
   977    977       add_srs_wkt (p, 1,
   978    978           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
   979    979       add_srs_wkt (p, 2,
   980         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
          980  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
   981    981       add_srs_wkt (p, 3,
   982    982           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
   983    983       add_srs_wkt (p, 4,
   984    984           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
   985    985       add_srs_wkt (p, 5,
   986    986           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
   987    987       add_srs_wkt (p, 6,
................................................................................
  1012   1012       add_proj4text (p, 2,
  1013   1013           "s-ft +no_defs");
  1014   1014       add_srs_wkt (p, 0,
  1015   1015           "PROJCS[\"NAD27 / New York West\",GEOGCS[\"NAD27\",DATUM[");
  1016   1016       add_srs_wkt (p, 1,
  1017   1017           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  1018   1018       add_srs_wkt (p, 2,
  1019         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         1019  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  1020   1020       add_srs_wkt (p, 3,
  1021   1021           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  1022   1022       add_srs_wkt (p, 4,
  1023   1023           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1024   1024       add_srs_wkt (p, 5,
  1025   1025           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  1026   1026       add_srs_wkt (p, 6,
................................................................................
  1051   1051       add_proj4text (p, 2,
  1052   1052           " +datum=NAD27 +units=us-ft +no_defs");
  1053   1053       add_srs_wkt (p, 0,
  1054   1054           "PROJCS[\"NAD27 / New York Long Island (deprecated)\",GEO");
  1055   1055       add_srs_wkt (p, 1,
  1056   1056           "GCS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHERO");
  1057   1057       add_srs_wkt (p, 2,
  1058         -        "ID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY");
         1058  +        "ID[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY");
  1059   1059       add_srs_wkt (p, 3,
  1060   1060           "[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIME");
  1061   1061       add_srs_wkt (p, 4,
  1062   1062           "M[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"d");
  1063   1063       add_srs_wkt (p, 5,
  1064   1064           "egree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]");
  1065   1065       add_srs_wkt (p, 6,
................................................................................
  1094   1094       add_proj4text (p, 2,
  1095   1095           "0 +datum=NAD27 +units=us-ft +no_defs");
  1096   1096       add_srs_wkt (p, 0,
  1097   1097           "PROJCS[\"NAD27 / North Carolina\",GEOGCS[\"NAD27\",DATUM");
  1098   1098       add_srs_wkt (p, 1,
  1099   1099           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  1100   1100       add_srs_wkt (p, 2,
  1101         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         1101  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  1102   1102       add_srs_wkt (p, 3,
  1103   1103           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  1104   1104       add_srs_wkt (p, 4,
  1105   1105           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1106   1106       add_srs_wkt (p, 5,
  1107   1107           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1108   1108       add_srs_wkt (p, 6,
................................................................................
  1135   1135       add_proj4text (p, 2,
  1136   1136           "0 +datum=NAD27 +units=us-ft +no_defs");
  1137   1137       add_srs_wkt (p, 0,
  1138   1138           "PROJCS[\"NAD27 / North Dakota North\",GEOGCS[\"NAD27\",D");
  1139   1139       add_srs_wkt (p, 1,
  1140   1140           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1141   1141       add_srs_wkt (p, 2,
  1142         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1142  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1143   1143       add_srs_wkt (p, 3,
  1144   1144           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1145   1145       add_srs_wkt (p, 4,
  1146   1146           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1147   1147       add_srs_wkt (p, 5,
  1148   1148           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1149   1149       add_srs_wkt (p, 6,
................................................................................
  1176   1176       add_proj4text (p, 2,
  1177   1177           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1178   1178       add_srs_wkt (p, 0,
  1179   1179           "PROJCS[\"NAD27 / North Dakota South\",GEOGCS[\"NAD27\",D");
  1180   1180       add_srs_wkt (p, 1,
  1181   1181           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1182   1182       add_srs_wkt (p, 2,
  1183         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1183  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1184   1184       add_srs_wkt (p, 3,
  1185   1185           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1186   1186       add_srs_wkt (p, 4,
  1187   1187           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1188   1188       add_srs_wkt (p, 5,
  1189   1189           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1190   1190       add_srs_wkt (p, 6,
................................................................................
  1219   1219       add_proj4text (p, 2,
  1220   1220           "=0 +datum=NAD27 +units=us-ft +no_defs");
  1221   1221       add_srs_wkt (p, 0,
  1222   1222           "PROJCS[\"NAD27 / Ohio North\",GEOGCS[\"NAD27\",DATUM[\"N");
  1223   1223       add_srs_wkt (p, 1,
  1224   1224           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  1225   1225       add_srs_wkt (p, 2,
  1226         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         1226  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  1227   1227       add_srs_wkt (p, 3,
  1228   1228           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  1229   1229       add_srs_wkt (p, 4,
  1230   1230           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  1231   1231       add_srs_wkt (p, 5,
  1232   1232           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  1233   1233       add_srs_wkt (p, 6,
................................................................................
  1260   1260       add_proj4text (p, 2,
  1261   1261           " +datum=NAD27 +units=us-ft +no_defs");
  1262   1262       add_srs_wkt (p, 0,
  1263   1263           "PROJCS[\"NAD27 / Ohio South\",GEOGCS[\"NAD27\",DATUM[\"N");
  1264   1264       add_srs_wkt (p, 1,
  1265   1265           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  1266   1266       add_srs_wkt (p, 2,
  1267         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         1267  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  1268   1268       add_srs_wkt (p, 3,
  1269   1269           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  1270   1270       add_srs_wkt (p, 4,
  1271   1271           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  1272   1272       add_srs_wkt (p, 5,
  1273   1273           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  1274   1274       add_srs_wkt (p, 6,
................................................................................
  1301   1301       add_proj4text (p, 2,
  1302   1302           "datum=NAD27 +units=us-ft +no_defs");
  1303   1303       add_srs_wkt (p, 0,
  1304   1304           "PROJCS[\"NAD27 / Oklahoma North\",GEOGCS[\"NAD27\",DATUM");
  1305   1305       add_srs_wkt (p, 1,
  1306   1306           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  1307   1307       add_srs_wkt (p, 2,
  1308         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         1308  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  1309   1309       add_srs_wkt (p, 3,
  1310   1310           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  1311   1311       add_srs_wkt (p, 4,
  1312   1312           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1313   1313       add_srs_wkt (p, 5,
  1314   1314           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1315   1315       add_srs_wkt (p, 6,
................................................................................
  1342   1342       add_proj4text (p, 2,
  1343   1343           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1344   1344       add_srs_wkt (p, 0,
  1345   1345           "PROJCS[\"NAD27 / Oklahoma South\",GEOGCS[\"NAD27\",DATUM");
  1346   1346       add_srs_wkt (p, 1,
  1347   1347           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  1348   1348       add_srs_wkt (p, 2,
  1349         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         1349  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  1350   1350       add_srs_wkt (p, 3,
  1351   1351           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  1352   1352       add_srs_wkt (p, 4,
  1353   1353           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  1354   1354       add_srs_wkt (p, 5,
  1355   1355           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  1356   1356       add_srs_wkt (p, 6,
................................................................................
  1385   1385       add_proj4text (p, 2,
  1386   1386           "0 +datum=NAD27 +units=us-ft +no_defs");
  1387   1387       add_srs_wkt (p, 0,
  1388   1388           "PROJCS[\"NAD27 / Oregon North\",GEOGCS[\"NAD27\",DATUM[\"");
  1389   1389       add_srs_wkt (p, 1,
  1390   1390           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1391   1391       add_srs_wkt (p, 2,
  1392         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1392  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1393   1393       add_srs_wkt (p, 3,
  1394   1394           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1395   1395       add_srs_wkt (p, 4,
  1396   1396           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1397   1397       add_srs_wkt (p, 5,
  1398   1398           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1399   1399       add_srs_wkt (p, 6,
................................................................................
  1426   1426       add_proj4text (p, 2,
  1427   1427           "0 +datum=NAD27 +units=us-ft +no_defs");
  1428   1428       add_srs_wkt (p, 0,
  1429   1429           "PROJCS[\"NAD27 / Oregon South\",GEOGCS[\"NAD27\",DATUM[\"");
  1430   1430       add_srs_wkt (p, 1,
  1431   1431           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1432   1432       add_srs_wkt (p, 2,
  1433         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1433  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1434   1434       add_srs_wkt (p, 3,
  1435   1435           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1436   1436       add_srs_wkt (p, 4,
  1437   1437           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1438   1438       add_srs_wkt (p, 5,
  1439   1439           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1440   1440       add_srs_wkt (p, 6,
................................................................................
  1467   1467       add_proj4text (p, 2,
  1468   1468           "_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1469   1469       add_srs_wkt (p, 0,
  1470   1470           "PROJCS[\"NAD27 / Pennsylvania North\",GEOGCS[\"NAD27\",D");
  1471   1471       add_srs_wkt (p, 1,
  1472   1472           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1473   1473       add_srs_wkt (p, 2,
  1474         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1474  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1475   1475       add_srs_wkt (p, 3,
  1476   1476           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1477   1477       add_srs_wkt (p, 4,
  1478   1478           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1479   1479       add_srs_wkt (p, 5,
  1480   1480           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1481   1481       add_srs_wkt (p, 6,
................................................................................
  1508   1508       add_proj4text (p, 2,
  1509   1509           "0=0 +datum=NAD27 +units=us-ft +no_defs");
  1510   1510       add_srs_wkt (p, 0,
  1511   1511           "PROJCS[\"NAD27 / Pennsylvania South (deprecated)\",GEOGC");
  1512   1512       add_srs_wkt (p, 1,
  1513   1513           "S[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID");
  1514   1514       add_srs_wkt (p, 2,
  1515         -        "[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"");
         1515  +        "[\"Clarke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"");
  1516   1516       add_srs_wkt (p, 3,
  1517   1517           "EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"");
  1518   1518       add_srs_wkt (p, 4,
  1519   1519           "Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degre");
  1520   1520       add_srs_wkt (p, 5,
  1521   1521           "e\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXI");
  1522   1522       add_srs_wkt (p, 6,
................................................................................
  1551   1551       add_proj4text (p, 2,
  1552   1552           "=us-ft +no_defs");
  1553   1553       add_srs_wkt (p, 0,
  1554   1554           "PROJCS[\"NAD27 / Rhode Island\",GEOGCS[\"NAD27\",DATUM[\"");
  1555   1555       add_srs_wkt (p, 1,
  1556   1556           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1557   1557       add_srs_wkt (p, 2,
  1558         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1558  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1559   1559       add_srs_wkt (p, 3,
  1560   1560           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1561   1561       add_srs_wkt (p, 4,
  1562   1562           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1563   1563       add_srs_wkt (p, 5,
  1564   1564           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1565   1565       add_srs_wkt (p, 6,
................................................................................
  1590   1590       add_proj4text (p, 2,
  1591   1591           "datum=NAD27 +units=us-ft +no_defs");
  1592   1592       add_srs_wkt (p, 0,
  1593   1593           "PROJCS[\"NAD27 / South Carolina North\",GEOGCS[\"NAD27\"");
  1594   1594       add_srs_wkt (p, 1,
  1595   1595           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  1596   1596       add_srs_wkt (p, 2,
  1597         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         1597  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  1598   1598       add_srs_wkt (p, 3,
  1599   1599           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  1600   1600       add_srs_wkt (p, 4,
  1601   1601           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1602   1602       add_srs_wkt (p, 5,
  1603   1603           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1604   1604       add_srs_wkt (p, 6,
................................................................................
  1631   1631       add_proj4text (p, 2,
  1632   1632           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1633   1633       add_srs_wkt (p, 0,
  1634   1634           "PROJCS[\"NAD27 / South Carolina South\",GEOGCS[\"NAD27\"");
  1635   1635       add_srs_wkt (p, 1,
  1636   1636           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  1637   1637       add_srs_wkt (p, 2,
  1638         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         1638  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  1639   1639       add_srs_wkt (p, 3,
  1640   1640           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  1641   1641       add_srs_wkt (p, 4,
  1642   1642           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  1643   1643       add_srs_wkt (p, 5,
  1644   1644           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  1645   1645       add_srs_wkt (p, 6,
................................................................................
  1674   1674       add_proj4text (p, 2,
  1675   1675           "2024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1676   1676       add_srs_wkt (p, 0,
  1677   1677           "PROJCS[\"NAD27 / South Dakota North\",GEOGCS[\"NAD27\",D");
  1678   1678       add_srs_wkt (p, 1,
  1679   1679           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1680   1680       add_srs_wkt (p, 2,
  1681         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1681  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1682   1682       add_srs_wkt (p, 3,
  1683   1683           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1684   1684       add_srs_wkt (p, 4,
  1685   1685           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1686   1686       add_srs_wkt (p, 5,
  1687   1687           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1688   1688       add_srs_wkt (p, 6,
................................................................................
  1717   1717       add_proj4text (p, 2,
  1718   1718           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1719   1719       add_srs_wkt (p, 0,
  1720   1720           "PROJCS[\"NAD27 / South Dakota South\",GEOGCS[\"NAD27\",D");
  1721   1721       add_srs_wkt (p, 1,
  1722   1722           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  1723   1723       add_srs_wkt (p, 2,
  1724         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         1724  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  1725   1725       add_srs_wkt (p, 3,
  1726   1726           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1727   1727       add_srs_wkt (p, 4,
  1728   1728           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1729   1729       add_srs_wkt (p, 5,
  1730   1730           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1731   1731       add_srs_wkt (p, 6,
................................................................................
  1760   1760       add_proj4text (p, 2,
  1761   1761           "0 +datum=NAD27 +units=us-ft +no_defs");
  1762   1762       add_srs_wkt (p, 0,
  1763   1763           "PROJCS[\"NAD27 / Tennessee (deprecated)\",GEOGCS[\"NAD27");
  1764   1764       add_srs_wkt (p, 1,
  1765   1765           "\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke");
  1766   1766       add_srs_wkt (p, 2,
  1767         -        " 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"");
         1767  +        " 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"");
  1768   1768       add_srs_wkt (p, 3,
  1769   1769           "7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwic");
  1770   1770       add_srs_wkt (p, 4,
  1771   1771           "h\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01");
  1772   1772       add_srs_wkt (p, 5,
  1773   1773           "74532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Lati");
  1774   1774       add_srs_wkt (p, 6,
................................................................................
  1801   1801       add_proj4text (p, 2,
  1802   1802           "27 +units=us-ft +no_defs");
  1803   1803       add_srs_wkt (p, 0,
  1804   1804           "PROJCS[\"NAD27 / Texas North\",GEOGCS[\"NAD27\",DATUM[\"");
  1805   1805       add_srs_wkt (p, 1,
  1806   1806           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1807   1807       add_srs_wkt (p, 2,
  1808         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1808  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1809   1809       add_srs_wkt (p, 3,
  1810   1810           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1811   1811       add_srs_wkt (p, 4,
  1812   1812           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1813   1813       add_srs_wkt (p, 5,
  1814   1814           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1815   1815       add_srs_wkt (p, 6,
................................................................................
  1842   1842       add_proj4text (p, 2,
  1843   1843           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1844   1844       add_srs_wkt (p, 0,
  1845   1845           "PROJCS[\"NAD27 / Texas North Central\",GEOGCS[\"NAD27\",");
  1846   1846       add_srs_wkt (p, 1,
  1847   1847           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
  1848   1848       add_srs_wkt (p, 2,
  1849         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
         1849  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
  1850   1850       add_srs_wkt (p, 3,
  1851   1851           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1852   1852       add_srs_wkt (p, 4,
  1853   1853           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1854   1854       add_srs_wkt (p, 5,
  1855   1855           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1856   1856       add_srs_wkt (p, 6,
................................................................................
  1887   1887       add_proj4text (p, 3,
  1888   1888           "no_defs");
  1889   1889       add_srs_wkt (p, 0,
  1890   1890           "PROJCS[\"NAD27 / Texas Central\",GEOGCS[\"NAD27\",DATUM[");
  1891   1891       add_srs_wkt (p, 1,
  1892   1892           "\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6");
  1893   1893       add_srs_wkt (p, 2,
  1894         -        "378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]]");
         1894  +        "378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]]");
  1895   1895       add_srs_wkt (p, 3,
  1896   1896           ",AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AU");
  1897   1897       add_srs_wkt (p, 4,
  1898   1898           "THORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925");
  1899   1899       add_srs_wkt (p, 5,
  1900   1900           "199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",N");
  1901   1901       add_srs_wkt (p, 6,
................................................................................
  1930   1930       add_proj4text (p, 2,
  1931   1931           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1932   1932       add_srs_wkt (p, 0,
  1933   1933           "PROJCS[\"NAD27 / Texas South Central\",GEOGCS[\"NAD27\",");
  1934   1934       add_srs_wkt (p, 1,
  1935   1935           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
  1936   1936       add_srs_wkt (p, 2,
  1937         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
         1937  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
  1938   1938       add_srs_wkt (p, 3,
  1939   1939           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  1940   1940       add_srs_wkt (p, 4,
  1941   1941           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  1942   1942       add_srs_wkt (p, 5,
  1943   1943           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  1944   1944       add_srs_wkt (p, 6,
................................................................................
  1973   1973       add_proj4text (p, 2,
  1974   1974           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  1975   1975       add_srs_wkt (p, 0,
  1976   1976           "PROJCS[\"NAD27 / Texas South\",GEOGCS[\"NAD27\",DATUM[\"");
  1977   1977       add_srs_wkt (p, 1,
  1978   1978           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  1979   1979       add_srs_wkt (p, 2,
  1980         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         1980  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  1981   1981       add_srs_wkt (p, 3,
  1982   1982           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  1983   1983       add_srs_wkt (p, 4,
  1984   1984           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  1985   1985       add_srs_wkt (p, 5,
  1986   1986           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  1987   1987       add_srs_wkt (p, 6,
................................................................................
  2016   2016       add_proj4text (p, 2,
  2017   2017           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2018   2018       add_srs_wkt (p, 0,
  2019   2019           "PROJCS[\"NAD27 / Utah North\",GEOGCS[\"NAD27\",DATUM[\"N");
  2020   2020       add_srs_wkt (p, 1,
  2021   2021           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  2022   2022       add_srs_wkt (p, 2,
  2023         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         2023  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  2024   2024       add_srs_wkt (p, 3,
  2025   2025           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  2026   2026       add_srs_wkt (p, 4,
  2027   2027           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  2028   2028       add_srs_wkt (p, 5,
  2029   2029           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  2030   2030       add_srs_wkt (p, 6,
................................................................................
  2059   2059       add_proj4text (p, 2,
  2060   2060           "_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2061   2061       add_srs_wkt (p, 0,
  2062   2062           "PROJCS[\"NAD27 / Utah Central\",GEOGCS[\"NAD27\",DATUM[\"");
  2063   2063       add_srs_wkt (p, 1,
  2064   2064           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2065   2065       add_srs_wkt (p, 2,
  2066         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2066  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2067   2067       add_srs_wkt (p, 3,
  2068   2068           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2069   2069       add_srs_wkt (p, 4,
  2070   2070           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2071   2071       add_srs_wkt (p, 5,
  2072   2072           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2073   2073       add_srs_wkt (p, 6,
................................................................................
  2100   2100       add_proj4text (p, 2,
  2101   2101           "_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2102   2102       add_srs_wkt (p, 0,
  2103   2103           "PROJCS[\"NAD27 / Utah South\",GEOGCS[\"NAD27\",DATUM[\"N");
  2104   2104       add_srs_wkt (p, 1,
  2105   2105           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  2106   2106       add_srs_wkt (p, 2,
  2107         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         2107  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  2108   2108       add_srs_wkt (p, 3,
  2109   2109           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  2110   2110       add_srs_wkt (p, 4,
  2111   2111           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  2112   2112       add_srs_wkt (p, 5,
  2113   2113           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  2114   2114       add_srs_wkt (p, 6,
................................................................................
  2141   2141       add_proj4text (p, 2,
  2142   2142           "defs");
  2143   2143       add_srs_wkt (p, 0,
  2144   2144           "PROJCS[\"NAD27 / Vermont\",GEOGCS[\"NAD27\",DATUM[\"Nort");
  2145   2145       add_srs_wkt (p, 1,
  2146   2146           "h_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378206");
  2147   2147       add_srs_wkt (p, 2,
  2148         -        ".4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTHO");
         2148  +        ".4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AUTHO");
  2149   2149       add_srs_wkt (p, 3,
  2150   2150           "RITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHORIT");
  2151   2151       add_srs_wkt (p, 4,
  2152   2152           "Y[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433");
  2153   2153       add_srs_wkt (p, 5,
  2154   2154           ",AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],");
  2155   2155       add_srs_wkt (p, 6,
................................................................................
  2180   2180       add_proj4text (p, 2,
  2181   2181           "=0 +datum=NAD27 +units=us-ft +no_defs");
  2182   2182       add_srs_wkt (p, 0,
  2183   2183           "PROJCS[\"NAD27 / Virginia North\",GEOGCS[\"NAD27\",DATUM");
  2184   2184       add_srs_wkt (p, 1,
  2185   2185           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2186   2186       add_srs_wkt (p, 2,
  2187         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2187  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2188   2188       add_srs_wkt (p, 3,
  2189   2189           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2190   2190       add_srs_wkt (p, 4,
  2191   2191           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2192   2192       add_srs_wkt (p, 5,
  2193   2193           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2194   2194       add_srs_wkt (p, 6,
................................................................................
  2221   2221       add_proj4text (p, 2,
  2222   2222           "92024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2223   2223       add_srs_wkt (p, 0,
  2224   2224           "PROJCS[\"NAD27 / Virginia South\",GEOGCS[\"NAD27\",DATUM");
  2225   2225       add_srs_wkt (p, 1,
  2226   2226           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2227   2227       add_srs_wkt (p, 2,
  2228         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2228  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2229   2229       add_srs_wkt (p, 3,
  2230   2230           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2231   2231       add_srs_wkt (p, 4,
  2232   2232           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2233   2233       add_srs_wkt (p, 5,
  2234   2234           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2235   2235       add_srs_wkt (p, 6,
................................................................................
  2264   2264       add_proj4text (p, 2,
  2265   2265           " +datum=NAD27 +units=us-ft +no_defs");
  2266   2266       add_srs_wkt (p, 0,
  2267   2267           "PROJCS[\"NAD27 / Washington North\",GEOGCS[\"NAD27\",DAT");
  2268   2268       add_srs_wkt (p, 1,
  2269   2269           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  2270   2270       add_srs_wkt (p, 2,
  2271         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         2271  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  2272   2272       add_srs_wkt (p, 3,
  2273   2273           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  2274   2274       add_srs_wkt (p, 4,
  2275   2275           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2276   2276       add_srs_wkt (p, 5,
  2277   2277           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2278   2278       add_srs_wkt (p, 6,
................................................................................
  2305   2305       add_proj4text (p, 2,
  2306   2306           "192024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2307   2307       add_srs_wkt (p, 0,
  2308   2308           "PROJCS[\"NAD27 / Washington South\",GEOGCS[\"NAD27\",DAT");
  2309   2309       add_srs_wkt (p, 1,
  2310   2310           "UM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  2311   2311       add_srs_wkt (p, 2,
  2312         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         2312  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  2313   2313       add_srs_wkt (p, 3,
  2314   2314           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  2315   2315       add_srs_wkt (p, 4,
  2316   2316           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2317   2317       add_srs_wkt (p, 5,
  2318   2318           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2319   2319       add_srs_wkt (p, 6,
................................................................................
  2348   2348       add_proj4text (p, 2,
  2349   2349           "t +no_defs");
  2350   2350       add_srs_wkt (p, 0,
  2351   2351           "PROJCS[\"NAD27 / West Virginia North\",GEOGCS[\"NAD27\",");
  2352   2352       add_srs_wkt (p, 1,
  2353   2353           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
  2354   2354       add_srs_wkt (p, 2,
  2355         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
         2355  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
  2356   2356       add_srs_wkt (p, 3,
  2357   2357           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2358   2358       add_srs_wkt (p, 4,
  2359   2359           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2360   2360       add_srs_wkt (p, 5,
  2361   2361           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2362   2362       add_srs_wkt (p, 6,
................................................................................
  2389   2389       add_proj4text (p, 2,
  2390   2390           "datum=NAD27 +units=us-ft +no_defs");
  2391   2391       add_srs_wkt (p, 0,
  2392   2392           "PROJCS[\"NAD27 / West Virginia South\",GEOGCS[\"NAD27\",");
  2393   2393       add_srs_wkt (p, 1,
  2394   2394           "DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 18");
  2395   2395       add_srs_wkt (p, 2,
  2396         -        "66\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"70");
         2396  +        "66\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"70");
  2397   2397       add_srs_wkt (p, 3,
  2398   2398           "08\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  2399   2399       add_srs_wkt (p, 4,
  2400   2400           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  2401   2401       add_srs_wkt (p, 5,
  2402   2402           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  2403   2403       add_srs_wkt (p, 6,
................................................................................
  2430   2430       add_proj4text (p, 2,
  2431   2431           "024384 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2432   2432       add_srs_wkt (p, 0,
  2433   2433           "PROJCS[\"NAD27 / Wisconsin North\",GEOGCS[\"NAD27\",DATU");
  2434   2434       add_srs_wkt (p, 1,
  2435   2435           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  2436   2436       add_srs_wkt (p, 2,
  2437         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         2437  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  2438   2438       add_srs_wkt (p, 3,
  2439   2439           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  2440   2440       add_srs_wkt (p, 4,
  2441   2441           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2442   2442       add_srs_wkt (p, 5,
  2443   2443           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2444   2444       add_srs_wkt (p, 6,
................................................................................
  2473   2473       add_proj4text (p, 2,
  2474   2474           "7 +units=us-ft +no_defs");
  2475   2475       add_srs_wkt (p, 0,
  2476   2476           "PROJCS[\"NAD27 / Wisconsin Central\",GEOGCS[\"NAD27\",DA");
  2477   2477       add_srs_wkt (p, 1,
  2478   2478           "TUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866");
  2479   2479       add_srs_wkt (p, 2,
  2480         -        "\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008");
         2480  +        "\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008");
  2481   2481       add_srs_wkt (p, 3,
  2482   2482           "\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",");
  2483   2483       add_srs_wkt (p, 4,
  2484   2484           "0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453");
  2485   2485       add_srs_wkt (p, 5,
  2486   2486           "2925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude");
  2487   2487       add_srs_wkt (p, 6,
................................................................................
  2514   2514       add_proj4text (p, 2,
  2515   2515           "datum=NAD27 +units=us-ft +no_defs");
  2516   2516       add_srs_wkt (p, 0,
  2517   2517           "PROJCS[\"NAD27 / Wisconsin South\",GEOGCS[\"NAD27\",DATU");
  2518   2518       add_srs_wkt (p, 1,
  2519   2519           "M[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\"");
  2520   2520       add_srs_wkt (p, 2,
  2521         -        ",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"");
         2521  +        ",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"");
  2522   2522       add_srs_wkt (p, 3,
  2523   2523           "]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,");
  2524   2524       add_srs_wkt (p, 4,
  2525   2525           "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2526   2526       add_srs_wkt (p, 5,
  2527   2527           "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2528   2528       add_srs_wkt (p, 6,
................................................................................
  2555   2555       add_proj4text (p, 2,
  2556   2556           "um=NAD27 +units=us-ft +no_defs");
  2557   2557       add_srs_wkt (p, 0,
  2558   2558           "PROJCS[\"NAD27 / Wyoming East\",GEOGCS[\"NAD27\",DATUM[\"");
  2559   2559       add_srs_wkt (p, 1,
  2560   2560           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2561   2561       add_srs_wkt (p, 2,
  2562         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2562  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2563   2563       add_srs_wkt (p, 3,
  2564   2564           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2565   2565       add_srs_wkt (p, 4,
  2566   2566           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2567   2567       add_srs_wkt (p, 5,
  2568   2568           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2569   2569       add_srs_wkt (p, 6,
................................................................................
  2594   2594       add_proj4text (p, 2,
  2595   2595           "um=NAD27 +units=us-ft +no_defs");
  2596   2596       add_srs_wkt (p, 0,
  2597   2597           "PROJCS[\"NAD27 / Wyoming East Central\",GEOGCS[\"NAD27\"");
  2598   2598       add_srs_wkt (p, 1,
  2599   2599           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  2600   2600       add_srs_wkt (p, 2,
  2601         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         2601  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  2602   2602       add_srs_wkt (p, 3,
  2603   2603           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  2604   2604       add_srs_wkt (p, 4,
  2605   2605           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  2606   2606       add_srs_wkt (p, 5,
  2607   2607           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  2608   2608       add_srs_wkt (p, 6,
................................................................................
  2635   2635       add_proj4text (p, 2,
  2636   2636           "nits=us-ft +no_defs");
  2637   2637       add_srs_wkt (p, 0,
  2638   2638           "PROJCS[\"NAD27 / Wyoming West Central\",GEOGCS[\"NAD27\"");
  2639   2639       add_srs_wkt (p, 1,
  2640   2640           ",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1");
  2641   2641       add_srs_wkt (p, 2,
  2642         -        "866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7");
         2642  +        "866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7");
  2643   2643       add_srs_wkt (p, 3,
  2644   2644           "008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich");
  2645   2645       add_srs_wkt (p, 4,
  2646   2646           "\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017");
  2647   2647       add_srs_wkt (p, 5,
  2648   2648           "4532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latit");
  2649   2649       add_srs_wkt (p, 6,
................................................................................
  2674   2674       add_proj4text (p, 2,
  2675   2675           "um=NAD27 +units=us-ft +no_defs");
  2676   2676       add_srs_wkt (p, 0,
  2677   2677           "PROJCS[\"NAD27 / Wyoming West\",GEOGCS[\"NAD27\",DATUM[\"");
  2678   2678       add_srs_wkt (p, 1,
  2679   2679           "North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",637");
  2680   2680       add_srs_wkt (p, 2,
  2681         -        "8206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],A");
         2681  +        "8206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],A");
  2682   2682       add_srs_wkt (p, 3,
  2683   2683           "UTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTH");
  2684   2684       add_srs_wkt (p, 4,
  2685   2685           "ORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292519");
  2686   2686       add_srs_wkt (p, 5,
  2687   2687           "9433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NOR");
  2688   2688       add_srs_wkt (p, 6,
................................................................................
  2713   2713       add_proj4text (p, 2,
  2714   2714           "0 +y_0=292209.579 +datum=NAD27 +units=m +no_defs");
  2715   2715       add_srs_wkt (p, 0,
  2716   2716           "PROJCS[\"NAD27 / Guatemala Norte (deprecated)\",GEOGCS[\"");
  2717   2717       add_srs_wkt (p, 1,
  2718   2718           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  2719   2719       add_srs_wkt (p, 2,
  2720         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         2720  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  2721   2721       add_srs_wkt (p, 3,
  2722   2722           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  2723   2723       add_srs_wkt (p, 4,
  2724   2724           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  2725   2725       add_srs_wkt (p, 5,
  2726   2726           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  2727   2727       add_srs_wkt (p, 6,
................................................................................
  2752   2752       add_proj4text (p, 2,
  2753   2753           "AD27 +units=m +no_defs");
  2754   2754       add_srs_wkt (p, 0,
  2755   2755           "PROJCS[\"NAD27 / Guatemala Sur (deprecated)\",GEOGCS[\"N");
  2756   2756       add_srs_wkt (p, 1,
  2757   2757           "AD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Cl");
  2758   2758       add_srs_wkt (p, 2,
  2759         -        "arke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG");
         2759  +        "arke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG");
  2760   2760       add_srs_wkt (p, 3,
  2761   2761           "\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gre");
  2762   2762       add_srs_wkt (p, 4,
  2763   2763           "enwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  2764   2764       add_srs_wkt (p, 5,
  2765   2765           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  2766   2766       add_srs_wkt (p, 6,
................................................................................
  2789   2789       add_proj4text (p, 1,
  2790   2790           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2791   2791       add_srs_wkt (p, 0,
  2792   2792           "PROJCS[\"NAD27 / BLM 14N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  2793   2793       add_srs_wkt (p, 1,
  2794   2794           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2795   2795       add_srs_wkt (p, 2,
  2796         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2796  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2797   2797       add_srs_wkt (p, 3,
  2798   2798           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2799   2799       add_srs_wkt (p, 4,
  2800   2800           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2801   2801       add_srs_wkt (p, 5,
  2802   2802           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2803   2803       add_srs_wkt (p, 6,
................................................................................
  2826   2826       add_proj4text (p, 1,
  2827   2827           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2828   2828       add_srs_wkt (p, 0,
  2829   2829           "PROJCS[\"NAD27 / BLM 15N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  2830   2830       add_srs_wkt (p, 1,
  2831   2831           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2832   2832       add_srs_wkt (p, 2,
  2833         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2833  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2834   2834       add_srs_wkt (p, 3,
  2835   2835           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2836   2836       add_srs_wkt (p, 4,
  2837   2837           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2838   2838       add_srs_wkt (p, 5,
  2839   2839           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2840   2840       add_srs_wkt (p, 6,
................................................................................
  2863   2863       add_proj4text (p, 1,
  2864   2864           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2865   2865       add_srs_wkt (p, 0,
  2866   2866           "PROJCS[\"NAD27 / BLM 16N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  2867   2867       add_srs_wkt (p, 1,
  2868   2868           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2869   2869       add_srs_wkt (p, 2,
  2870         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2870  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2871   2871       add_srs_wkt (p, 3,
  2872   2872           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2873   2873       add_srs_wkt (p, 4,
  2874   2874           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2875   2875       add_srs_wkt (p, 5,
  2876   2876           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2877   2877       add_srs_wkt (p, 6,
................................................................................
  2900   2900       add_proj4text (p, 1,
  2901   2901           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2902   2902       add_srs_wkt (p, 0,
  2903   2903           "PROJCS[\"NAD27 / BLM 17N (ftUS)\",GEOGCS[\"NAD27\",DATUM");
  2904   2904       add_srs_wkt (p, 1,
  2905   2905           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  2906   2906       add_srs_wkt (p, 2,
  2907         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         2907  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  2908   2908       add_srs_wkt (p, 3,
  2909   2909           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  2910   2910       add_srs_wkt (p, 4,
  2911   2911           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  2912   2912       add_srs_wkt (p, 5,
  2913   2913           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  2914   2914       add_srs_wkt (p, 6,
................................................................................
  2937   2937       add_proj4text (p, 1,
  2938   2938           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2939   2939       add_srs_wkt (p, 0,
  2940   2940           "PROJCS[\"NAD27 / BLM 14N (feet) (deprecated)\",GEOGCS[\"");
  2941   2941       add_srs_wkt (p, 1,
  2942   2942           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  2943   2943       add_srs_wkt (p, 2,
  2944         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         2944  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  2945   2945       add_srs_wkt (p, 3,
  2946   2946           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  2947   2947       add_srs_wkt (p, 4,
  2948   2948           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  2949   2949       add_srs_wkt (p, 5,
  2950   2950           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  2951   2951       add_srs_wkt (p, 6,
................................................................................
  2974   2974       add_proj4text (p, 1,
  2975   2975           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  2976   2976       add_srs_wkt (p, 0,
  2977   2977           "PROJCS[\"NAD27 / BLM 15N (feet) (deprecated)\",GEOGCS[\"");
  2978   2978       add_srs_wkt (p, 1,
  2979   2979           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  2980   2980       add_srs_wkt (p, 2,
  2981         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         2981  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  2982   2982       add_srs_wkt (p, 3,
  2983   2983           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  2984   2984       add_srs_wkt (p, 4,
  2985   2985           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  2986   2986       add_srs_wkt (p, 5,
  2987   2987           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  2988   2988       add_srs_wkt (p, 6,
................................................................................
  3011   3011       add_proj4text (p, 1,
  3012   3012           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  3013   3013       add_srs_wkt (p, 0,
  3014   3014           "PROJCS[\"NAD27 / BLM 16N (feet) (deprecated)\",GEOGCS[\"");
  3015   3015       add_srs_wkt (p, 1,
  3016   3016           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  3017   3017       add_srs_wkt (p, 2,
  3018         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         3018  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  3019   3019       add_srs_wkt (p, 3,
  3020   3020           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  3021   3021       add_srs_wkt (p, 4,
  3022   3022           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  3023   3023       add_srs_wkt (p, 5,
  3024   3024           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  3025   3025       add_srs_wkt (p, 6,
................................................................................
  3048   3048       add_proj4text (p, 1,
  3049   3049           "1016002 +y_0=0 +datum=NAD27 +units=us-ft +no_defs");
  3050   3050       add_srs_wkt (p, 0,
  3051   3051           "PROJCS[\"NAD27 / BLM 17N (feet) (deprecated)\",GEOGCS[\"");
  3052   3052       add_srs_wkt (p, 1,
  3053   3053           "NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"C");
  3054   3054       add_srs_wkt (p, 2,
  3055         -        "larke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPS");
         3055  +        "larke 1866\",6378206.4,294.9786982139006,AUTHORITY[\"EPS");
  3056   3056       add_srs_wkt (p, 3,
  3057   3057           "G\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Gr");
  3058   3058       add_srs_wkt (p, 4,
  3059   3059           "eenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\"");
  3060   3060       add_srs_wkt (p, 5,
  3061   3061           ",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"");
  3062   3062       add_srs_wkt (p, 6,
................................................................................
  3085   3085       add_proj4text (p, 1,
  3086   3086           "_0=0 +datum=NAD27 +units=m +no_defs");
  3087   3087       add_srs_wkt (p, 0,
  3088   3088           "PROJCS[\"NAD27 / MTM zone 1\",GEOGCS[\"NAD27\",DATUM[\"N");
  3089   3089       add_srs_wkt (p, 1,
  3090   3090           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3091   3091       add_srs_wkt (p, 2,
  3092         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3092  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3093   3093       add_srs_wkt (p, 3,
  3094   3094           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3095   3095       add_srs_wkt (p, 4,
  3096   3096           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3097   3097       add_srs_wkt (p, 5,
  3098   3098           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3099   3099       add_srs_wkt (p, 6,
................................................................................
  3122   3122       add_proj4text (p, 1,
  3123   3123           "_0=0 +datum=NAD27 +units=m +no_defs");
  3124   3124       add_srs_wkt (p, 0,
  3125   3125           "PROJCS[\"NAD27 / MTM zone 2\",GEOGCS[\"NAD27\",DATUM[\"N");
  3126   3126       add_srs_wkt (p, 1,
  3127   3127           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3128   3128       add_srs_wkt (p, 2,
  3129         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3129  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3130   3130       add_srs_wkt (p, 3,
  3131   3131           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3132   3132       add_srs_wkt (p, 4,
  3133   3133           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3134   3134       add_srs_wkt (p, 5,
  3135   3135           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3136   3136       add_srs_wkt (p, 6,
................................................................................
  3159   3159       add_proj4text (p, 1,
  3160   3160           "+y_0=0 +datum=NAD27 +units=m +no_defs");
  3161   3161       add_srs_wkt (p, 0,
  3162   3162           "PROJCS[\"NAD27 / MTM zone 3\",GEOGCS[\"NAD27\",DATUM[\"N");
  3163   3163       add_srs_wkt (p, 1,
  3164   3164           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3165   3165       add_srs_wkt (p, 2,
  3166         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3166  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3167   3167       add_srs_wkt (p, 3,
  3168   3168           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3169   3169       add_srs_wkt (p, 4,
  3170   3170           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3171   3171       add_srs_wkt (p, 5,
  3172   3172           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3173   3173       add_srs_wkt (p, 6,
................................................................................
  3196   3196       add_proj4text (p, 1,
  3197   3197           "+y_0=0 +datum=NAD27 +units=m +no_defs");
  3198   3198       add_srs_wkt (p, 0,
  3199   3199           "PROJCS[\"NAD27 / MTM zone 4\",GEOGCS[\"NAD27\",DATUM[\"N");
  3200   3200       add_srs_wkt (p, 1,
  3201   3201           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3202   3202       add_srs_wkt (p, 2,
  3203         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3203  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3204   3204       add_srs_wkt (p, 3,
  3205   3205           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3206   3206       add_srs_wkt (p, 4,
  3207   3207           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3208   3208       add_srs_wkt (p, 5,
  3209   3209           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3210   3210       add_srs_wkt (p, 6,
................................................................................
  3233   3233       add_proj4text (p, 1,
  3234   3234           "+y_0=0 +datum=NAD27 +units=m +no_defs");
  3235   3235       add_srs_wkt (p, 0,
  3236   3236           "PROJCS[\"NAD27 / MTM zone 5\",GEOGCS[\"NAD27\",DATUM[\"N");
  3237   3237       add_srs_wkt (p, 1,
  3238   3238           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3239   3239       add_srs_wkt (p, 2,
  3240         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3240  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3241   3241       add_srs_wkt (p, 3,
  3242   3242           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3243   3243       add_srs_wkt (p, 4,
  3244   3244           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3245   3245       add_srs_wkt (p, 5,
  3246   3246           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3247   3247       add_srs_wkt (p, 6,
................................................................................
  3270   3270       add_proj4text (p, 1,
  3271   3271           "+y_0=0 +datum=NAD27 +units=m +no_defs");
  3272   3272       add_srs_wkt (p, 0,
  3273   3273           "PROJCS[\"NAD27 / MTM zone 6\",GEOGCS[\"NAD27\",DATUM[\"N");
  3274   3274       add_srs_wkt (p, 1,
  3275   3275           "orth_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378");
  3276   3276       add_srs_wkt (p, 2,
  3277         -        "206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AU");
         3277  +        "206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]],AU");
  3278   3278       add_srs_wkt (p, 3,
  3279   3279           "THORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,AUTHO");
  3280   3280       add_srs_wkt (p, 4,
  3281   3281           "RITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199");
  3282   3282       add_srs_wkt (p, 5,
  3283   3283           "433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORT");
  3284   3284       add_srs_wkt (p, 6,
................................................................................
  3307   3307       add_proj4text (p, 1,
  3308   3308           "0=0 +y_0=0 +datum=NAD27 +units=m +no_defs");
  3309   3309       add_srs_wkt (p, 0,
  3310   3310           "PROJCS[\"NAD27 / Quebec Lambert\",GEOGCS[\"NAD27\",DATUM");
  3311   3311       add_srs_wkt (p, 1,
  3312   3312           "[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",");
  3313   3313       add_srs_wkt (p, 2,
  3314         -        "6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]");
         3314  +        "6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"7008\"]");
  3315   3315       add_srs_wkt (p, 3,
  3316   3316           "],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0,A");
  3317   3317       add_srs_wkt (p, 4,
  3318   3318           "UTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.017453292");
  3319   3319       add_srs_wkt (p, 5,
  3320   3320           "5199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",");
  3321   3321       add_srs_wkt (p, 6,
................................................................................
  3348   3348       add_proj4text (p, 3,
  3349   3349           "no_defs");
  3350   3350       add_srs_wkt (p, 0,
  3351   3351           "PROJCS[\"NAD27 / Louisiana Offshore\",GEOGCS[\"NAD27\",D");
  3352   3352       add_srs_wkt (p, 1,
  3353   3353           "ATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 186");
  3354   3354       add_srs_wkt (p, 2,
  3355         -        "6\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"700");
         3355  +        "6\",6378206.4,294.9786982139006,AUTHORITY[\"EPSG\",\"700");
  3356   3356       add_srs_wkt (p, 3,
  3357   3357           "8\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\"");
  3358   3358       add_srs_wkt (p, 4,
  3359   3359           ",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745");
  3360   3360       add_srs_wkt (p, 5,
  3361   3361           "32925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitud");
  3362   3362       add_srs_wkt (p, 6,

Changes to src/srsinit/epsg_inlined_44.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_45.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_46.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_extra.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_prussian.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   

Changes to src/srsinit/epsg_inlined_wgs84_00.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    39     39   decision by deleting the provisions above and replace them with the notice
    40     40   and other provisions required by the GPL or the LGPL. If you do not delete
    41     41   the provisions above, a recipient may use your version of this file under
    42     42   the terms of any one of the MPL, the GPL or the LGPL.
    43     43   
    44     44   */
    45     45   
    46         -#include "config.h"
    47         -
    48     46   #include <spatialite_private.h>
    49     47   
    50     48   SPATIALITE_PRIVATE void
    51     49   initialize_epsg_wgs84_00 (int filter, struct epsg_defs **first, struct epsg_defs **last)
    52     50   {
    53     51   /* initializing the EPSG defs list [WGS84] */
    54     52       struct epsg_defs *p;
................................................................................
  2115   2113           "0],PARAMETER[\"central_meridian\",0],PARAMETER[\"false_e");
  2116   2114       add_srs_wkt (p, 9,
  2117   2115           "asting\",0],PARAMETER[\"false_northing\",0],UNIT[\"metre");
  2118   2116       add_srs_wkt (p, 10,
  2119   2117           "\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[\"X\",EAST],AXIS");
  2120   2118       add_srs_wkt (p, 11,
  2121   2119           "[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"32662\"]]");
  2122         -    p = add_epsg_def_ex (filter, first, last, 32663, "epsg", 32663,
  2123         -        "WGS 84 / World Equidistant Cylindrical (deprecated)", 0, 0,
  2124         -        "WGS 84", "Greenwich",
  2125         -        "WGS_1984", "Equirectangular", "metre",
  2126         -        "X", "East", "Y", "North");
  2127         -    add_proj4text (p, 0,
  2128         -        "+proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +dat");
  2129         -    add_proj4text (p, 1,
  2130         -        "um=WGS84 +units=m +no_defs");
  2131         -    add_srs_wkt (p, 0,
  2132         -        "PROJCS[\"WGS 84 / World Equidistant Cylindrical (depreca");
  2133         -    add_srs_wkt (p, 1,
  2134         -        "ted)\",GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"W");
  2135         -    add_srs_wkt (p, 2,
  2136         -        "GS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"");
  2137         -    add_srs_wkt (p, 3,
  2138         -        "]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,");
  2139         -    add_srs_wkt (p, 4,
  2140         -        "AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329");
  2141         -    add_srs_wkt (p, 5,
  2142         -        "25199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\"");
  2143         -    add_srs_wkt (p, 6,
  2144         -        ",NORTH],AXIS[\"Longitude\",EAST],AUTHORITY[\"EPSG\",\"43");
  2145         -    add_srs_wkt (p, 7,
  2146         -        "26\"]],PROJECTION[\"Equirectangular\"],PARAMETER[\"latit");
  2147         -    add_srs_wkt (p, 8,
  2148         -        "ude_of_origin\",0],PARAMETER[\"central_meridian\",0],PAR");
  2149         -    add_srs_wkt (p, 9,
  2150         -        "AMETER[\"false_easting\",0],PARAMETER[\"false_northing\"");
  2151         -    add_srs_wkt (p, 10,
  2152         -        ",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AXIS[");
  2153         -    add_srs_wkt (p, 11,
  2154         -        "\"X\",EAST],AXIS[\"Y\",NORTH],AUTHORITY[\"EPSG\",\"32663");
  2155         -    add_srs_wkt (p, 12,
  2156         -        "\"]]");
  2157   2120       p = add_epsg_def_ex (filter, first, last, 32664, "epsg", 32664,
  2158   2121           "WGS 84 / BLM 14N (ftUS)", 0, 0,
  2159   2122           "WGS 84", "Greenwich",
  2160   2123           "WGS_1984", "Transverse_Mercator", "US survey foot",
  2161   2124           "X", "East", "Y", "North");
  2162   2125       add_proj4text (p, 0,
  2163   2126           "+proj=tmerc +lat_0=0 +lon_0=-99 +k=0.9996 +x_0=500000.00");
................................................................................
  3379   3342           ".9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"f");
  3380   3343       add_srs_wkt (p, 10,
  3381   3344           "alse_northing\",10000000],UNIT[\"metre\",1,AUTHORITY[\"E");
  3382   3345       add_srs_wkt (p, 11,
  3383   3346           "PSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
  3384   3347       add_srs_wkt (p, 12,
  3385   3348           ",NORTH],AUTHORITY[\"EPSG\",\"32733\"]]");
         3349  +    p = add_epsg_def_ex (filter, first, last, 32734, "epsg", 32734,
         3350  +        "WGS 84 / UTM zone 34S", 0, 0,
         3351  +        "WGS 84", "Greenwich",
         3352  +        "WGS_1984", "Transverse_Mercator", "metre",
         3353  +        "Easting", "East", "Northing", "North");
         3354  +    add_proj4text (p, 0,
         3355  +        "+proj=utm +zone=34 +south +datum=WGS84 +units=m +no_defs");
         3356  +    add_srs_wkt (p, 0,
         3357  +        "PROJCS[\"WGS 84 / UTM zone 34S\",GEOGCS[\"WGS 84\",DATUM");
         3358  +    add_srs_wkt (p, 1,
         3359  +        "[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,");
         3360  +    add_srs_wkt (p, 2,
         3361  +        "AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"");
         3362  +    add_srs_wkt (p, 3,
         3363  +        "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
         3364  +    add_srs_wkt (p, 4,
         3365  +        "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
         3366  +    add_srs_wkt (p, 5,
         3367  +        "9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAS");
         3368  +    add_srs_wkt (p, 6,
         3369  +        "T],AUTHORITY[\"EPSG\",\"4326\"]],PROJECTION[\"Transverse");
         3370  +    add_srs_wkt (p, 7,
         3371  +        "_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMET");
         3372  +    add_srs_wkt (p, 8,
         3373  +        "ER[\"central_meridian\",21],PARAMETER[\"scale_factor\",0");
         3374  +    add_srs_wkt (p, 9,
         3375  +        ".9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"f");
         3376  +    add_srs_wkt (p, 10,
         3377  +        "alse_northing\",10000000],UNIT[\"metre\",1,AUTHORITY[\"E");
         3378  +    add_srs_wkt (p, 11,
         3379  +        "PSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
         3380  +    add_srs_wkt (p, 12,
         3381  +        ",NORTH],AUTHORITY[\"EPSG\",\"32734\"]]");
  3386   3382   }
  3387   3383   

Changes to src/srsinit/epsg_inlined_wgs84_01.c.

     1      1   /*
     2      2   
     3      3    helper function for srs_init.c -- populating the SPATIAL_REF_SYS table
     4      4   
     5         - this code was autogenerated by "auto_epsg_ext" on Wed May 27 18:50:23 2015
            5  + this code was autogenerated by "auto_epsg_ext" on Fri Dec  5 11:07:13 2014
     6      6   
     7      7    Author: Sandro Furieri a.furieri@lqt.it
     8      8   
     9      9    -----------------------------------------------------------------------------
    10     10   
    11     11    Version: MPL 1.1/GPL 2.0/LGPL 2.1
    12     12   
................................................................................
    39     39   decision by deleting the provisions above and replace them with the notice
    40     40   and other provisions required by the GPL or the LGPL. If you do not delete
    41     41   the provisions above, a recipient may use your version of this file under
    42     42   the terms of any one of the MPL, the GPL or the LGPL.
    43     43   
    44     44   */
    45     45   
    46         -#include "config.h"
    47         -
    48     46   #include <spatialite_private.h>
    49     47   
    50     48   SPATIALITE_PRIVATE void
    51     49   initialize_epsg_wgs84_01 (int filter, struct epsg_defs **first, struct epsg_defs **last)
    52     50   {
    53     51   /* initializing the EPSG defs list [WGS84] */
    54     52       struct epsg_defs *p;
    55         -    p = add_epsg_def_ex (filter, first, last, 32734, "epsg", 32734,
    56         -        "WGS 84 / UTM zone 34S", 0, 0,
    57         -        "WGS 84", "Greenwich",
    58         -        "WGS_1984", "Transverse_Mercator", "metre",
    59         -        "Easting", "East", "Northing", "North");
    60         -    add_proj4text (p, 0,
    61         -        "+proj=utm +zone=34 +south +datum=WGS84 +units=m +no_defs");
    62         -    add_srs_wkt (p, 0,
    63         -        "PROJCS[\"WGS 84 / UTM zone 34S\",GEOGCS[\"WGS 84\",DATUM");
    64         -    add_srs_wkt (p, 1,
    65         -        "[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,");
    66         -    add_srs_wkt (p, 2,
    67         -        "AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"");
    68         -    add_srs_wkt (p, 3,
    69         -        "]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],");
    70         -    add_srs_wkt (p, 4,
    71         -        "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"");
    72         -    add_srs_wkt (p, 5,
    73         -        "9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAS");
    74         -    add_srs_wkt (p, 6,
    75         -        "T],AUTHORITY[\"EPSG\",\"4326\"]],PROJECTION[\"Transverse");
    76         -    add_srs_wkt (p, 7,
    77         -        "_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMET");
    78         -    add_srs_wkt (p, 8,
    79         -        "ER[\"central_meridian\",21],PARAMETER[\"scale_factor\",0");
    80         -    add_srs_wkt (p, 9,
    81         -        ".9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"f");
    82         -    add_srs_wkt (p, 10,
    83         -        "alse_northing\",10000000],UNIT[\"metre\",1,AUTHORITY[\"E");
    84         -    add_srs_wkt (p, 11,
    85         -        "PSG\",\"9001\"]],AXIS[\"Easting\",EAST],AXIS[\"Northing\"");
    86         -    add_srs_wkt (p, 12,
    87         -        ",NORTH],AUTHORITY[\"EPSG\",\"32734\"]]");
    88     53       p = add_epsg_def_ex (filter, first, last, 32735, "epsg", 32735,
    89     54           "WGS 84 / UTM zone 35S", 0, 0,
    90     55           "WGS 84", "Greenwich",
    91     56           "WGS_1984", "Transverse_Mercator", "metre",
    92     57           "Easting", "East", "Northing", "North");
    93     58       add_proj4text (p, 0,
    94     59           "+proj=utm +zone=35 +south +datum=WGS84 +units=m +no_defs");

Changes to src/srsinit/epsg_update/README.txt.

    16     16   --------
    17     17   # cd {libspatialite-source}/src/srsinit/epsg_update
    18     18   
    19     19   Linux:
    20     20   # gcc epsg_from_gdal.c -o epsg_from_gdal -lgdal
    21     21   
    22     22   Windows [MinGW]:
    23         -# gcc -I/usr/local/include epsg_from_gdal.c -o epsg_from_gdal.exe \
           23  +# gcc -I/usr/local/include epsg_from_gdal.c -o epsg_from_gdal,exe \
    24     24         -L/usr/local/lib -lgdal
    25     25   
    26     26   
    27     27   
    28     28   STEP #2: getting the basic EPSG file
    29     29   --------
    30     30   # rm epsg

Changes to src/srsinit/srs_init.c.

    67     67   	free (ptr->ref_sys_name);
    68     68       if (ptr->proj4text)
    69     69   	free (ptr->proj4text);
    70     70       if (ptr->srs_wkt)
    71     71   	free (ptr->srs_wkt);
    72     72       if (ptr->spheroid)
    73     73   	free (ptr->spheroid);
    74         -    if (ptr->prime_meridian)
    75         -	free (ptr->prime_meridian);
           74  +	if (ptr->prime_meridian)
           75  +	free(ptr->prime_meridian);
    76     76       if (ptr->datum)
    77     77   	free (ptr->datum);
    78     78       if (ptr->projection)
    79     79   	free (ptr->projection);
    80     80       if (ptr->unit)
    81     81   	free (ptr->unit);
    82     82       if (ptr->axis_1)
................................................................................
   158    158       return NULL;
   159    159   }
   160    160   
   161    161   SPATIALITE_PRIVATE struct epsg_defs *
   162    162   add_epsg_def_ex (int filter_srid, struct epsg_defs **first,
   163    163   		 struct epsg_defs **last, int srid, const char *auth_name,
   164    164   		 int auth_srid, const char *ref_sys_name, int is_geographic,
   165         -		 int flipped_axes, const char *spheroid,
   166         -		 const char *prime_meridian, const char *datum,
          165  +		 int flipped_axes, const char *spheroid, const char *prime_meridian, const char *datum,
   167    166   		 const char *projection, const char *unit, const char *axis_1,
   168    167   		 const char *orientation_1, const char *axis_2,
   169    168   		 const char *orientation_2)
   170    169   {
   171    170   /* appending an EPSG def to the list */
   172    171       int len;
   173    172       struct epsg_defs *p;
................................................................................
   440    439       if (ret != SQLITE_OK)
   441    440         {
   442    441   	  spatialite_e ("%s\n", sqlite3_errmsg (handle));
   443    442   	  goto error;
   444    443         }
   445    444   /* preparing the SQL parameterized statement (aux) */
   446    445       strcpy (sql, "INSERT INTO spatial_ref_sys_aux ");
   447         -    strcat (sql,
   448         -	    "(srid, is_geographic, has_flipped_axes, spheroid, prime_meridian, ");
          446  +    strcat (sql, "(srid, is_geographic, has_flipped_axes, spheroid, prime_meridian, ");
   449    447       strcat (sql, "datum, projection, unit, axis_1_name, axis_1_orientation, ");
   450    448       strcat (sql, "axis_2_name, axis_2_orientation) ");
   451    449       strcat (sql, "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
   452    450       ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt_aux, NULL);
   453    451       if (ret != SQLITE_OK)
   454    452         {
   455    453   	  spatialite_e ("%s\n", sqlite3_errmsg (handle));
................................................................................
   604    602   	sqlite3_finalize (stmt_aux);
   605    603   /* freeing the EPSG defs list */
   606    604       free_epsg (first);
   607    605   
   608    606       return 0;
   609    607   }
   610    608   
   611         -SPATIALITE_PRIVATE int
   612         -exists_spatial_ref_sys (void *p_sqlite)
          609  +static int
          610  +exists_spatial_ref_sys (sqlite3 * handle)
   613    611   {
   614    612   /* checking if the SPATIAL_REF_SYS table exists */
   615    613       int ret;
   616    614       int ok = 0;
   617    615       char sql[1024];
   618    616       char **results;
   619    617       int n_rows;
   620    618       int n_columns;
   621    619       char *err_msg = NULL;
   622    620   
   623         -    sqlite3 *handle = (sqlite3 *) p_sqlite;
   624         -
   625    621       strcpy (sql,
   626    622   	    "SELECT name FROM sqlite_master WHERE type = 'table' AND name LIKE 'spatial_ref_sys'");
   627    623       ret =
   628    624   	sqlite3_get_table (handle, sql, &results, &n_rows, &n_columns,
   629    625   			   &err_msg);
   630    626       if (ret != SQLITE_OK)
   631    627         {
................................................................................
   827    823         {
   828    824   	  spatialite_e ("%s\n", sqlite3_errmsg (handle));
   829    825   	  error = 1;
   830    826   	  goto stop;
   831    827         }
   832    828   /* preparing the SQL parameterized statement (aux) */
   833    829       strcpy (sql, "INSERT INTO spatial_ref_sys_aux ");
   834         -    strcat (sql,
   835         -	    "(srid, is_geographic, has_flipped_axes, spheroid, prime_meridian, ");
          830  +    strcat (sql, "(srid, is_geographic, has_flipped_axes, spheroid, prime_meridian, ");
   836    831       strcat (sql, "datum, projection, unit, axis_1_name, axis_1_orientation, ");
   837    832       strcat (sql, "axis_2_name, axis_2_orientation) ");
   838    833       strcat (sql, "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
   839    834       ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt_aux, NULL);
   840    835       if (ret != SQLITE_OK)
   841    836         {
   842    837   	  spatialite_e ("%s\n", sqlite3_errmsg (handle));

Changes to test/Makefile.am.

    49     49   		check_styling \
    50     50   		check_virtualxpath \
    51     51   		check_virtualbbox \
    52     52   		check_wfsin \
    53     53   		check_dxf \
    54     54   		check_metacatalog \
    55     55   		check_virtualelem \
    56         -		check_srid_fncts \
    57         -		check_control_points
           56  +		check_srid_fncts
    58     57   		
    59     58   if ENABLE_GEOPACKAGE
    60     59   check_PROGRAMS += \
    61     60   		check_createBaseTables \
    62     61   		check_gpkgCreateTilesTable \
    63     62   		check_gpkgCreateTilesTableMissingSRID \
    64     63   		check_gpkgCreateTilesZoomLevel \
................................................................................
   174    173   	Apple-iPhone-4.jpg empty.png  empty.tif \
   175    174   	test.wfs testDescribeFeatureType.wfs \
   176    175   	getcapabilities-1.0.0.wfs \
   177    176   	getcapabilities-1.1.0.wfs \
   178    177   	describefeaturetype.wfs	\
   179    178   	22.dxf f06.dxf l02.dxf p05.dxf \
   180    179   	archaic.dxf linked.dxf hatch.dxf \
   181         -	symbol.dxf gpkg_test.sqlite gpkg_test.gpkg \
   182         -	gpkg_test_broken.gpkg gpkg_test_extrasrid.gpkg
          180  +	symbol.dxf gpkg_test.sqlite gpkg_test.gpkg
   183    181   
   184    182   SUBDIRS = sql_stmt_geosadvanced_tests sql_stmt_geos_tests \
   185    183   	sql_stmt_libxml2_tests sql_stmt_lwgeom_tests \
   186    184   	sql_stmt_mathsql_tests sql_stmt_proj_tests \
   187    185   	sql_stmt_security_tests sql_stmt_tests \
   188    186   	sql_stmt_xmlsec_tests sql_stmt_geopackage_tests \
   189         -	sql_stmt_freexl_tests sql_stmt_cache_tests \
   190         -	sql_stmt_nocache_tests
          187  +	sql_stmt_freexl_tests

Changes to test/Makefile.in.

   100    100   	check_exif2$(EXEEXT) check_relations_fncts$(EXEEXT) \
   101    101   	check_extra_relations_fncts$(EXEEXT) \
   102    102   	check_geoscvt_fncts$(EXEEXT) check_libxml2$(EXEEXT) \
   103    103   	check_styling$(EXEEXT) check_virtualxpath$(EXEEXT) \
   104    104   	check_virtualbbox$(EXEEXT) check_wfsin$(EXEEXT) \
   105    105   	check_dxf$(EXEEXT) check_metacatalog$(EXEEXT) \
   106    106   	check_virtualelem$(EXEEXT) check_srid_fncts$(EXEEXT) \
   107         -	check_control_points$(EXEEXT) $(am__EXEEXT_1)
          107  +	$(am__EXEEXT_1)
   108    108   @ENABLE_GEOPACKAGE_TRUE@am__append_1 = \
   109    109   @ENABLE_GEOPACKAGE_TRUE@		check_createBaseTables \
   110    110   @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateTilesTable \
   111    111   @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateTilesTableMissingSRID \
   112    112   @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateTilesZoomLevel \
   113    113   @ENABLE_GEOPACKAGE_TRUE@		check_gpkgInsertEpsgSRID \
   114    114   @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateFeaturesTable \
................................................................................
   192    192   check_add_tile_triggers_bad_table_name_LDADD = $(LDADD)
   193    193   check_bufovflw_SOURCES = check_bufovflw.c
   194    194   check_bufovflw_OBJECTS = check_bufovflw.$(OBJEXT)
   195    195   check_bufovflw_LDADD = $(LDADD)
   196    196   check_clone_table_SOURCES = check_clone_table.c
   197    197   check_clone_table_OBJECTS = check_clone_table.$(OBJEXT)
   198    198   check_clone_table_LDADD = $(LDADD)
   199         -check_control_points_SOURCES = check_control_points.c
   200         -check_control_points_OBJECTS = check_control_points.$(OBJEXT)
   201         -check_control_points_LDADD = $(LDADD)
   202    199   check_create_SOURCES = check_create.c
   203    200   check_create_OBJECTS = check_create.$(OBJEXT)
   204    201   check_create_LDADD = $(LDADD)
   205    202   check_createBaseTables_SOURCES = check_createBaseTables.c
   206    203   check_createBaseTables_OBJECTS = check_createBaseTables.$(OBJEXT)
   207    204   check_createBaseTables_LDADD = $(LDADD)
   208    205   check_dbf_load_SOURCES = check_dbf_load.c
................................................................................
   500    497   	$(AM_LDFLAGS) $(LDFLAGS) -o $@
   501    498   AM_V_CCLD = $(am__v_CCLD_@AM_V@)
   502    499   am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
   503    500   am__v_CCLD_0 = @echo "  CCLD    " $@;
   504    501   am__v_CCLD_1 = 
   505    502   SOURCES = check_add_tile_triggers.c \
   506    503   	check_add_tile_triggers_bad_table_name.c check_bufovflw.c \
   507         -	check_clone_table.c check_control_points.c check_create.c \
   508         -	check_createBaseTables.c check_dbf_load.c check_dxf.c \
   509         -	check_endian.c check_exif.c check_exif2.c check_extension.c \
   510         -	check_extra_relations_fncts.c check_fdo1.c check_fdo2.c \
   511         -	check_fdo3.c check_fdo_bufovflw.c check_gaia_utf8.c \
   512         -	check_gaia_util.c check_geom_aux.c check_geometry_cols.c \
   513         -	check_geoscvt_fncts.c check_get_normal_row.c \
   514         -	check_get_normal_row_bad_geopackage.c \
          504  +	check_clone_table.c check_create.c check_createBaseTables.c \
          505  +	check_dbf_load.c check_dxf.c check_endian.c check_exif.c \
          506  +	check_exif2.c check_extension.c check_extra_relations_fncts.c \
          507  +	check_fdo1.c check_fdo2.c check_fdo3.c check_fdo_bufovflw.c \
          508  +	check_gaia_utf8.c check_gaia_util.c check_geom_aux.c \
          509  +	check_geometry_cols.c check_geoscvt_fncts.c \
          510  +	check_get_normal_row.c check_get_normal_row_bad_geopackage.c \
   515    511   	check_get_normal_row_bad_geopackage2.c check_get_normal_zoom.c \
   516    512   	check_get_normal_zoom_bad_geopackage.c \
   517    513   	check_get_normal_zoom_bad_geopackage2.c \
   518    514   	check_get_normal_zoom_extension_load.c check_gpkgConvert.c \
   519    515   	check_gpkgCreateFeaturesTable.c check_gpkgCreateTilesTable.c \
   520    516   	check_gpkgCreateTilesTableMissingSRID.c \
   521    517   	check_gpkgCreateTilesZoomLevel.c check_gpkgGetImageFormat.c \
................................................................................
   539    535   	check_virtualtable2.c check_virtualtable3.c \
   540    536   	check_virtualtable4.c check_virtualtable5.c \
   541    537   	check_virtualtable6.c check_virtualxpath.c check_wfsin.c \
   542    538   	check_xls_load.c shape_3d.c shape_cp1252.c shape_primitives.c \
   543    539   	shape_utf8_1.c shape_utf8_1ex.c shape_utf8_2.c
   544    540   DIST_SOURCES = check_add_tile_triggers.c \
   545    541   	check_add_tile_triggers_bad_table_name.c check_bufovflw.c \
   546         -	check_clone_table.c check_control_points.c check_create.c \
   547         -	check_createBaseTables.c check_dbf_load.c check_dxf.c \
   548         -	check_endian.c check_exif.c check_exif2.c check_extension.c \
   549         -	check_extra_relations_fncts.c check_fdo1.c check_fdo2.c \
   550         -	check_fdo3.c check_fdo_bufovflw.c check_gaia_utf8.c \
   551         -	check_gaia_util.c check_geom_aux.c check_geometry_cols.c \
   552         -	check_geoscvt_fncts.c check_get_normal_row.c \
   553         -	check_get_normal_row_bad_geopackage.c \
          542  +	check_clone_table.c check_create.c check_createBaseTables.c \
          543  +	check_dbf_load.c check_dxf.c check_endian.c check_exif.c \
          544  +	check_exif2.c check_extension.c check_extra_relations_fncts.c \
          545  +	check_fdo1.c check_fdo2.c check_fdo3.c check_fdo_bufovflw.c \
          546  +	check_gaia_utf8.c check_gaia_util.c check_geom_aux.c \
          547  +	check_geometry_cols.c check_geoscvt_fncts.c \
          548  +	check_get_normal_row.c check_get_normal_row_bad_geopackage.c \
   554    549   	check_get_normal_row_bad_geopackage2.c check_get_normal_zoom.c \
   555    550   	check_get_normal_zoom_bad_geopackage.c \
   556    551   	check_get_normal_zoom_bad_geopackage2.c \
   557    552   	check_get_normal_zoom_extension_load.c check_gpkgConvert.c \
   558    553   	check_gpkgCreateFeaturesTable.c check_gpkgCreateTilesTable.c \
   559    554   	check_gpkgCreateTilesTableMissingSRID.c \
   560    555   	check_gpkgCreateTilesZoomLevel.c check_gpkgGetImageFormat.c \
................................................................................
  1063   1058   	Apple-iPhone-4.jpg empty.png  empty.tif \
  1064   1059   	test.wfs testDescribeFeatureType.wfs \
  1065   1060   	getcapabilities-1.0.0.wfs \
  1066   1061   	getcapabilities-1.1.0.wfs \
  1067   1062   	describefeaturetype.wfs	\
  1068   1063   	22.dxf f06.dxf l02.dxf p05.dxf \
  1069   1064   	archaic.dxf linked.dxf hatch.dxf \
  1070         -	symbol.dxf gpkg_test.sqlite gpkg_test.gpkg \
  1071         -	gpkg_test_broken.gpkg gpkg_test_extrasrid.gpkg
         1065  +	symbol.dxf gpkg_test.sqlite gpkg_test.gpkg
  1072   1066   
  1073   1067   SUBDIRS = sql_stmt_geosadvanced_tests sql_stmt_geos_tests \
  1074   1068   	sql_stmt_libxml2_tests sql_stmt_lwgeom_tests \
  1075   1069   	sql_stmt_mathsql_tests sql_stmt_proj_tests \
  1076   1070   	sql_stmt_security_tests sql_stmt_tests \
  1077   1071   	sql_stmt_xmlsec_tests sql_stmt_geopackage_tests \
  1078         -	sql_stmt_freexl_tests sql_stmt_cache_tests \
  1079         -	sql_stmt_nocache_tests
         1072  +	sql_stmt_freexl_tests
  1080   1073   
  1081   1074   all: all-recursive
  1082   1075   
  1083   1076   .SUFFIXES:
  1084   1077   .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
  1085   1078   $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  1086   1079   	@for dep in $?; do \
................................................................................
  1134   1127   	@rm -f check_bufovflw$(EXEEXT)
  1135   1128   	$(AM_V_CCLD)$(LINK) $(check_bufovflw_OBJECTS) $(check_bufovflw_LDADD) $(LIBS)
  1136   1129   
  1137   1130   check_clone_table$(EXEEXT): $(check_clone_table_OBJECTS) $(check_clone_table_DEPENDENCIES) $(EXTRA_check_clone_table_DEPENDENCIES) 
  1138   1131   	@rm -f check_clone_table$(EXEEXT)
  1139   1132   	$(AM_V_CCLD)$(LINK) $(check_clone_table_OBJECTS) $(check_clone_table_LDADD) $(LIBS)
  1140   1133   
  1141         -check_control_points$(EXEEXT): $(check_control_points_OBJECTS) $(check_control_points_DEPENDENCIES) $(EXTRA_check_control_points_DEPENDENCIES) 
  1142         -	@rm -f check_control_points$(EXEEXT)
  1143         -	$(AM_V_CCLD)$(LINK) $(check_control_points_OBJECTS) $(check_control_points_LDADD) $(LIBS)
  1144         -
  1145   1134   check_create$(EXEEXT): $(check_create_OBJECTS) $(check_create_DEPENDENCIES) $(EXTRA_check_create_DEPENDENCIES) 
  1146   1135   	@rm -f check_create$(EXEEXT)
  1147   1136   	$(AM_V_CCLD)$(LINK) $(check_create_OBJECTS) $(check_create_LDADD) $(LIBS)
  1148   1137   
  1149   1138   check_createBaseTables$(EXEEXT): $(check_createBaseTables_OBJECTS) $(check_createBaseTables_DEPENDENCIES) $(EXTRA_check_createBaseTables_DEPENDENCIES) 
  1150   1139   	@rm -f check_createBaseTables$(EXEEXT)
  1151   1140   	$(AM_V_CCLD)$(LINK) $(check_createBaseTables_OBJECTS) $(check_createBaseTables_LDADD) $(LIBS)
................................................................................
  1460   1449   distclean-compile:
  1461   1450   	-rm -f *.tab.c
  1462   1451   
  1463   1452   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_add_tile_triggers.Po@am__quote@
  1464   1453   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_add_tile_triggers_bad_table_name.Po@am__quote@
  1465   1454   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_bufovflw.Po@am__quote@
  1466   1455   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clone_table.Po@am__quote@
  1467         -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_control_points.Po@am__quote@
  1468   1456   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_create.Po@am__quote@
  1469   1457   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_createBaseTables.Po@am__quote@
  1470   1458   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dbf_load.Po@am__quote@
  1471   1459   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dxf.Po@am__quote@
  1472   1460   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_endian.Po@am__quote@
  1473   1461   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_exif.Po@am__quote@
  1474   1462   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_exif2.Po@am__quote@
................................................................................
  2181   2169   	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
  2182   2170   	--log-file $$b.log --trs-file $$b.trs \
  2183   2171   	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  2184   2172   	"$$tst" $(AM_TESTS_FD_REDIRECT)
  2185   2173   check_srid_fncts.log: check_srid_fncts$(EXEEXT)
  2186   2174   	@p='check_srid_fncts$(EXEEXT)'; \
  2187   2175   	b='check_srid_fncts'; \
  2188         -	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
  2189         -	--log-file $$b.log --trs-file $$b.trs \
  2190         -	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  2191         -	"$$tst" $(AM_TESTS_FD_REDIRECT)
  2192         -check_control_points.log: check_control_points$(EXEEXT)
  2193         -	@p='check_control_points$(EXEEXT)'; \
  2194         -	b='check_control_points'; \
  2195   2176   	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
  2196   2177   	--log-file $$b.log --trs-file $$b.trs \
  2197   2178   	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  2198   2179   	"$$tst" $(AM_TESTS_FD_REDIRECT)
  2199   2180   check_createBaseTables.log: check_createBaseTables$(EXEEXT)
  2200   2181   	@p='check_createBaseTables$(EXEEXT)'; \
  2201   2182   	b='check_createBaseTables'; \

Changes to test/WritingSQLTestCase.txt.

     1      1   Building a SQL statement test case
     2      2   
     3      3   This probably requires that you're using the "autoconf" build system at the
     4      4   moment. This is the case if you're running on Linux or some other Unix variant,
     5      5   including Mac OS X. It is the case for some kinds of Windows builds too (using
     6      6   MinGW / MSYS).
     7      7   
     8         -I assume that you're mostly OK with building from fossil. If not, start
     9         -at http://www.gaia-gis.it/gaia-sins/about-fossil.html. There are detailed
    10         -build instructions linked off http://www.gaia-gis.it/gaia-sins/ for each
    11         -major platform.
            8  +I assume that you're mostly OK with building from subversion. If not, start
            9  +at http://www.gaia-gis.it/spatialite/sources.html. Make sure you read
           10  +Sandro's "short note" - it is at
           11  +http://www.gaia-gis.it/spatialite/how_to_build_libspatialite.html
           12  +if you missed it.
    12     13   
    13     14   Make sure you have all the dependencies. It is a bit of work but it will pay off
    14     15   in the long run.
    15     16   
    16     17   Once you've got that far, its time to start with the testing.
    17     18   
    18     19   Step 1. Just get the tests building. 
    19     20   If you're in the build directory (i.e. where you ran the "./configure" and
    20     21   "make" steps), you should be able to run "make check" and have the tests
    21     22   build and run. Towards the end, it should report something like:
    22         -============================================================================
    23         -Testsuite summary for libspatialite 4.3.0-devel
    24         -============================================================================
    25         -# TOTAL: 83
    26         -# PASS:  83
    27         -# SKIP:  0
    28         -# XFAIL: 0
    29         -# FAIL:  0
    30         -# XPASS: 0
    31         -# ERROR: 0
    32         -============================================================================
           23  +===================
           24  +All 15 tests passed
           25  +===================
    33     26   
    34     27   If any of them fail, please let us know ASAP.
    35     28   
    36     29   Step 2. After that works, its time to set up the coverage testing. Obviously we
    37     30   want to understand which code isn't being tested, then write a test to check
    38     31   that code, and finally make sure that the code is being tested. Fortunately,
    39     32   there are nice tools to check which code is being run. On Unix / Linux, you 

Deleted test/check_control_points.c.

     1         -/*
     2         -
     3         - check_contro_points.c -- SpatiaLite Test Case
     4         -
     5         - Author: Sandro Furieri <a.furieri@lqt.it>
     6         -
     7         - ------------------------------------------------------------------------------
     8         - 
     9         - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    10         - 
    11         - The contents of this file are subject to the Mozilla Public License Version
    12         - 1.1 (the "License"); you may not use this file except in compliance with
    13         - the License. You may obtain a copy of the License at
    14         - http://www.mozilla.org/MPL/
    15         - 
    16         -Software distributed under the License is distributed on an "AS IS" basis,
    17         -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    18         -for the specific language governing rights and limitations under the
    19         -License.
    20         -
    21         -The Original Code is the SpatiaLite library
    22         -
    23         -The Initial Developer of the Original Code is Alessandro Furieri
    24         - 
    25         -Portions created by the Initial Developer are Copyright (C) 2011
    26         -the Initial Developer. All Rights Reserved.
    27         -
    28         -Contributor(s):
    29         -Brad Hards <bradh@frogmouth.net>
    30         -
    31         -Alternatively, the contents of this file may be used under the terms of
    32         -either the GNU General Public License Version 2 or later (the "GPL"), or
    33         -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    34         -in which case the provisions of the GPL or the LGPL are applicable instead
    35         -of those above. If you wish to allow use of your version of this file only
    36         -under the terms of either the GPL or the LGPL, and not to allow others to
    37         -use your version of this file under the terms of the MPL, indicate your
    38         -decision by deleting the provisions above and replace them with the notice
    39         -and other provisions required by the GPL or the LGPL. If you do not delete
    40         -the provisions above, a recipient may use your version of this file under
    41         -the terms of any one of the MPL, the GPL or the LGPL.
    42         - 
    43         -*/
    44         -#include <stdlib.h>
    45         -#include <stdio.h>
    46         -#include <string.h>
    47         -
    48         -#include "config.h"
    49         -
    50         -#include "sqlite3.h"
    51         -#include "spatialite.h"
    52         -
    53         -static int
    54         -test_query (sqlite3 * sqlite, const char *sql, const char *expected)
    55         -{
    56         -/* testing some SQL query */
    57         -    int ret;
    58         -    sqlite3_stmt *stmt = NULL;
    59         -
    60         -    ret = sqlite3_prepare_v2 (sqlite, sql, strlen (sql), &stmt, NULL);
    61         -    if (ret != SQLITE_OK)
    62         -      {
    63         -	  fprintf (stderr, "%s\n: \"%s\"\n", sql, sqlite3_errmsg (sqlite));
    64         -	  return 0;
    65         -      }
    66         -    while (1)
    67         -      {
    68         -	  /* scrolling the result set rows */
    69         -	  ret = sqlite3_step (stmt);
    70         -	  if (ret == SQLITE_DONE)
    71         -	      break;		/* end of result set */
    72         -	  if (ret == SQLITE_ROW)
    73         -	    {
    74         -		const char *value;
    75         -		if (sqlite3_column_type (stmt, 0) == SQLITE_NULL)
    76         -		  {
    77         -		      if (expected == NULL)
    78         -			  continue;
    79         -		      else
    80         -			{
    81         -			    fprintf (stderr,
    82         -				     "Unexpected NULL result\nExpected: %s\n",
    83         -				     expected);
    84         -			    goto error;
    85         -			}
    86         -		  }
    87         -		value = (const char *) sqlite3_column_text (stmt, 0);
    88         -		if (expected == NULL)
    89         -		  {
    90         -		      fprintf (stderr, "Unexpected result %s\nExpected: NULL\n",
    91         -			       value);
    92         -		      goto error;
    93         -		  }
    94         -		if (strcasecmp (value, expected) != 0)
    95         -		  {
    96         -		      fprintf (stderr, "Unexpected result %s\nExpected: %s\n",
    97         -			       value, expected);
    98         -		      goto error;
    99         -		  }
   100         -	    }
   101         -	  else
   102         -	      goto error;
   103         -      }
   104         -    sqlite3_finalize (stmt);
   105         -    return 1;
   106         -
   107         -  error:
   108         -    if (stmt != NULL)
   109         -	sqlite3_finalize (stmt);
   110         -    return 0;
   111         -}
   112         -
   113         -static int
   114         -test_transform (sqlite3 * handle, int order)
   115         -{
   116         -/* testing GCP_Transform */
   117         -    char *sql;
   118         -    int ret;
   119         -
   120         -/* resolving Control Points 2D - CGP_Transform XY */
   121         -    sql = sqlite3_mprintf ("SELECT AsText(GCP_Transform(g.geometry, b.gcp)) "
   122         -			   "FROM test_xy AS g, "
   123         -			   "(SELECT GCP_Compute(a.geometry, b.geometry, %d) AS gcp "
   124         -			   "FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id) AS b",
   125         -			   order);
   126         -    ret =
   127         -	test_query (handle, sql,
   128         -		    "GEOMETRYCOLLECTION(POINT(-161 -64), LINESTRING(-160 -63, -159 -62), "
   129         -		    "POLYGON((-151 -54, -141 -54, -141 -44, -151 -44, -151 -54), "
   130         -		    "(-147 -50, -145 -50, -145 -48, -147 -48, -147 -50)))");
   131         -    sqlite3_free (sql);
   132         -    if (!ret)
   133         -	return 0;
   134         -
   135         -/* resolving Control Points 2D - CGP_Transform XYM */
   136         -    sql = sqlite3_mprintf ("SELECT AsText(GCP_Transform(g.geometry, b.gcp)) "
   137         -			   "FROM test_xym AS g, "
   138         -			   "(SELECT GCP_Compute(a.geometry, b.geometry, %d) AS gcp "
   139         -			   "FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id) AS b",
   140         -			   order);
   141         -    ret =
   142         -	test_query (handle, sql,
   143         -		    "GEOMETRYCOLLECTION M(POINT M(-161 -64 1), "
   144         -		    "LINESTRING M(-160 -63 1, -159 -62 3), "
   145         -		    "POLYGON M((-151 -54 1, -141 -54 2, -141 -44 3, -151 -44 2, -151 -54 1), "
   146         -		    "(-147 -50 1, -145 -50 2, -145 -48 2, -147 -48 2, -147 -50 1)))");
   147         -    sqlite3_free (sql);
   148         -    if (!ret)
   149         -	return 0;
   150         -
   151         -/* resolving Control Points 3D - CGP_Transform XYZ */
   152         -    sql =
   153         -	sqlite3_mprintf
   154         -	("SELECT IsValid(GCP_Transform(g.geometry, b.gcp)) "
   155         -	 "FROM test_xyz AS g, "
   156         -	 "(SELECT GCP_Compute(a.geometry, b.geometry, %d) AS gcp "
   157         -	 "FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b",
   158         -	 order);
   159         -    ret = test_query (handle, sql, "1");
   160         -    sqlite3_free (sql);
   161         -    if (!ret)
   162         -	return 0;
   163         -
   164         -/* resolving Control Points 3D - CGP_Transform XYZM */
   165         -    sql =
   166         -	sqlite3_mprintf
   167         -	("SELECT IsValid(GCP_Transform(g.geometry, b.gcp)) "
   168         -	 "FROM test_xyzm AS g, "
   169         -	 "(SELECT GCP_Compute(a.geometry, b.geometry, %d) AS gcp "
   170         -	 "FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b",
   171         -	 order);
   172         -    ret = test_query (handle, sql, "1");
   173         -    sqlite3_free (sql);
   174         -    if (!ret)
   175         -	return 0;
   176         -
   177         -    return 1;
   178         -}
   179         -
   180         -static int
   181         -test_invalid (sqlite3 * handle)
   182         -{
   183         -/* testing invalid calls */
   184         -    const char *sql;
   185         -
   186         -    sql = "SELECT GCP_Compute(NULL, GeomFromText('POINT(1 1)'))";
   187         -    if (!test_query (handle, sql, NULL))
   188         -	return 0;
   189         -    sql = "SELECT GCP_Compute(GeomFromText('POINT(1 1)'), NULL)";
   190         -    if (!test_query (handle, sql, NULL))
   191         -	return 0;
   192         -    sql =
   193         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('POINT(2 2)'), NULL)";
   194         -    if (!test_query (handle, sql, NULL))
   195         -	return 0;
   196         -    sql =
   197         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('POINT(2 2)'), -1)";
   198         -    if (!test_query (handle, sql, NULL))
   199         -	return 0;
   200         -    sql =
   201         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('POINT(2 2)'), 4)";
   202         -    if (!test_query (handle, sql, NULL))
   203         -	return 0;
   204         -    sql =
   205         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('POINTZ(2 2 2)'))";
   206         -    if (!test_query (handle, sql, NULL))
   207         -	return 0;
   208         -    sql =
   209         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('POINT(2 2)'))";
   210         -    if (!test_query (handle, sql, NULL))
   211         -	return 0;
   212         -    sql =
   213         -	"SELECT GCP_Compute(GeomFromText('POINT(1 1)'), GeomFromText('LINESTRING(2 2, 3 2)'))";
   214         -    if (!test_query (handle, sql, NULL))
   215         -	return 0;
   216         -    sql =
   217         -	"SELECT GCP_Compute(GeomFromText('LINESTRING(2 2, 3 2)'), GeomFromText('POINT(1 1)'))";
   218         -    if (!test_query (handle, sql, NULL))
   219         -	return 0;
   220         -    sql = "SELECT GCP_Compute(GeomFromText('POINT(1 1)'), NULL)";
   221         -    if (!test_query (handle, sql, NULL))
   222         -	return 0;
   223         -    sql = "SELECT GCP_Compute(GeomFromText('POINT(1 1)'), zeroblob(10))";
   224         -    if (!test_query (handle, sql, NULL))
   225         -	return 0;
   226         -    sql = "SELECT GCP_Transform(NULL, b.gcp) "
   227         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry) AS gcp "
   228         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b";
   229         -    if (!test_query (handle, sql, NULL))
   230         -	return 0;
   231         -    sql = "SELECT GCP_Transform(zeroblob(10), b.gcp) "
   232         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry) AS gcp "
   233         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b";
   234         -    if (!test_query (handle, sql, NULL))
   235         -	return 0;
   236         -    sql = "SELECT GCP_Transform(GeomFromText('POINT(1 1)'), zeroblob(4))";
   237         -    if (!test_query (handle, sql, NULL))
   238         -	return 0;
   239         -    sql = "SELECT GCP_IsValid(NULL)";
   240         -    if (!test_query (handle, sql, "-1"))
   241         -	return 0;
   242         -    sql = "SELECT GCP_IsValid(zeroblob(0))";
   243         -    if (!test_query (handle, sql, "0"))
   244         -	return 0;
   245         -    sql = "SELECT GCP_AsText(NULL)";
   246         -    if (!test_query (handle, sql, NULL))
   247         -	return 0;
   248         -    sql = "SELECT GCP_AsText(zeroblob(0))";
   249         -    if (!test_query (handle, sql, NULL))
   250         -	return 0;
   251         -    sql = "SELECT GCP_Transform(GeomFromText('POINT(1 1)'), b.gcp, 1.0) "
   252         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry) AS gcp "
   253         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b";
   254         -    if (!test_query (handle, sql, NULL))
   255         -	return 0;
   256         -    sql = "SELECT GCP_Transform(zeroblob(4), b.gcp, 32632) "
   257         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry) AS gcp "
   258         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id) AS b";
   259         -    if (!test_query (handle, sql, NULL))
   260         -	return 0;
   261         -    sql = "SELECT GCP_Transform(GeomFromText('POINT(1 1)'), NULL)";
   262         -    if (!test_query (handle, sql, NULL))
   263         -	return 0;
   264         -    sql = "SELECT GCP2ATM(NULL)";
   265         -    if (!test_query (handle, sql, NULL))
   266         -	return 0;
   267         -    sql = "SELECT GCP2ATM(zeroblob(100))";
   268         -    if (!test_query (handle, sql, NULL))
   269         -	return 0;
   270         -    sql = "SELECT GCP2ATM(b.gcp) "
   271         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry, 2) AS gcp "
   272         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id) AS b";
   273         -    if (!test_query (handle, sql, NULL))
   274         -	return 0;
   275         -    sql = "SELECT GCP2ATM(b.gcp) "
   276         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry, 3) AS gcp "
   277         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id) AS b";
   278         -    if (!test_query (handle, sql, NULL))
   279         -	return 0;
   280         -    sql = "SELECT GCP2ATM(b.gcp) "
   281         -	"FROM (SELECT GCP_Compute(a.geometry, b.geometry, 0) AS gcp "
   282         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id) AS b";
   283         -    if (!test_query (handle, sql, NULL))
   284         -	return 0;
   285         -
   286         -    return 1;
   287         -}
   288         -
   289         -int
   290         -main (int argc, char *argv[])
   291         -{
   292         -#ifdef ENABLE_GCP		/* only if Control Points (Grass) is enabled */
   293         -    int ret;
   294         -    sqlite3 *handle;
   295         -    char *err_msg = NULL;
   296         -    const char *sql;
   297         -    int order;
   298         -    void *cache = spatialite_alloc_connection ();
   299         -
   300         -    if (argc > 1 || argv[0] == NULL)
   301         -	argc = 1;		/* silencing stupid compiler warnings */
   302         -
   303         -    ret =
   304         -	sqlite3_open_v2 (":memory:", &handle,
   305         -			 SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
   306         -    if (ret != SQLITE_OK)
   307         -      {
   308         -	  fprintf (stderr, "cannot open in-memory databse: %s\n",
   309         -		   sqlite3_errmsg (handle));
   310         -	  sqlite3_close (handle);
   311         -	  return -1;
   312         -      }
   313         -
   314         -    spatialite_init_ex (handle, cache, 0);
   315         -
   316         -    ret =
   317         -	sqlite3_exec (handle, "SELECT InitSpatialMetadata(1)", NULL, NULL,
   318         -		      &err_msg);
   319         -    if (ret != SQLITE_OK)
   320         -      {
   321         -	  fprintf (stderr, "InitSpatialMetadata() error: %s\n", err_msg);
   322         -	  sqlite3_free (err_msg);
   323         -	  sqlite3_close (handle);
   324         -	  return -2;
   325         -      }
   326         -
   327         -/* creating and populating a test table - XY */
   328         -    ret = sqlite3_exec (handle, "CREATE TABLE test_xy ("
   329         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   330         -			&err_msg);
   331         -    if (ret != SQLITE_OK)
   332         -      {
   333         -	  fprintf (stderr, "CREATE test_xy error: %s\n", err_msg);
   334         -	  sqlite3_free (err_msg);
   335         -	  sqlite3_close (handle);
   336         -	  return -3;
   337         -      }
   338         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   339         -			"'test_xy', 'geometry', 4326, 'GEOMETRYCOLLECTION', 'XY')",
   340         -			NULL, NULL, &err_msg);
   341         -    if (ret != SQLITE_OK)
   342         -      {
   343         -	  fprintf (stderr, "CREATE test_xy Geometry error: %s\n", err_msg);
   344         -	  sqlite3_free (err_msg);
   345         -	  sqlite3_close (handle);
   346         -	  return -4;
   347         -      }
   348         -    ret = sqlite3_exec (handle, "INSERT INTO test_xy VALUES (NULL, "
   349         -			"GeomFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(1 1, 2 2), "
   350         -			"POLYGON((10 10, 20 10, 20 20, 10 20, 10 10), "
   351         -			"(14 14, 16 14, 16 16, 14 16, 14 14)))', 4326))", NULL,
   352         -			NULL, &err_msg);
   353         -    if (ret != SQLITE_OK)
   354         -      {
   355         -	  fprintf (stderr, "INSERT INTO test_xy Geometry error: %s\n", err_msg);
   356         -	  sqlite3_free (err_msg);
   357         -	  sqlite3_close (handle);
   358         -	  return -5;
   359         -      }
   360         -
   361         -/* creating and populating a test table - XYZ */
   362         -    ret = sqlite3_exec (handle, "CREATE TABLE test_xyz ("
   363         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   364         -			&err_msg);
   365         -    if (ret != SQLITE_OK)
   366         -      {
   367         -	  fprintf (stderr, "CREATE test_xyz error: %s\n", err_msg);
   368         -	  sqlite3_free (err_msg);
   369         -	  sqlite3_close (handle);
   370         -	  return -6;
   371         -      }
   372         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   373         -			"'test_xyz', 'geometry', 4326, 'GEOMETRYCOLLECTION', 'XYz')",
   374         -			NULL, NULL, &err_msg);
   375         -    if (ret != SQLITE_OK)
   376         -      {
   377         -	  fprintf (stderr, "CREATE test_xyz Geometry error: %s\n", err_msg);
   378         -	  sqlite3_free (err_msg);
   379         -	  sqlite3_close (handle);
   380         -	  return -7;
   381         -      }
   382         -    ret = sqlite3_exec (handle, "INSERT INTO test_xyz VALUES (NULL, "
   383         -			"GeomFromText('GEOMETRYCOLLECTIONZ(POINTZ(0 0 1), "
   384         -			"LINESTRINGZ(1 1 1, 2 2 3), "
   385         -			"POLYGONZ((10 10 1, 20 10 2, 20 20 3, 10 20 2, 10 10 1), "
   386         -			"(14 14 1, 16 14 2, 16 16 2, 14 16 2, 14 14 1)))', 4326))",
   387         -			NULL, NULL, &err_msg);
   388         -    if (ret != SQLITE_OK)
   389         -      {
   390         -	  fprintf (stderr, "INSERT INTO test_xyz Geometry error: %s\n",
   391         -		   err_msg);
   392         -	  sqlite3_free (err_msg);
   393         -	  sqlite3_close (handle);
   394         -	  return -8;
   395         -      }
   396         -
   397         -/* creating and populating a test table - XYM */
   398         -    ret = sqlite3_exec (handle, "CREATE TABLE test_xym ("
   399         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   400         -			&err_msg);
   401         -    if (ret != SQLITE_OK)
   402         -      {
   403         -	  fprintf (stderr, "CREATE test_xym error: %s\n", err_msg);
   404         -	  sqlite3_free (err_msg);
   405         -	  sqlite3_close (handle);
   406         -	  return -9;
   407         -      }
   408         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   409         -			"'test_xym', 'geometry', 4326, 'GEOMETRYCOLLECTION', 'XYM')",
   410         -			NULL, NULL, &err_msg);
   411         -    if (ret != SQLITE_OK)
   412         -      {
   413         -	  fprintf (stderr, "CREATE test_xym Geometry error: %s\n", err_msg);
   414         -	  sqlite3_free (err_msg);
   415         -	  sqlite3_close (handle);
   416         -	  return -10;
   417         -      }
   418         -    ret = sqlite3_exec (handle, "INSERT INTO test_xym VALUES (NULL, "
   419         -			"GeomFromText('GEOMETRYCOLLECTIONM(POINTM(0 0 1), "
   420         -			"LINESTRINGM(1 1 1, 2 2 3), "
   421         -			"POLYGONM((10 10 1, 20 10 2, 20 20 3, 10 20 2, 10 10 1), "
   422         -			"(14 14 1, 16 14 2, 16 16 2, 14 16 2, 14 14 1)))', 4326))",
   423         -			NULL, NULL, &err_msg);
   424         -    if (ret != SQLITE_OK)
   425         -      {
   426         -	  fprintf (stderr, "INSERT INTO test_xym Geometry error: %s\n",
   427         -		   err_msg);
   428         -	  sqlite3_free (err_msg);
   429         -	  sqlite3_close (handle);
   430         -	  return -11;
   431         -      }
   432         -
   433         -/* creating and populating a test table - XYZM */
   434         -    ret = sqlite3_exec (handle, "CREATE TABLE test_xyzm ("
   435         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   436         -			&err_msg);
   437         -    if (ret != SQLITE_OK)
   438         -      {
   439         -	  fprintf (stderr, "CREATE test_xyzm error: %s\n", err_msg);
   440         -	  sqlite3_free (err_msg);
   441         -	  sqlite3_close (handle);
   442         -	  return -12;
   443         -      }
   444         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   445         -			"'test_xyzm', 'geometry', 4326, 'GEOMETRYCOLLECTION', 'XYZM')",
   446         -			NULL, NULL, &err_msg);
   447         -    if (ret != SQLITE_OK)
   448         -      {
   449         -	  fprintf (stderr, "CREATE test_xyzm Geometry error: %s\n", err_msg);
   450         -	  sqlite3_free (err_msg);
   451         -	  sqlite3_close (handle);
   452         -	  return -13;
   453         -      }
   454         -    ret = sqlite3_exec (handle, "INSERT INTO test_xyzm VALUES (NULL, "
   455         -			"GeomFromText('GEOMETRYCOLLECTIONZM(POINTZM(0 0 1 1), "
   456         -			"LINESTRINGZM(1 1 1 1, 2 2 3 3), "
   457         -			"POLYGONZM((10 10 1 1, 20 10 2 2, 20 20 3 3, 10 20 2 2, 10 10 1 1), "
   458         -			"(14 14 1 1, 16 14 2 2, 16 16 2 2, 14 16 2 2, 14 14 1 1)))', 4326))",
   459         -			NULL, NULL, &err_msg);
   460         -    if (ret != SQLITE_OK)
   461         -      {
   462         -	  fprintf (stderr, "INSERT INTO test_xyzm Geometry error: %s\n",
   463         -		   err_msg);
   464         -	  sqlite3_free (err_msg);
   465         -	  sqlite3_close (handle);
   466         -	  return -14;
   467         -      }
   468         -
   469         -/* creating and populating Point table #1 - XY */
   470         -    ret = sqlite3_exec (handle, "CREATE TABLE point_a_xy ("
   471         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   472         -			&err_msg);
   473         -    if (ret != SQLITE_OK)
   474         -      {
   475         -	  fprintf (stderr, "CREATE point_a_xy error: %s\n", err_msg);
   476         -	  sqlite3_free (err_msg);
   477         -	  sqlite3_close (handle);
   478         -	  return -15;
   479         -      }
   480         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   481         -			"'point_a_xy', 'geometry', 4326, 'POINT', 'XY')", NULL,
   482         -			NULL, &err_msg);
   483         -    if (ret != SQLITE_OK)
   484         -      {
   485         -	  fprintf (stderr, "CREATE point_a_xy Geometry error: %s\n", err_msg);
   486         -	  sqlite3_free (err_msg);
   487         -	  sqlite3_close (handle);
   488         -	  return -16;
   489         -      }
   490         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xy VALUES "
   491         -			"(NULL, MakePoint(0, 0, 4326)), (NULL, MakePoint(1, 1, 4326)), "
   492         -			"(NULL, MakePoint(10, 10, 4326)), (NULL, MakePoint(11, 11, 4326)), "
   493         -			"(NULL, MakePoint(10, 0, 4326)), (NULL, MakePoint(11, 1, 4326)), "
   494         -			"(NULL, MakePoint(0, 10, 4326)), (NULL, MakePoint(1, 11, 4326)) ",
   495         -			NULL, NULL, &err_msg);
   496         -    if (ret != SQLITE_OK)
   497         -      {
   498         -	  fprintf (stderr, "INSERT INTO point_a_xy Geometry error: %s\n",
   499         -		   err_msg);
   500         -	  sqlite3_free (err_msg);
   501         -	  sqlite3_close (handle);
   502         -	  return -17;
   503         -      }
   504         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xy VALUES "
   505         -			"(NULL, MakePoint(5, 4, 4326)), (NULL, MakePoint(4, 5, 4326)), "
   506         -			"(NULL, MakePoint(8, 2, 4326)), (NULL, MakePoint(2, 8, 4326)), "
   507         -			"(NULL, MakePoint(20, 20, 4326)), (NULL, MakePoint(21, 21, 4326)), "
   508         -			"(NULL, MakePoint(30, 30, 4326)), (NULL, MakePoint(31, 31, 4326)), "
   509         -			"(NULL, MakePoint(30, 20, 4326)), (NULL, MakePoint(31, 21, 4326)) ",
   510         -			NULL, NULL, &err_msg);
   511         -    if (ret != SQLITE_OK)
   512         -      {
   513         -	  fprintf (stderr, "INSERT INTO point_a_xy Geometry error: %s\n",
   514         -		   err_msg);
   515         -	  sqlite3_free (err_msg);
   516         -	  sqlite3_close (handle);
   517         -	  return -18;
   518         -      }
   519         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xy VALUES "
   520         -			"(NULL, MakePoint(20, 30, 4326)), (NULL, MakePoint(21, 31, 4326)), "
   521         -			"(NULL, MakePoint(25, 24, 4326)), (NULL, MakePoint(24, 25, 4326)), "
   522         -			"(NULL, MakePoint(28, 22, 4326)), (NULL, MakePoint(22, 28, 4326)), "
   523         -			"(NULL, MakePoint(30, 0, 4326)), (NULL, MakePoint(0, 30, 4326)) ",
   524         -			NULL, NULL, &err_msg);
   525         -    if (ret != SQLITE_OK)
   526         -      {
   527         -	  fprintf (stderr, "INSERT INTO point_a_xy Geometry error: %s\n",
   528         -		   err_msg);
   529         -	  sqlite3_free (err_msg);
   530         -	  sqlite3_close (handle);
   531         -	  return -19;
   532         -      }
   533         -
   534         -/* creating and populating Point table #2 - XY */
   535         -    ret = sqlite3_exec (handle, "CREATE TABLE point_b_xy ("
   536         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   537         -			&err_msg);
   538         -    if (ret != SQLITE_OK)
   539         -      {
   540         -	  fprintf (stderr, "CREATE point_b_xy error: %s\n", err_msg);
   541         -	  sqlite3_free (err_msg);
   542         -	  sqlite3_close (handle);
   543         -	  return -20;
   544         -      }
   545         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   546         -			"'point_b_xy', 'geometry', 4326, 'POINT', 'XY')", NULL,
   547         -			NULL, &err_msg);
   548         -    if (ret != SQLITE_OK)
   549         -      {
   550         -	  fprintf (stderr, "CREATE point_b_xy Geometry error: %s\n", err_msg);
   551         -	  sqlite3_free (err_msg);
   552         -	  sqlite3_close (handle);
   553         -	  return -21;
   554         -      }
   555         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xy VALUES "
   556         -			"(NULL, MakePoint(-161 + 0, -64 + 0, 4326)), "
   557         -			"(NULL, MakePoint(-161 + 1, -64 + 1, 4326)), "
   558         -			"(NULL, MakePoint(-161 + 10, -64 + 10, 4326)), "
   559         -			"(NULL, MakePoint(-161 + 11, -64 + 11, 4326)), "
   560         -			"(NULL, MakePoint(-161 + 10, -64 + 0, 4326)), "
   561         -			"(NULL, MakePoint(-161 + 11, -64 + 1, 4326)) ", NULL,
   562         -			NULL, &err_msg);
   563         -    if (ret != SQLITE_OK)
   564         -      {
   565         -	  fprintf (stderr, "INSERT INTO point_b_xy Geometry error: %s\n",
   566         -		   err_msg);
   567         -	  sqlite3_free (err_msg);
   568         -	  sqlite3_close (handle);
   569         -	  return -22;
   570         -      }
   571         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xy VALUES "
   572         -			"(NULL, MakePoint(-161 + 0, -64 + 10, 4326)), "
   573         -			"(NULL, MakePoint(-161 + 1, -64 + 11, 4326)), "
   574         -			"(NULL, MakePoint(-161 + 5, -64 + 4, 4326)), "
   575         -			"(NULL, MakePoint(-161 + 4, -64 + 5, 4326)), "
   576         -			"(NULL, MakePoint(-161 + 8, -64 + 2, 4326)), "
   577         -			"(NULL, MakePoint(-161 + 2, -64 + 8, 4326)) ", NULL,
   578         -			NULL, &err_msg);
   579         -    if (ret != SQLITE_OK)
   580         -      {
   581         -	  fprintf (stderr, "INSERT INTO point_b_xy Geometry error: %s\n",
   582         -		   err_msg);
   583         -	  sqlite3_free (err_msg);
   584         -	  sqlite3_close (handle);
   585         -	  return -23;
   586         -      }
   587         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xy VALUES "
   588         -			"(NULL, MakePoint(-161 + 20, -64 + 20, 4326)), "
   589         -			"(NULL, MakePoint(-161 + 21, -64 + 21, 4326)), "
   590         -			"(NULL, MakePoint(-161 + 30, -64 + 30, 4326)), "
   591         -			"(NULL, MakePoint(-161 + 31, -64 + 31, 4326)), "
   592         -			"(NULL, MakePoint(-161 + 30, -64 + 20, 4326)), "
   593         -			"(NULL, MakePoint(-161 + 31, -64 + 21, 4326)) ", NULL,
   594         -			NULL, &err_msg);
   595         -    if (ret != SQLITE_OK)
   596         -      {
   597         -	  fprintf (stderr, "INSERT INTO point_b_xy Geometry error: %s\n",
   598         -		   err_msg);
   599         -	  sqlite3_free (err_msg);
   600         -	  sqlite3_close (handle);
   601         -	  return -24;
   602         -      }
   603         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xy VALUES "
   604         -			"(NULL, MakePoint(-161 + 20, -64 + 30, 4326)), "
   605         -			"(NULL, MakePoint(-161 + 21, -64 + 31, 4326)), "
   606         -			"(NULL, MakePoint(-161 + 25, -64 + 24, 4326)), "
   607         -			"(NULL, MakePoint(-161 + 24, -64 + 25, 4326)), "
   608         -			"(NULL, MakePoint(-161 + 28, -64 + 22, 4326)), "
   609         -			"(NULL, MakePoint(-161 + 22, -64 + 28, 4326)), "
   610         -			"(NULL, MakePoint(-161 + 30, -64 + 0, 4326)), "
   611         -			"(NULL, MakePoint(-161 + 0, -64 + 30, 4326)) ", NULL,
   612         -			NULL, &err_msg);
   613         -    if (ret != SQLITE_OK)
   614         -      {
   615         -	  fprintf (stderr, "INSERT INTO point_b_xy Geometry error: %s\n",
   616         -		   err_msg);
   617         -	  sqlite3_free (err_msg);
   618         -	  sqlite3_close (handle);
   619         -	  return -25;
   620         -      }
   621         -
   622         -/* creating and populating Point table #1 - XYZ */
   623         -    ret = sqlite3_exec (handle, "CREATE TABLE point_a_xyz ("
   624         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   625         -			&err_msg);
   626         -    if (ret != SQLITE_OK)
   627         -      {
   628         -	  fprintf (stderr, "CREATE point_a_xyz error: %s\n", err_msg);
   629         -	  sqlite3_free (err_msg);
   630         -	  sqlite3_close (handle);
   631         -	  return -26;
   632         -      }
   633         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   634         -			"'point_a_xyz', 'geometry', 4326, 'POINT', 'XYZ')",
   635         -			NULL, NULL, &err_msg);
   636         -    if (ret != SQLITE_OK)
   637         -      {
   638         -	  fprintf (stderr, "CREATE point_a_xy Geometry error: %s\n", err_msg);
   639         -	  sqlite3_free (err_msg);
   640         -	  sqlite3_close (handle);
   641         -	  return -27;
   642         -      }
   643         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xyz VALUES "
   644         -			"(NULL, MakePointZ(0, 0, 1, 4326)), (NULL, MakePointZ(1, 1, 2, 4326)), "
   645         -			"(NULL, MakePointZ(10, 10, 1, 4326)), (NULL, MakePointZ(11, 11, 2, 4326)), "
   646         -			"(NULL, MakePointZ(10, 0, 1, 4326)), (NULL, MakePointZ(11, 1, 2, 4326)), "
   647         -			"(NULL, MakePointZ(0, 10, 1, 4326)), (NULL, MakePointZ(1, 11, 2, 4326)) ",
   648         -			NULL, NULL, &err_msg);
   649         -    if (ret != SQLITE_OK)
   650         -      {
   651         -	  fprintf (stderr, "INSERT INTO point_a_xyz Geometry error: %s\n",
   652         -		   err_msg);
   653         -	  sqlite3_free (err_msg);
   654         -	  sqlite3_close (handle);
   655         -	  return -28;
   656         -      }
   657         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xyz VALUES "
   658         -			"(NULL, MakePointZ(5, 4, 1, 4326)), (NULL, MakePointZ(4, 5, 2, 4326)), "
   659         -			"(NULL, MakePointZ(8, 2, 1, 4326)), (NULL, MakePointZ(2, 8, 2, 4326)), "
   660         -			"(NULL, MakePointZ(20, 20, 1, 4326)), (NULL, MakePointZ(21, 21, 2, 4326)), "
   661         -			"(NULL, MakePointZ(70, 70, 1, 4326)), (NULL, MakePointZ(51, 51, 2, 4326)), "
   662         -			"(NULL, MakePointZ(30, 20, 1, 4326)), (NULL, MakePointZ(31, 21, 2, 4326)) ",
   663         -			NULL, NULL, &err_msg);
   664         -    if (ret != SQLITE_OK)
   665         -      {
   666         -	  fprintf (stderr, "INSERT INTO point_a_xyz Geometry error: %s\n",
   667         -		   err_msg);
   668         -	  sqlite3_free (err_msg);
   669         -	  sqlite3_close (handle);
   670         -	  return -29;
   671         -      }
   672         -    ret = sqlite3_exec (handle, "INSERT INTO point_a_xyz VALUES "
   673         -			"(NULL, MakePointZ(20, 30, 1, 4326)), (NULL, MakePointZ(21, 31, 2, 4326)), "
   674         -			"(NULL, MakePointZ(25, 24, 1, 4326)), (NULL, MakePointZ(24, 25, 2, 4326)), "
   675         -			"(NULL, MakePointZ(28, 22, 1, 4326)), (NULL, MakePointZ(22, 28, 2, 4326)), "
   676         -			"(NULL, MakePointZ(30, 0, 1, 4326)), (NULL, MakePointZ(0, 30, 2, 4326)) ",
   677         -			NULL, NULL, &err_msg);
   678         -    if (ret != SQLITE_OK)
   679         -      {
   680         -	  fprintf (stderr, "INSERT INTO point_a_xyz Geometry error: %s\n",
   681         -		   err_msg);
   682         -	  sqlite3_free (err_msg);
   683         -	  sqlite3_close (handle);
   684         -	  return -30;
   685         -      }
   686         -
   687         -/* creating and populating Point table #2 - XYZ */
   688         -    ret = sqlite3_exec (handle, "CREATE TABLE point_b_xyz ("
   689         -			"id INTEGER PRIMARY KEY AUTOINCREMENT)", NULL, NULL,
   690         -			&err_msg);
   691         -    if (ret != SQLITE_OK)
   692         -      {
   693         -	  fprintf (stderr, "CREATE point_b_xyz error: %s\n", err_msg);
   694         -	  sqlite3_free (err_msg);
   695         -	  sqlite3_close (handle);
   696         -	  return -31;
   697         -      }
   698         -    ret = sqlite3_exec (handle, "SELECT AddGeometryColumn("
   699         -			"'point_b_xyz', 'geometry', 4326, 'POINT', 'XYZ')",
   700         -			NULL, NULL, &err_msg);
   701         -    if (ret != SQLITE_OK)
   702         -      {
   703         -	  fprintf (stderr, "CREATE point_b_xyz Geometry error: %s\n", err_msg);
   704         -	  sqlite3_free (err_msg);
   705         -	  sqlite3_close (handle);
   706         -	  return -32;
   707         -      }
   708         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xyz VALUES "
   709         -			"(NULL, MakePointZ(-161 + 0, -64 + 0, 11, 4326)), "
   710         -			"(NULL, MakePointZ(-161 + 1, -64 + 1, 12, 4326)), "
   711         -			"(NULL, MakePointZ(-161 + 10, -64 + 10, 11, 4326)), "
   712         -			"(NULL, MakePointZ(-161 + 11, -64 + 11, 12, 4326)), "
   713         -			"(NULL, MakePointZ(-161 + 10, -64 + 0, 11, 4326)), "
   714         -			"(NULL, MakePointZ(-161 + 11, -64 + 1, 12, 4326)) ",
   715         -			NULL, NULL, &err_msg);
   716         -    if (ret != SQLITE_OK)
   717         -      {
   718         -	  fprintf (stderr, "INSERT INTO point_b_xyz Geometry error: %s\n",
   719         -		   err_msg);
   720         -	  sqlite3_free (err_msg);
   721         -	  sqlite3_close (handle);
   722         -	  return -33;
   723         -      }
   724         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xyz VALUES "
   725         -			"(NULL, MakePointZ(-161 + 0, -64 + 10, 11, 4326)), "
   726         -			"(NULL, MakePointZ(-161 + 1, -64 + 11, 12, 4326)), "
   727         -			"(NULL, MakePointZ(-161 + 5, -64 + 4, 11, 4326)), "
   728         -			"(NULL, MakePointZ(-161 + 4, -64 + 5, 12, 4326)), "
   729         -			"(NULL, MakePointZ(-161 + 8, -64 + 2, 11, 4326)), "
   730         -			"(NULL, MakePointZ(-161 + 2, -64 + 8, 12, 4326)) ",
   731         -			NULL, NULL, &err_msg);
   732         -    if (ret != SQLITE_OK)
   733         -      {
   734         -	  fprintf (stderr, "INSERT INTO point_b_xyz Geometry error: %s\n",
   735         -		   err_msg);
   736         -	  sqlite3_free (err_msg);
   737         -	  sqlite3_close (handle);
   738         -	  return -34;
   739         -      }
   740         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xyz VALUES "
   741         -			"(NULL, MakePointZ(-161 + 20, -64 + 20, 11, 4326)), "
   742         -			"(NULL, MakePointZ(-161 + 21, -64 + 21, 12, 4326)), "
   743         -			"(NULL, MakePointZ(-161 + 70, -64 + 70, 11, 4326)), "
   744         -			"(NULL, MakePointZ(-161 + 51, -64 + 51, 12, 4326)), "
   745         -			"(NULL, MakePointZ(-161 + 30, -64 + 20, 11, 4326)), "
   746         -			"(NULL, MakePointZ(-161 + 31, -64 + 21, 12, 4326)), "
   747         -			"(NULL, MakePointZ(-161 + 20, -64 + 30, 11, 4326)) ",
   748         -			NULL, NULL, &err_msg);
   749         -    if (ret != SQLITE_OK)
   750         -      {
   751         -	  fprintf (stderr, "INSERT INTO point_b_xyz Geometry error: %s\n",
   752         -		   err_msg);
   753         -	  sqlite3_free (err_msg);
   754         -	  sqlite3_close (handle);
   755         -	  return -35;
   756         -      }
   757         -    ret = sqlite3_exec (handle, "INSERT INTO point_b_xyz VALUES "
   758         -			"(NULL, MakePointZ(-161 + 21, -64 + 31, 12, 4326)), "
   759         -			"(NULL, MakePointZ(-161 + 25, -64 + 24, 11, 4326)), "
   760         -			"(NULL, MakePointZ(-161 + 24, -64 + 25, 12, 4326)), "
   761         -			"(NULL, MakePointZ(-161 + 28, -64 + 22, 11, 4326)), "
   762         -			"(NULL, MakePointZ(-161 + 22, -64 + 28, 12, 4326)), "
   763         -			"(NULL, MakePointZ(-161 + 30, -64 + 0, 11, 4326)), "
   764         -			"(NULL, MakePointZ(-161 + 0, -64 + 30, 12, 4326)) ",
   765         -			NULL, NULL, &err_msg);
   766         -    if (ret != SQLITE_OK)
   767         -      {
   768         -	  fprintf (stderr, "INSERT INTO point_b_xyz Geometry error: %s\n",
   769         -		   err_msg);
   770         -	  sqlite3_free (err_msg);
   771         -	  sqlite3_close (handle);
   772         -	  return -36;
   773         -      }
   774         -
   775         -/* resolving Control Points 2D - 1st order - IsValid */
   776         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 1)) "
   777         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   778         -    if (!test_query (handle, sql, "1"))
   779         -	return -37;
   780         -/* resolving Control Points 2D  - 1st order- AsText */
   781         -    sql = "SELECT GCP_AsText(GCP_Compute(a.geometry, b.geometry)) "
   782         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   783         -    if (!test_query
   784         -	(handle, sql,
   785         -	 "E{-161.0000000000,1.0000000000,-0.0000000000}, "
   786         -	 "N{-64.0000000000,-0.0000000000,1.0000000000}"))
   787         -	return -38;
   788         -
   789         -/* resolving Control Points 2D - 1st order - GCP2ATM */
   790         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry))) "
   791         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   792         -    if (!test_query (handle, sql, "1"))
   793         -	return -39;
   794         -
   795         -/* resolving Control Points 3D - 1st order - IsValid */
   796         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 1)) "
   797         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   798         -    if (!test_query (handle, sql, "1"))
   799         -	return -40;
   800         -
   801         -/* resolving Control Points 3D - 1st order - AsText */
   802         -    sql = "SELECT GCP_AsText(GCP_Compute(a.geometry, b.geometry)) "
   803         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   804         -    if (!test_query (handle, sql,
   805         -		     "E{-161.0000000000,1.0000000000,-0.0000000000,0.0000000000}, "
   806         -		     "N{-64.0000000000,0.0000000000,1.0000000000,0.0000000000}, "
   807         -		     "Z{10.0000000000,-0.0000000000,0.0000000000,1.0000000000}"))
   808         -	return -41;
   809         -
   810         -/* resolving Control Points 3D - 1st order - GCP2ATM */
   811         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry))) "
   812         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   813         -    if (!test_query (handle, sql, "1"))
   814         -	return -42;
   815         -
   816         -/* resolving Control Points 2D - 2nd order - IsValid */
   817         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 2)) "
   818         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   819         -    if (!test_query (handle, sql, "1"))
   820         -	return -43;
   821         -
   822         -/* resolving Control Points 2D  - 2nd order- AsText */
   823         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 2)) "
   824         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   825         -    if (!test_query	(handle, sql,"1"))
   826         -	return -44;
   827         -
   828         -/* resolving Control Points 2D - 2nd order - GCP2ATM */
   829         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry, 2))) "
   830         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   831         -    if (!test_query (handle, sql, "-1"))
   832         -	return -45;
   833         -
   834         -/* resolving Control Points 3D - 2nd order - IsValid */
   835         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 2)) "
   836         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   837         -    if (!test_query (handle, sql, "1"))
   838         -	return -46;
   839         -
   840         -/* resolving Control Points 3D - 2nd order - AsText */
   841         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 2)) "
   842         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   843         -    if (!test_query (handle, sql, "1"))
   844         -	return -47;
   845         -
   846         -/* resolving Control Points 3D - 2nd order - GCP2ATM */
   847         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry, 2))) "
   848         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   849         -    if (!test_query (handle, sql, "-1"))
   850         -	return -48;
   851         -
   852         -/* resolving Control Points 2D - 3nd order - IsValid */
   853         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 3)) "
   854         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   855         -    if (!test_query (handle, sql, "1"))
   856         -	return -49;
   857         -
   858         -/* resolving Control Points 2D  - 3nd order- AsText */
   859         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 3)) "
   860         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   861         -    if (!test_query (handle, sql, "1"))
   862         -	return -50;
   863         -
   864         -/* resolving Control Points 2D - 3nd order - GCP2ATM */
   865         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry, 3))) "
   866         -	"FROM point_a_xy AS a, point_b_xy AS b WHERE a.id = b.id";
   867         -    if (!test_query (handle, sql, "-1"))
   868         -	return -51;
   869         -
   870         -/* resolving Control Points 3D - 3nd order - IsValid */
   871         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 3)) "
   872         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   873         -    if (!test_query (handle, sql, "1"))
   874         -	return -52;
   875         -
   876         -/* resolving Control Points 3D - 3nd order - AsText */
   877         -    sql = "SELECT GCP_IsValid(GCP_Compute(a.geometry, b.geometry, 3)) "
   878         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   879         -    if (!test_query (handle, sql, "1"))
   880         -	return -53;
   881         -
   882         -/* resolving Control Points 3D - 3nd order - GCP2ATM */
   883         -    sql = "SELECT ATM_IsValid(GCP2ATM(GCP_Compute(a.geometry, b.geometry, 3))) "
   884         -	"FROM point_a_xyz AS a, point_b_xyz AS b WHERE a.id = b.id";
   885         -    if (!test_query (handle, sql, "-1"))
   886         -	return -54;
   887         -
   888         -    for (order = 0; order <= 3; order++)
   889         -      {
   890         -	  /* GCP_Trasform */
   891         -	  if (!test_transform (handle, order))
   892         -	      return -55;
   893         -      }
   894         -
   895         -    if (!test_invalid (handle))
   896         -	return -56;
   897         -
   898         -    ret = sqlite3_close (handle);
   899         -    if (ret != SQLITE_OK)
   900         -      {
   901         -	  fprintf (stderr, "sqlite3_close() error: %s\n",
   902         -		   sqlite3_errmsg (handle));
   903         -	  return -57;
   904         -      }
   905         -
   906         -    spatialite_cleanup_ex (cache);
   907         -
   908         -#endif /* end CGP conditional */
   909         -
   910         -    spatialite_shutdown ();
   911         -    return 0;
   912         -}

Changes to test/check_sql_stmt.c.

   158    158   	  return 0;
   159    159         }
   160    160       return 1;
   161    161   }
   162    162   
   163    163   int
   164    164   do_one_case (struct db_conn *conn, const struct test_data *data,
   165         -	     int load_extension, int gpkg_amphibious_mode)
          165  +	     int load_extension)
   166    166   {
   167    167       sqlite3 *db_handle = NULL;
   168    168       int ret;
   169    169       char *err_msg = NULL;
   170    170       int i;
   171    171       char **results;
   172    172       int rows;
................................................................................
   258    258         {
   259    259   	  fprintf (stderr, "InitSpatialMetadata() error: %s\n", err_msg);
   260    260   	  sqlite3_free (err_msg);
   261    261   	  return -2;
   262    262         }
   263    263     skip_init:
   264    264   
   265         -    if (gpkg_amphibious_mode)
   266         -      {
   267         -	  sqlite3_exec (db_handle, "SELECT EnableGpkgAmphibiousMode()",
   268         -			NULL, NULL, NULL);
   269         -      }
   270    265       ret =
   271    266   	sqlite3_get_table (db_handle, data->sql_statement, &results, &rows,
   272    267   			   &columns, &err_msg);
   273         -    if (gpkg_amphibious_mode)
   274         -      {
   275         -	  sqlite3_exec (db_handle, "SELECT DisableGpkgAmphibiousMode()",
   276         -			NULL, NULL, NULL);
   277         -      }
   278    268       if (ret != SQLITE_OK)
   279    269         {
   280    270   	  fprintf (stderr, "Error: %s\n", err_msg);
   281    271   	  sqlite3_free (err_msg);
   282    272   	  return -10;
   283    273         }
   284    274       if ((rows != data->expected_rows) || (columns != data->expected_columns))
................................................................................
   463    453   test_case_filter (const struct dirent *entry)
   464    454   {
   465    455       return (fnmatch ("*.testcase", entry->d_name, FNM_PERIOD) == 0);
   466    456   }
   467    457   
   468    458   int
   469    459   run_subdir_test (const char *subdirname, struct db_conn *conn,
   470         -		 int load_extension, int gpkg_amphibious_mode)
          460  +		 int load_extension)
   471    461   {
   472    462       struct dirent **namelist;
   473    463       int n;
   474    464       int i;
   475    465       int result = 0;
   476    466   
   477    467       n = scandir (subdirname, &namelist, test_case_filter, alphasort);
................................................................................
   488    478   	  if (asprintf (&path, "%s/%s", subdirname, namelist[i]->d_name) < 0)
   489    479   	    {
   490    480   		return -1;
   491    481   	    }
   492    482   	  data = read_one_case (path);
   493    483   	  free (path);
   494    484   
   495         -	  result =
   496         -	      do_one_case (conn, data, load_extension, gpkg_amphibious_mode);
          485  +	  result = do_one_case (conn, data, load_extension);
   497    486   
   498    487   	  cleanup_test_data (data);
   499    488   	  if (result != 0)
   500    489   	    {
   501    490   		return result;
   502    491   	    }
   503    492   	  free (namelist[i]);
   504    493         }
   505    494       free (namelist);
   506    495       return result;
   507    496   }
   508    497   
   509    498   int
   510         -run_all_testcases (struct db_conn *conn, int load_extension, int legacy)
          499  +run_all_testcases (struct db_conn *conn, int load_extension)
   511    500   {
   512    501       int ret;
   513    502       int result = 0;
   514    503       const char *security_level;
   515    504   
   516         -    result = run_subdir_test ("sql_stmt_tests", conn, load_extension, 0);
          505  +    result = run_subdir_test ("sql_stmt_tests", conn, load_extension);
   517    506       if (result != 0)
   518    507         {
   519    508   	  return result;
   520    509         }
   521    510   
   522    511       security_level = getenv ("SPATIALITE_SECURITY");
   523    512       if (security_level == NULL)
   524    513   	;
   525    514       else if (strcasecmp (security_level, "relaxed") == 0)
   526    515         {
   527    516   	  result =
   528         -	      run_subdir_test ("sql_stmt_security_tests", conn, load_extension,
   529         -			       0);
          517  +	      run_subdir_test ("sql_stmt_security_tests", conn, load_extension);
   530    518   	  if (result != 0)
   531    519   	    {
   532    520   		return result;
   533    521   	    }
   534    522         }
   535    523   
   536    524   #ifndef OMIT_MATHSQL		/* only if MATHSQL is supported */
   537         -    result =
   538         -	run_subdir_test ("sql_stmt_mathsql_tests", conn, load_extension, 0);
          525  +    result = run_subdir_test ("sql_stmt_mathsql_tests", conn, load_extension);
   539    526       if (result != 0)
   540    527         {
   541    528   	  return result;
   542    529         }
   543    530   #endif /* end MATHSQL conditional */
   544    531   
   545    532   #ifndef OMIT_EPSG		/* only if full EPSG is supported */
   546    533   #ifndef OMIT_PROJ		/* only if PROJ is supported */
   547         -    result = run_subdir_test ("sql_stmt_proj_tests", conn, load_extension, 0);
          534  +    result = run_subdir_test ("sql_stmt_proj_tests", conn, load_extension);
   548    535       if (result != 0)
   549    536         {
   550    537   	  return result;
   551    538         }
   552    539   #endif /* end PROJ conditional */
   553    540   #endif /* end EPSG conditional */
   554    541   
................................................................................
   568    555       ret = system ("cp test_geos.sqlite test_geos_x.sqlite");
   569    556       if (ret != 0)
   570    557         {
   571    558   	  fprintf (stderr, "cannot copy test_geos database\n");
   572    559   	  return -1;
   573    560         }
   574    561   
   575         -    result = run_subdir_test ("sql_stmt_geos_tests", conn, load_extension, 0);
          562  +    result = run_subdir_test ("sql_stmt_geos_tests", conn, load_extension);
   576    563       if (result != 0)
   577    564         {
   578    565   	  return result;
   579    566         }
   580    567   
   581    568       ret = unlink ("test_geos_x.sqlite");
   582    569       if (ret != 0)
................................................................................
   598    585   	   */
   599    586   	  fprintf (stderr,
   600    587   		   "WARNING: skipping GEOS_ADVANCED testcases; obsolete version found !!!\n");
   601    588   	  goto skip_geos_advanced;
   602    589         }
   603    590   
   604    591       result =
   605         -	run_subdir_test ("sql_stmt_geosadvanced_tests", conn, load_extension,
   606         -			 0);
          592  +	run_subdir_test ("sql_stmt_geosadvanced_tests", conn, load_extension);
   607    593       if (result != 0)
   608    594         {
   609    595   	  return result;
   610    596         }
   611    597   
   612    598     skip_geos_advanced:
   613    599   #endif /* end GEOS_ADVANCED conditional */
   614    600   
   615    601   #ifdef ENABLE_LWGEOM		/* only if LWGEOM is supported */
   616         -    result = run_subdir_test ("sql_stmt_lwgeom_tests", conn, load_extension, 0);
          602  +    result = run_subdir_test ("sql_stmt_lwgeom_tests", conn, load_extension);
   617    603       if (result != 0)
   618    604         {
   619    605   	  return result;
   620    606         }
   621    607   
   622    608   #endif /* end LWGEOM conditional */
   623    609   
   624    610   #ifdef ENABLE_LIBXML2		/* only if LIBXML2 is supported */
   625         -    result =
   626         -	run_subdir_test ("sql_stmt_libxml2_tests", conn, load_extension, 0);
          611  +    result = run_subdir_test ("sql_stmt_libxml2_tests", conn, load_extension);
   627    612       if (result != 0)
   628    613         {
   629    614   	  return result;
   630    615         }
   631    616   
   632    617       security_level = getenv ("SPATIALITE_SECURITY");
   633    618       if (security_level == NULL)
   634    619   	;
   635    620       else if (strcasecmp (security_level, "relaxed") == 0)
   636    621         {
   637    622   	  result =
   638         -	      run_subdir_test ("sql_stmt_xmlsec_tests", conn, load_extension,
   639         -			       0);
          623  +	      run_subdir_test ("sql_stmt_xmlsec_tests", conn, load_extension);
   640    624   	  if (result != 0)
   641    625   	    {
   642    626   		return result;
   643    627   	    }
   644    628         }
   645    629   
   646    630   #endif /* end LIBXML2 conditional */
   647    631   
   648    632   #ifdef ENABLE_GEOPACKAGE	/* only if GeoPackage support is enabled */
   649         -    if (!legacy)
          633  +    result =
          634  +	run_subdir_test ("sql_stmt_geopackage_tests", conn, load_extension);
          635  +    if (result != 0)
   650    636         {
   651         -	  result =
   652         -	      run_subdir_test ("sql_stmt_geopackage_tests", conn,
   653         -			       load_extension, 1);
   654         -	  if (result != 0)
   655         -	    {
   656         -		return result;
   657         -	    }
          637  +	  return result;
   658    638         }
   659    639   
   660    640   #endif /* end GEOPACKAGE conditional */
   661    641   
   662    642   #ifndef OMIT_FREEXL		/* FREEXL is enabled */
   663    643       security_level = getenv ("SPATIALITE_SECURITY");
   664    644       if (security_level == NULL)
   665    645   	;
   666    646       else if (strcasecmp (security_level, "relaxed") == 0)
   667    647         {
   668    648   	  result =
   669         -	      run_subdir_test ("sql_stmt_freexl_tests", conn, load_extension,
   670         -			       0);
          649  +	      run_subdir_test ("sql_stmt_freexl_tests", conn, load_extension);
   671    650   	  if (result != 0)
   672    651   	    {
   673    652   		return result;
   674    653   	    }
   675    654         }
   676    655   #endif /* end FREEXL support */
   677    656   
   678         -/* testing global settings SQL functions */
   679         -    if (legacy)
   680         -      {
   681         -	  result =
   682         -	      run_subdir_test ("sql_stmt_nocache_tests", conn, load_extension,
   683         -			       0);
   684         -	  if (result != 0)
   685         -	    {
   686         -		return result;
   687         -	    }
   688         -      }
   689         -    else
   690         -      {
   691         -	  result =
   692         -	      run_subdir_test ("sql_stmt_cache_tests", conn, load_extension, 0);
   693         -	  if (result != 0)
   694         -	    {
   695         -		return result;
   696         -	    }
   697         -      }
   698         -
   699    657       return result;
   700    658   }
   701    659   
   702    660   int
   703    661   run_specified_testcases (int argc, char *argv[], struct db_conn *conn,
   704    662   			 int load_extension)
   705    663   {
................................................................................
   706    664       int result = 0;
   707    665       int i = 0;
   708    666   
   709    667       for (i = 1; i < argc; ++i)
   710    668         {
   711    669   	  struct test_data *data;
   712    670   	  data = read_one_case (argv[i]);
   713         -	  result = do_one_case (conn, data, load_extension, 0);
          671  +	  result = do_one_case (conn, data, load_extension);
   714    672   	  cleanup_test_data (data);
   715    673   	  if (result != 0)
   716    674   	    {
   717    675   		break;
   718    676   	    }
   719    677         }
   720    678       return result;
................................................................................
   729    687       conn.db_path = NULL;
   730    688       conn.db_handle = NULL;
   731    689       conn.cache = cache;
   732    690   
   733    691   /* testing in current mode */
   734    692       if (argc == 1)
   735    693         {
   736         -	  result = run_all_testcases (&conn, 0, 0);
          694  +	  result = run_all_testcases (&conn, 0);
   737    695         }
   738    696       else
   739    697         {
   740    698   	  result = run_specified_testcases (argc, argv, &conn, 0);
   741    699         }
   742    700       if (result != 0)
   743    701         {
................................................................................
   754    712       if (result == 0)
   755    713         {
   756    714   	  /* testing again in legacy mode */
   757    715   	  fprintf (stderr,
   758    716   		   "\n****************** testing again in legacy mode\n\n");
   759    717   	  if (argc == 1)
   760    718   	    {
   761         -		result = run_all_testcases (&conn, 0, 1);
          719  +		result = run_all_testcases (&conn, 0);
   762    720   	    }
   763    721   	  else
   764    722   	    {
   765    723   		result = run_specified_testcases (argc, argv, &conn, 0);
   766    724   	    }
   767    725   	  close_connection (&conn);
   768    726         }
................................................................................
   770    728       if (result == 0)
   771    729         {
   772    730   	  /* testing again in load_extension mode */
   773    731   	  fprintf (stderr,
   774    732   		   "\n****************** testing again in load_extension mode\n\n");
   775    733   	  if (argc == 1)
   776    734   	    {
   777         -		result = run_all_testcases (&conn, 1, 0);
          735  +		result = run_all_testcases (&conn, 1);
   778    736   	    }
   779    737   	  else
   780    738   	    {
   781    739   		result = run_specified_testcases (argc, argv, &conn, 1);
   782    740   	    }
   783    741   	  close_connection (&conn);
   784    742         }
   785    743   
   786    744       spatialite_shutdown ();
   787    745       return result;
   788    746   }

Deleted test/gpkg_test_broken.gpkg.

cannot compute difference between binary files

Deleted test/gpkg_test_extrasrid.gpkg.

cannot compute difference between binary files

Deleted test/sql_stmt_cache_tests/Makefile.

     1         -# Makefile.in generated by automake 1.14.1 from Makefile.am.
     2         -# test/sql_stmt_cache_tests/Makefile.  Generated from Makefile.in by configure.
     3         -
     4         -# Copyright (C) 1994-2013 Free Software Foundation, Inc.
     5         -
     6         -# This Makefile.in is free software; the Free Software Foundation
     7         -# gives unlimited permission to copy and/or distribute it,
     8         -# with or without modifications, as long as this notice is preserved.
     9         -
    10         -# This program is distributed in the hope that it will be useful,
    11         -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
    12         -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    13         -# PARTICULAR PURPOSE.
    14         -
    15         -
    16         -
    17         -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
    18         -am__make_running_with_option = \
    19         -  case $${target_option-} in \
    20         -      ?) ;; \
    21         -      *) echo "am__make_running_with_option: internal error: invalid" \
    22         -              "target option '$${target_option-}' specified" >&2; \
    23         -         exit 1;; \
    24         -  esac; \
    25         -  has_opt=no; \
    26         -  sane_makeflags=$$MAKEFLAGS; \
    27         -  if $(am__is_gnu_make); then \
    28         -    sane_makeflags=$$MFLAGS; \
    29         -  else \
    30         -    case $$MAKEFLAGS in \
    31         -      *\\[\ \	]*) \
    32         -        bs=\\; \
    33         -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
    34         -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    35         -    esac; \
    36         -  fi; \
    37         -  skip_next=no; \
    38         -  strip_trailopt () \
    39         -  { \
    40         -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
    41         -  }; \
    42         -  for flg in $$sane_makeflags; do \
    43         -    test $$skip_next = yes && { skip_next=no; continue; }; \
    44         -    case $$flg in \
    45         -      *=*|--*) continue;; \
    46         -        -*I) strip_trailopt 'I'; skip_next=yes;; \
    47         -      -*I?*) strip_trailopt 'I';; \
    48         -        -*O) strip_trailopt 'O'; skip_next=yes;; \
    49         -      -*O?*) strip_trailopt 'O';; \
    50         -        -*l) strip_trailopt 'l'; skip_next=yes;; \
    51         -      -*l?*) strip_trailopt 'l';; \
    52         -      -[dEDm]) skip_next=yes;; \
    53         -      -[JT]) skip_next=yes;; \
    54         -    esac; \
    55         -    case $$flg in \
    56         -      *$$target_option*) has_opt=yes; break;; \
    57         -    esac; \
    58         -  done; \
    59         -  test $$has_opt = yes
    60         -am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    61         -am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    62         -pkgdatadir = $(datadir)/libspatialite
    63         -pkgincludedir = $(includedir)/libspatialite
    64         -pkglibdir = $(libdir)/libspatialite
    65         -pkglibexecdir = $(libexecdir)/libspatialite
    66         -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    67         -install_sh_DATA = $(install_sh) -c -m 644
    68         -install_sh_PROGRAM = $(install_sh) -c
    69         -install_sh_SCRIPT = $(install_sh) -c
    70         -INSTALL_HEADER = $(INSTALL_DATA)
    71         -transform = $(program_transform_name)
    72         -NORMAL_INSTALL = :
    73         -PRE_INSTALL = :
    74         -POST_INSTALL = :
    75         -NORMAL_UNINSTALL = :
    76         -PRE_UNINSTALL = :
    77         -POST_UNINSTALL = :
    78         -build_triplet = x86_64-unknown-linux-gnu
    79         -host_triplet = x86_64-unknown-linux-gnu
    80         -subdir = test/sql_stmt_cache_tests
    81         -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    82         -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    83         -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
    84         -	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
    85         -	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
    86         -	$(top_srcdir)/configure.ac
    87         -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    88         -	$(ACLOCAL_M4)
    89         -mkinstalldirs = $(install_sh) -d
    90         -CONFIG_HEADER = $(top_builddir)/config.h
    91         -CONFIG_CLEAN_FILES =
    92         -CONFIG_CLEAN_VPATH_FILES =
    93         -AM_V_P = $(am__v_P_$(V))
    94         -am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
    95         -am__v_P_0 = false
    96         -am__v_P_1 = :
    97         -AM_V_GEN = $(am__v_GEN_$(V))
    98         -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
    99         -am__v_GEN_0 = @echo "  GEN     " $@;
   100         -am__v_GEN_1 = 
   101         -AM_V_at = $(am__v_at_$(V))
   102         -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
   103         -am__v_at_0 = @
   104         -am__v_at_1 = 
   105         -SOURCES =
   106         -DIST_SOURCES =
   107         -am__can_run_installinfo = \
   108         -  case $$AM_UPDATE_INFO_DIR in \
   109         -    n|no|NO) false;; \
   110         -    *) (install-info --version) >/dev/null 2>&1;; \
   111         -  esac
   112         -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
   113         -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   114         -ACLOCAL = aclocal-1.14
   115         -AMTAR = $${TAR-tar}
   116         -AM_DEFAULT_VERBOSITY = 1
   117         -AR = ar
   118         -AS = as
   119         -AUTOCONF = autoconf
   120         -AUTOHEADER = autoheader
   121         -AUTOMAKE = automake-1.14
   122         -AWK = gawk
   123         -CC = gcc
   124         -CCDEPMODE = depmode=gcc3
   125         -CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
   126         -CPP = gcc -E
   127         -CPPFLAGS = 
   128         -CXX = g++
   129         -CXXCPP = g++ -E
   130         -CXXDEPMODE = depmode=gcc3
   131         -CXXFLAGS = -g -O2
   132         -CYGPATH_W = echo
   133         -DEFS = -DHAVE_CONFIG_H
   134         -DEPDIR = .deps
   135         -DLLTOOL = dlltool
   136         -DSYMUTIL = 
   137         -DUMPBIN = 
   138         -ECHO_C = 
   139         -ECHO_N = -n
   140         -ECHO_T = 
   141         -EGREP = /usr/bin/grep -E
   142         -EXEEXT = 
   143         -FGREP = /usr/bin/grep -F
   144         -GEOSCONFIG = /usr/bin/geos-config
   145         -GEOS_CFLAGS = -I/usr/include
   146         -GEOS_LDFLAGS = -L/usr/lib64
   147         -GREP = /usr/bin/grep
   148         -INSTALL = /usr/bin/install -c
   149         -INSTALL_DATA = ${INSTALL} -m 644
   150         -INSTALL_PROGRAM = ${INSTALL}
   151         -INSTALL_SCRIPT = ${INSTALL}
   152         -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
   153         -LD = /usr/bin/ld -m elf_x86_64
   154         -LDFLAGS = 
   155         -LIBOBJS = 
   156         -LIBS = -lfreexl -lproj -lz -lsqlite3  -L/usr/lib64 -lgeos_c -llwgeom -lgeos_c
   157         -LIBTOOL = $(SHELL) $(top_builddir)/libtool
   158         -LIBXML2_CFLAGS = -I/usr/include/libxml2 
   159         -LIBXML2_LIBS = -lxml2 
   160         -LIPO = 
   161         -LN_S = ln -s
   162         -LTLIBOBJS = 
   163         -MAINT = #
   164         -MAKEINFO = makeinfo
   165         -MANIFEST_TOOL = :
   166         -MKDIR_P = /usr/bin/mkdir -p
   167         -NM = /usr/bin/nm -B
   168         -NMEDIT = 
   169         -OBJDUMP = objdump
   170         -OBJEXT = o
   171         -OTOOL = 
   172         -OTOOL64 = 
   173         -PACKAGE = libspatialite
   174         -PACKAGE_BUGREPORT = a.furieri@lqt.it
   175         -PACKAGE_NAME = libspatialite
   176         -PACKAGE_STRING = libspatialite 4.3.0-devel
   177         -PACKAGE_TARNAME = libspatialite
   178         -PACKAGE_URL = 
   179         -PACKAGE_VERSION = 4.3.0-devel
   180         -PATH_SEPARATOR = :
   181         -PKG_CONFIG = /usr/bin/pkg-config
   182         -PKG_CONFIG_LIBDIR = 
   183         -PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
   184         -RANLIB = ranlib
   185         -SED = /usr/bin/sed
   186         -SET_MAKE = 
   187         -SHELL = /bin/sh
   188         -STRIP = strip
   189         -VERSION = 4.3.0-devel
   190         -abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_cache_tests
   191         -abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_cache_tests
   192         -abs_top_builddir = /home/sandro/fossil/libspatialite
   193         -abs_top_srcdir = /home/sandro/fossil/libspatialite
   194         -ac_ct_AR = ar
   195         -ac_ct_CC = gcc
   196         -ac_ct_CXX = g++
   197         -ac_ct_DUMPBIN = 
   198         -am__include = include
   199         -am__leading_dot = .
   200         -am__quote = 
   201         -am__tar = $${TAR-tar} chof - "$$tardir"
   202         -am__untar = $${TAR-tar} xf -
   203         -bindir = ${exec_prefix}/bin
   204         -build = x86_64-unknown-linux-gnu
   205         -build_alias = 
   206         -build_cpu = x86_64
   207         -build_os = linux-gnu
   208         -build_vendor = unknown
   209         -builddir = .
   210         -datadir = ${datarootdir}
   211         -datarootdir = ${prefix}/share
   212         -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
   213         -dvidir = ${docdir}
   214         -exec_prefix = ${prefix}
   215         -host = x86_64-unknown-linux-gnu
   216         -host_alias = 
   217         -host_cpu = x86_64
   218         -host_os = linux-gnu
   219         -host_vendor = unknown
   220         -htmldir = ${docdir}
   221         -includedir = ${prefix}/include
   222         -infodir = ${datarootdir}/info
   223         -install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
   224         -libdir = ${exec_prefix}/lib
   225         -libexecdir = ${exec_prefix}/libexec
   226         -localedir = ${datarootdir}/locale
   227         -localstatedir = ${prefix}/var
   228         -mandir = ${datarootdir}/man
   229         -mkdir_p = $(MKDIR_P)
   230         -oldincludedir = /usr/include
   231         -pdfdir = ${docdir}
   232         -prefix = /usr/local
   233         -program_transform_name = s,x,x,
   234         -psdir = ${docdir}
   235         -sbindir = ${exec_prefix}/sbin
   236         -sharedstatedir = ${prefix}/com
   237         -srcdir = .
   238         -sysconfdir = ${prefix}/etc
   239         -target_alias = 
   240         -top_build_prefix = ../../
   241         -top_builddir = ../..
   242         -top_srcdir = ../..
   243         -EXTRA_DIST = amphibious1.testcase \
   244         -	amphibious2.testcase \
   245         -	precision1.testcase \
   246         -	precision2.testcase \
   247         -	precision3.testcase \
   248         -	precision4.testcase \
   249         -	precision5.testcase \
   250         -	precision6.testcase \
   251         -	precision7.testcase 
   252         -
   253         -all: all-am
   254         -
   255         -.SUFFIXES:
   256         -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
   257         -	@for dep in $?; do \
   258         -	  case '$(am__configure_deps)' in \
   259         -	    *$$dep*) \
   260         -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   261         -	        && { if test -f $@; then exit 0; else break; fi; }; \
   262         -	      exit 1;; \
   263         -	  esac; \
   264         -	done; \
   265         -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile'; \
   266         -	$(am__cd) $(top_srcdir) && \
   267         -	  $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile
   268         -.PRECIOUS: Makefile
   269         -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   270         -	@case '$?' in \
   271         -	  *config.status*) \
   272         -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   273         -	  *) \
   274         -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   275         -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   276         -	esac;
   277         -
   278         -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   279         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   280         -
   281         -$(top_srcdir)/configure: # $(am__configure_deps)
   282         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   283         -$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
   284         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   285         -$(am__aclocal_m4_deps):
   286         -
   287         -mostlyclean-libtool:
   288         -	-rm -f *.lo
   289         -
   290         -clean-libtool:
   291         -	-rm -rf .libs _libs
   292         -tags TAGS:
   293         -
   294         -ctags CTAGS:
   295         -
   296         -cscope cscopelist:
   297         -
   298         -
   299         -distdir: $(DISTFILES)
   300         -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   301         -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   302         -	list='$(DISTFILES)'; \
   303         -	  dist_files=`for file in $$list; do echo $$file; done | \
   304         -	  sed -e "s|^$$srcdirstrip/||;t" \
   305         -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   306         -	case $$dist_files in \
   307         -	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   308         -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   309         -			   sort -u` ;; \
   310         -	esac; \
   311         -	for file in $$dist_files; do \
   312         -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   313         -	  if test -d $$d/$$file; then \
   314         -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   315         -	    if test -d "$(distdir)/$$file"; then \
   316         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   317         -	    fi; \
   318         -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   319         -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   320         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   321         -	    fi; \
   322         -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   323         -	  else \
   324         -	    test -f "$(distdir)/$$file" \
   325         -	    || cp -p $$d/$$file "$(distdir)/$$file" \
   326         -	    || exit 1; \
   327         -	  fi; \
   328         -	done
   329         -check-am: all-am
   330         -check: check-am
   331         -all-am: Makefile
   332         -installdirs:
   333         -install: install-am
   334         -install-exec: install-exec-am
   335         -install-data: install-data-am
   336         -uninstall: uninstall-am
   337         -
   338         -install-am: all-am
   339         -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   340         -
   341         -installcheck: installcheck-am
   342         -install-strip:
   343         -	if test -z '$(STRIP)'; then \
   344         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   345         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   346         -	      install; \
   347         -	else \
   348         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   349         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   350         -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
   351         -	fi
   352         -mostlyclean-generic:
   353         -
   354         -clean-generic:
   355         -
   356         -distclean-generic:
   357         -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   358         -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   359         -
   360         -maintainer-clean-generic:
   361         -	@echo "This command is intended for maintainers to use"
   362         -	@echo "it deletes files that may require special tools to rebuild."
   363         -clean: clean-am
   364         -
   365         -clean-am: clean-generic clean-libtool mostlyclean-am
   366         -
   367         -distclean: distclean-am
   368         -	-rm -f Makefile
   369         -distclean-am: clean-am distclean-generic
   370         -
   371         -dvi: dvi-am
   372         -
   373         -dvi-am:
   374         -
   375         -html: html-am
   376         -
   377         -html-am:
   378         -
   379         -info: info-am
   380         -
   381         -info-am:
   382         -
   383         -install-data-am:
   384         -
   385         -install-dvi: install-dvi-am
   386         -
   387         -install-dvi-am:
   388         -
   389         -install-exec-am:
   390         -
   391         -install-html: install-html-am
   392         -
   393         -install-html-am:
   394         -
   395         -install-info: install-info-am
   396         -
   397         -install-info-am:
   398         -
   399         -install-man:
   400         -
   401         -install-pdf: install-pdf-am
   402         -
   403         -install-pdf-am:
   404         -
   405         -install-ps: install-ps-am
   406         -
   407         -install-ps-am:
   408         -
   409         -installcheck-am:
   410         -
   411         -maintainer-clean: maintainer-clean-am
   412         -	-rm -f Makefile
   413         -maintainer-clean-am: distclean-am maintainer-clean-generic
   414         -
   415         -mostlyclean: mostlyclean-am
   416         -
   417         -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
   418         -
   419         -pdf: pdf-am
   420         -
   421         -pdf-am:
   422         -
   423         -ps: ps-am
   424         -
   425         -ps-am:
   426         -
   427         -uninstall-am:
   428         -
   429         -.MAKE: install-am install-strip
   430         -
   431         -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
   432         -	cscopelist-am ctags-am distclean distclean-generic \
   433         -	distclean-libtool distdir dvi dvi-am html html-am info info-am \
   434         -	install install-am install-data install-data-am install-dvi \
   435         -	install-dvi-am install-exec install-exec-am install-html \
   436         -	install-html-am install-info install-info-am install-man \
   437         -	install-pdf install-pdf-am install-ps install-ps-am \
   438         -	install-strip installcheck installcheck-am installdirs \
   439         -	maintainer-clean maintainer-clean-generic mostlyclean \
   440         -	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   441         -	tags-am uninstall uninstall-am
   442         -
   443         -
   444         -# Tell versions [3.59,3.63) of GNU make to not export all variables.
   445         -# Otherwise a system limit (for SysV at least) may be exceeded.
   446         -.NOEXPORT:

Deleted test/sql_stmt_cache_tests/Makefile.am.

     1         -
     2         -EXTRA_DIST = amphibious1.testcase \
     3         -	amphibious2.testcase \
     4         -	precision1.testcase \
     5         -	precision2.testcase \
     6         -	precision3.testcase \
     7         -	precision4.testcase \
     8         -	precision5.testcase \
     9         -	precision6.testcase \
    10         -	precision7.testcase 
    11         -	

Deleted test/sql_stmt_cache_tests/Makefile.in.

     1         -# Makefile.in generated by automake 1.14.1 from Makefile.am.
     2         -# @configure_input@
     3         -
     4         -# Copyright (C) 1994-2013 Free Software Foundation, Inc.
     5         -
     6         -# This Makefile.in is free software; the Free Software Foundation
     7         -# gives unlimited permission to copy and/or distribute it,
     8         -# with or without modifications, as long as this notice is preserved.
     9         -
    10         -# This program is distributed in the hope that it will be useful,
    11         -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
    12         -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    13         -# PARTICULAR PURPOSE.
    14         -
    15         -@SET_MAKE@
    16         -VPATH = @srcdir@
    17         -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
    18         -am__make_running_with_option = \
    19         -  case $${target_option-} in \
    20         -      ?) ;; \
    21         -      *) echo "am__make_running_with_option: internal error: invalid" \
    22         -              "target option '$${target_option-}' specified" >&2; \
    23         -         exit 1;; \
    24         -  esac; \
    25         -  has_opt=no; \
    26         -  sane_makeflags=$$MAKEFLAGS; \
    27         -  if $(am__is_gnu_make); then \
    28         -    sane_makeflags=$$MFLAGS; \
    29         -  else \
    30         -    case $$MAKEFLAGS in \
    31         -      *\\[\ \	]*) \
    32         -        bs=\\; \
    33         -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
    34         -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    35         -    esac; \
    36         -  fi; \
    37         -  skip_next=no; \
    38         -  strip_trailopt () \
    39         -  { \
    40         -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
    41         -  }; \
    42         -  for flg in $$sane_makeflags; do \
    43         -    test $$skip_next = yes && { skip_next=no; continue; }; \
    44         -    case $$flg in \
    45         -      *=*|--*) continue;; \
    46         -        -*I) strip_trailopt 'I'; skip_next=yes;; \
    47         -      -*I?*) strip_trailopt 'I';; \
    48         -        -*O) strip_trailopt 'O'; skip_next=yes;; \
    49         -      -*O?*) strip_trailopt 'O';; \
    50         -        -*l) strip_trailopt 'l'; skip_next=yes;; \
    51         -      -*l?*) strip_trailopt 'l';; \
    52         -      -[dEDm]) skip_next=yes;; \
    53         -      -[JT]) skip_next=yes;; \
    54         -    esac; \
    55         -    case $$flg in \
    56         -      *$$target_option*) has_opt=yes; break;; \
    57         -    esac; \
    58         -  done; \
    59         -  test $$has_opt = yes
    60         -am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    61         -am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    62         -pkgdatadir = $(datadir)/@PACKAGE@
    63         -pkgincludedir = $(includedir)/@PACKAGE@
    64         -pkglibdir = $(libdir)/@PACKAGE@
    65         -pkglibexecdir = $(libexecdir)/@PACKAGE@
    66         -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    67         -install_sh_DATA = $(install_sh) -c -m 644
    68         -install_sh_PROGRAM = $(install_sh) -c
    69         -install_sh_SCRIPT = $(install_sh) -c
    70         -INSTALL_HEADER = $(INSTALL_DATA)
    71         -transform = $(program_transform_name)
    72         -NORMAL_INSTALL = :
    73         -PRE_INSTALL = :
    74         -POST_INSTALL = :
    75         -NORMAL_UNINSTALL = :
    76         -PRE_UNINSTALL = :
    77         -POST_UNINSTALL = :
    78         -build_triplet = @build@
    79         -host_triplet = @host@
    80         -subdir = test/sql_stmt_cache_tests
    81         -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    82         -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    83         -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
    84         -	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
    85         -	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
    86         -	$(top_srcdir)/configure.ac
    87         -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    88         -	$(ACLOCAL_M4)
    89         -mkinstalldirs = $(install_sh) -d
    90         -CONFIG_HEADER = $(top_builddir)/config.h
    91         -CONFIG_CLEAN_FILES =
    92         -CONFIG_CLEAN_VPATH_FILES =
    93         -AM_V_P = $(am__v_P_@AM_V@)
    94         -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    95         -am__v_P_0 = false
    96         -am__v_P_1 = :
    97         -AM_V_GEN = $(am__v_GEN_@AM_V@)
    98         -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    99         -am__v_GEN_0 = @echo "  GEN     " $@;
   100         -am__v_GEN_1 = 
   101         -AM_V_at = $(am__v_at_@AM_V@)
   102         -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
   103         -am__v_at_0 = @
   104         -am__v_at_1 = 
   105         -SOURCES =
   106         -DIST_SOURCES =
   107         -am__can_run_installinfo = \
   108         -  case $$AM_UPDATE_INFO_DIR in \
   109         -    n|no|NO) false;; \
   110         -    *) (install-info --version) >/dev/null 2>&1;; \
   111         -  esac
   112         -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
   113         -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   114         -ACLOCAL = @ACLOCAL@
   115         -AMTAR = @AMTAR@
   116         -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
   117         -AR = @AR@
   118         -AS = @AS@
   119         -AUTOCONF = @AUTOCONF@
   120         -AUTOHEADER = @AUTOHEADER@
   121         -AUTOMAKE = @AUTOMAKE@
   122         -AWK = @AWK@
   123         -CC = @CC@
   124         -CCDEPMODE = @CCDEPMODE@
   125         -CFLAGS = @CFLAGS@
   126         -CPP = @CPP@
   127         -CPPFLAGS = @CPPFLAGS@
   128         -CXX = @CXX@
   129         -CXXCPP = @CXXCPP@
   130         -CXXDEPMODE = @CXXDEPMODE@
   131         -CXXFLAGS = @CXXFLAGS@
   132         -CYGPATH_W = @CYGPATH_W@
   133         -DEFS = @DEFS@
   134         -DEPDIR = @DEPDIR@
   135         -DLLTOOL = @DLLTOOL@
   136         -DSYMUTIL = @DSYMUTIL@
   137         -DUMPBIN = @DUMPBIN@
   138         -ECHO_C = @ECHO_C@
   139         -ECHO_N = @ECHO_N@
   140         -ECHO_T = @ECHO_T@
   141         -EGREP = @EGREP@
   142         -EXEEXT = @EXEEXT@
   143         -FGREP = @FGREP@
   144         -GEOSCONFIG = @GEOSCONFIG@
   145         -GEOS_CFLAGS = @GEOS_CFLAGS@
   146         -GEOS_LDFLAGS = @GEOS_LDFLAGS@
   147         -GREP = @GREP@
   148         -INSTALL = @INSTALL@
   149         -INSTALL_DATA = @INSTALL_DATA@
   150         -INSTALL_PROGRAM = @INSTALL_PROGRAM@
   151         -INSTALL_SCRIPT = @INSTALL_SCRIPT@
   152         -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
   153         -LD = @LD@
   154         -LDFLAGS = @LDFLAGS@
   155         -LIBOBJS = @LIBOBJS@
   156         -LIBS = @LIBS@
   157         -LIBTOOL = @LIBTOOL@
   158         -LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
   159         -LIBXML2_LIBS = @LIBXML2_LIBS@
   160         -LIPO = @LIPO@
   161         -LN_S = @LN_S@
   162         -LTLIBOBJS = @LTLIBOBJS@
   163         -MAINT = @MAINT@
   164         -MAKEINFO = @MAKEINFO@
   165         -MANIFEST_TOOL = @MANIFEST_TOOL@
   166         -MKDIR_P = @MKDIR_P@
   167         -NM = @NM@
   168         -NMEDIT = @NMEDIT@
   169         -OBJDUMP = @OBJDUMP@
   170         -OBJEXT = @OBJEXT@
   171         -OTOOL = @OTOOL@
   172         -OTOOL64 = @OTOOL64@
   173         -PACKAGE = @PACKAGE@
   174         -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
   175         -PACKAGE_NAME = @PACKAGE_NAME@
   176         -PACKAGE_STRING = @PACKAGE_STRING@
   177         -PACKAGE_TARNAME = @PACKAGE_TARNAME@
   178         -PACKAGE_URL = @PACKAGE_URL@
   179         -PACKAGE_VERSION = @PACKAGE_VERSION@
   180         -PATH_SEPARATOR = @PATH_SEPARATOR@
   181         -PKG_CONFIG = @PKG_CONFIG@
   182         -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
   183         -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
   184         -RANLIB = @RANLIB@
   185         -SED = @SED@
   186         -SET_MAKE = @SET_MAKE@
   187         -SHELL = @SHELL@
   188         -STRIP = @STRIP@
   189         -VERSION = @VERSION@
   190         -abs_builddir = @abs_builddir@
   191         -abs_srcdir = @abs_srcdir@
   192         -abs_top_builddir = @abs_top_builddir@
   193         -abs_top_srcdir = @abs_top_srcdir@
   194         -ac_ct_AR = @ac_ct_AR@
   195         -ac_ct_CC = @ac_ct_CC@
   196         -ac_ct_CXX = @ac_ct_CXX@
   197         -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
   198         -am__include = @am__include@
   199         -am__leading_dot = @am__leading_dot@
   200         -am__quote = @am__quote@
   201         -am__tar = @am__tar@
   202         -am__untar = @am__untar@
   203         -bindir = @bindir@
   204         -build = @build@
   205         -build_alias = @build_alias@
   206         -build_cpu = @build_cpu@
   207         -build_os = @build_os@
   208         -build_vendor = @build_vendor@
   209         -builddir = @builddir@
   210         -datadir = @datadir@
   211         -datarootdir = @datarootdir@
   212         -docdir = @docdir@
   213         -dvidir = @dvidir@
   214         -exec_prefix = @exec_prefix@
   215         -host = @host@
   216         -host_alias = @host_alias@
   217         -host_cpu = @host_cpu@
   218         -host_os = @host_os@
   219         -host_vendor = @host_vendor@
   220         -htmldir = @htmldir@
   221         -includedir = @includedir@
   222         -infodir = @infodir@
   223         -install_sh = @install_sh@
   224         -libdir = @libdir@
   225         -libexecdir = @libexecdir@
   226         -localedir = @localedir@
   227         -localstatedir = @localstatedir@
   228         -mandir = @mandir@
   229         -mkdir_p = @mkdir_p@
   230         -oldincludedir = @oldincludedir@
   231         -pdfdir = @pdfdir@
   232         -prefix = @prefix@
   233         -program_transform_name = @program_transform_name@
   234         -psdir = @psdir@
   235         -sbindir = @sbindir@
   236         -sharedstatedir = @sharedstatedir@
   237         -srcdir = @srcdir@
   238         -sysconfdir = @sysconfdir@
   239         -target_alias = @target_alias@
   240         -top_build_prefix = @top_build_prefix@
   241         -top_builddir = @top_builddir@
   242         -top_srcdir = @top_srcdir@
   243         -EXTRA_DIST = amphibious1.testcase \
   244         -	amphibious2.testcase \
   245         -	precision1.testcase \
   246         -	precision2.testcase \
   247         -	precision3.testcase \
   248         -	precision4.testcase \
   249         -	precision5.testcase \
   250         -	precision6.testcase \
   251         -	precision7.testcase 
   252         -
   253         -all: all-am
   254         -
   255         -.SUFFIXES:
   256         -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
   257         -	@for dep in $?; do \
   258         -	  case '$(am__configure_deps)' in \
   259         -	    *$$dep*) \
   260         -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   261         -	        && { if test -f $@; then exit 0; else break; fi; }; \
   262         -	      exit 1;; \
   263         -	  esac; \
   264         -	done; \
   265         -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile'; \
   266         -	$(am__cd) $(top_srcdir) && \
   267         -	  $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile
   268         -.PRECIOUS: Makefile
   269         -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   270         -	@case '$?' in \
   271         -	  *config.status*) \
   272         -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   273         -	  *) \
   274         -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   275         -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   276         -	esac;
   277         -
   278         -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   279         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   280         -
   281         -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
   282         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   283         -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
   284         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   285         -$(am__aclocal_m4_deps):
   286         -
   287         -mostlyclean-libtool:
   288         -	-rm -f *.lo
   289         -
   290         -clean-libtool:
   291         -	-rm -rf .libs _libs
   292         -tags TAGS:
   293         -
   294         -ctags CTAGS:
   295         -
   296         -cscope cscopelist:
   297         -
   298         -
   299         -distdir: $(DISTFILES)
   300         -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   301         -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   302         -	list='$(DISTFILES)'; \
   303         -	  dist_files=`for file in $$list; do echo $$file; done | \
   304         -	  sed -e "s|^$$srcdirstrip/||;t" \
   305         -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   306         -	case $$dist_files in \
   307         -	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   308         -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   309         -			   sort -u` ;; \
   310         -	esac; \
   311         -	for file in $$dist_files; do \
   312         -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   313         -	  if test -d $$d/$$file; then \
   314         -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   315         -	    if test -d "$(distdir)/$$file"; then \
   316         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   317         -	    fi; \
   318         -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   319         -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   320         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   321         -	    fi; \
   322         -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   323         -	  else \
   324         -	    test -f "$(distdir)/$$file" \
   325         -	    || cp -p $$d/$$file "$(distdir)/$$file" \
   326         -	    || exit 1; \
   327         -	  fi; \
   328         -	done
   329         -check-am: all-am
   330         -check: check-am
   331         -all-am: Makefile
   332         -installdirs:
   333         -install: install-am
   334         -install-exec: install-exec-am
   335         -install-data: install-data-am
   336         -uninstall: uninstall-am
   337         -
   338         -install-am: all-am
   339         -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   340         -
   341         -installcheck: installcheck-am
   342         -install-strip:
   343         -	if test -z '$(STRIP)'; then \
   344         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   345         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   346         -	      install; \
   347         -	else \
   348         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   349         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   350         -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
   351         -	fi
   352         -mostlyclean-generic:
   353         -
   354         -clean-generic:
   355         -
   356         -distclean-generic:
   357         -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   358         -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   359         -
   360         -maintainer-clean-generic:
   361         -	@echo "This command is intended for maintainers to use"
   362         -	@echo "it deletes files that may require special tools to rebuild."
   363         -clean: clean-am
   364         -
   365         -clean-am: clean-generic clean-libtool mostlyclean-am
   366         -
   367         -distclean: distclean-am
   368         -	-rm -f Makefile
   369         -distclean-am: clean-am distclean-generic
   370         -
   371         -dvi: dvi-am
   372         -
   373         -dvi-am:
   374         -
   375         -html: html-am
   376         -
   377         -html-am:
   378         -
   379         -info: info-am
   380         -
   381         -info-am:
   382         -
   383         -install-data-am:
   384         -
   385         -install-dvi: install-dvi-am
   386         -
   387         -install-dvi-am:
   388         -
   389         -install-exec-am:
   390         -
   391         -install-html: install-html-am
   392         -
   393         -install-html-am:
   394         -
   395         -install-info: install-info-am
   396         -
   397         -install-info-am:
   398         -
   399         -install-man:
   400         -
   401         -install-pdf: install-pdf-am
   402         -
   403         -install-pdf-am:
   404         -
   405         -install-ps: install-ps-am
   406         -
   407         -install-ps-am:
   408         -
   409         -installcheck-am:
   410         -
   411         -maintainer-clean: maintainer-clean-am
   412         -	-rm -f Makefile
   413         -maintainer-clean-am: distclean-am maintainer-clean-generic
   414         -
   415         -mostlyclean: mostlyclean-am
   416         -
   417         -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
   418         -
   419         -pdf: pdf-am
   420         -
   421         -pdf-am:
   422         -
   423         -ps: ps-am
   424         -
   425         -ps-am:
   426         -
   427         -uninstall-am:
   428         -
   429         -.MAKE: install-am install-strip
   430         -
   431         -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
   432         -	cscopelist-am ctags-am distclean distclean-generic \
   433         -	distclean-libtool distdir dvi dvi-am html html-am info info-am \
   434         -	install install-am install-data install-data-am install-dvi \
   435         -	install-dvi-am install-exec install-exec-am install-html \
   436         -	install-html-am install-info install-info-am install-man \
   437         -	install-pdf install-pdf-am install-ps install-ps-am \
   438         -	install-strip installcheck installcheck-am installdirs \
   439         -	maintainer-clean maintainer-clean-generic mostlyclean \
   440         -	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   441         -	tags-am uninstall uninstall-am
   442         -
   443         -
   444         -# Tell versions [3.59,3.63) of GNU make to not export all variables.
   445         -# Otherwise a system limit (for SysV at least) may be exceeded.
   446         -.NOEXPORT:

Deleted test/sql_stmt_cache_tests/amphibious1.testcase.

     1         -GPKG amphibious mode - enable
     2         -:memory:
     3         -SELECT EnableGpkgAmphibiousMode(), GetGpkgAmphibiousMode();
     4         -1 # rows
     5         -2 # column
     6         -EnableGpkgAmphibiousMode()
     7         -GetGpkgAmphibiousMode()
     8         -(NULL)
     9         -1

Deleted test/sql_stmt_cache_tests/amphibious2.testcase.

     1         -GPKG amphibious mode - disable
     2         -:memory:
     3         -SELECT DisableGpkgAmphibiousMode(), GetGpkgAmphibiousMode();
     4         -1 # rows
     5         -2 # column
     6         -DisableGpkgAmphibiousMode()
     7         -GetGpkgAmphibiousMode();
     8         -(NULL)
     9         -0

Deleted test/sql_stmt_cache_tests/precision1.testcase.

     1         -decimal precision - 10
     2         -:memory:
     3         -SELECT SetDecimalPrecision(10), GetDecimalPrecision();
     4         -1 # rows
     5         -2 # column
     6         -SetDecimalPrecision(10)
     7         -GetDecimalPrecision()
     8         -(NULL)
     9         -10

Deleted test/sql_stmt_cache_tests/precision2.testcase.

     1         -decimal precision - 100
     2         -:memory:
     3         -SELECT SetDecimalPrecision(100), GetDecimalPrecision();
     4         -1 # rows
     5         -2 # column
     6         -SetDecimalPrecision(100)
     7         -GetDecimalPrecision()
     8         -(NULL)
     9         -18

Deleted test/sql_stmt_cache_tests/precision3.testcase.

     1         -decimal precision - -100
     2         -:memory:
     3         -SELECT SetDecimalPrecision(-100), GetDecimalPrecision();
     4         -1 # rows
     5         -2 # column
     6         -SetDecimalPrecision(-100)
     7         -GetDecimalPrecision()
     8         -(NULL)
     9         --1

Deleted test/sql_stmt_cache_tests/precision4.testcase.

     1         -decimal precision - NULL
     2         -:memory:
     3         -SELECT SetDecimalPrecision(NULL);
     4         -1 # rows
     5         -1 # column
     6         -SetDecimalPrecision(NULL)
     7         -(NULL)

Deleted test/sql_stmt_cache_tests/precision5.testcase.

     1         -decimal precision - TEXT
     2         -:memory:
     3         -SELECT SetDecimalPrecision('aleph');
     4         -1 # rows
     5         -1 # column
     6         -SetDecimalPrecision('aleph')
     7         -(NULL)

Deleted test/sql_stmt_cache_tests/precision6.testcase.

     1         -decimal precision - DOUBLE
     2         -:memory:
     3         -SELECT SetDecimalPrecision(1.5);
     4         -1 # rows
     5         -1 # column
     6         -SetDecimalPrecision(1.5)
     7         -(NULL)

Deleted test/sql_stmt_cache_tests/precision7.testcase.

     1         -decimal precision - BLOB
     2         -:memory:
     3         -SELECT SetDecimalPrecision(zeroblob(10));
     4         -1 # rows
     5         -1 # column
     6         -SetDecimalPrecision(zeroblob(10))
     7         -(NULL)

Changes to test/sql_stmt_geopackage_tests/Makefile.am.

    67     67   	makepointzm2.testcase \
    68     68   	makepointzm3.testcase \
    69     69   	makepointzm4.testcase \
    70     70   	makepointzm5.testcase \
    71     71   	makepointzm6.testcase \
    72     72   	makepointzm7.testcase \
    73     73   	makepointzm8.testcase \
    74         -	makepointzm9.testcase \
    75         -	transform_geopackage1.testcase \
    76         -	transform_geopackage1.testcase \
    77         -	transform_geopackage1.testcase \
    78         -	transform_geopackage1.testcase \
    79         -	transform_geopackage1.testcase \
    80         -	transform_geopackage1.testcase \
    81         -	transform_geopackage1.testcase \
    82         -	transform_geopackage1.testcase 
    83         -	
           74  +	makepointzm9.testcase 

Changes to test/sql_stmt_geopackage_tests/Makefile.in.

   308    308   	makepointzm2.testcase \
   309    309   	makepointzm3.testcase \
   310    310   	makepointzm4.testcase \
   311    311   	makepointzm5.testcase \
   312    312   	makepointzm6.testcase \
   313    313   	makepointzm7.testcase \
   314    314   	makepointzm8.testcase \
   315         -	makepointzm9.testcase \
   316         -	transform_geopackage1.testcase \
   317         -	transform_geopackage1.testcase \
   318         -	transform_geopackage1.testcase \
   319         -	transform_geopackage1.testcase \
   320         -	transform_geopackage1.testcase \
   321         -	transform_geopackage1.testcase \
   322         -	transform_geopackage1.testcase \
   323         -	transform_geopackage1.testcase 
          315  +	makepointzm9.testcase 
   324    316   
   325    317   all: all-am
   326    318   
   327    319   .SUFFIXES:
   328    320   $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
   329    321   	@for dep in $?; do \
   330    322   	  case '$(am__configure_deps)' in \

Deleted test/sql_stmt_geopackage_tests/transform_geopackage1.testcase.

     1         -transform - null args
     2         -gpkg_test.gpkg
     3         -SELECT Transform(NULL, NULL)
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -Transform(NULL, NULL)
     7         -(NULL)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage2.testcase.

     1         -transform - Point
     2         -gpkg_test_extrasrid.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 27700))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 27700))
     7         -POINT(669088.702263 -761460.136215)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage3.testcase.

     1         -transform - Unknown SRID
     2         -gpkg_test_extrasrid.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 3))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 3))
     7         -(NULL)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage4.testcase.

     1         -transform - Linestring Z
     2         -gpkg_test.gpkg
     3         -SELECT AsText(Transform(GeomFromText('LINESTRINGZ(11 43 100, 12 43 101, 12 42 102)', 4326), 32632))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('LINESTRINGZ(11 43 100, 12 43 101, 12 42 102)', 4326), 32632))
     7         -LINESTRING Z(663019.070082 4762755.64169 100, 744533.019451 4765182.932802 101, 748464.920716 4654130.891324 102)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage5.testcase.

     1         -transform - Bogus SRID
     2         -gpkg_test_extrasrid.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888888))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888888))
     7         -(NULL)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage6.testcase.

     1         -transform - bad format organization_coordsys_id
     2         -gpkg_test_extrasrid.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888889))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888889))
     7         -(NULL)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage7.testcase.

     1         -transform - bad format organization_coordsys_id
     2         -gpkg_test_extrasrid.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888887))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888887))
     7         -(NULL)

Deleted test/sql_stmt_geopackage_tests/transform_geopackage8.testcase.

     1         -transform - broken geopackage - no gpkg_spatial_ref_sys table
     2         -gpkg_test_broken.gpkg
     3         -SELECT AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888887))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsText(Transform(GeomFromText('POINT(1.3 43)', 4326), 888887))
     7         -(NULL)

Changes to test/sql_stmt_mathsql_tests/Makefile.am.

     8      8   	asin1.testcase \
     9      9   	asin20.testcase \
    10     10   	asin2.testcase \
    11     11   	asin-text.testcase \
    12     12   	atan00.testcase \
    13     13   	atan0.testcase \
    14     14   	atan-text.testcase \
    15         -	atan21.testcase \
    16         -	atan22.testcase \
    17         -	atan23.testcase \
    18         -	atan24.testcase \
    19         -	atan25.testcase \
    20         -	atan26.testcase \
    21         -	atan27.testcase \
    22         -	atan28.testcase \
    23     15   	ceilfloat2.testcase \
    24     16   	ceilfloat.testcase \
    25     17   	ceil-int.testcase \
    26     18   	ceilnull.testcase \
    27     19   	cos00.testcase \
    28     20   	cos0.testcase \
    29     21   	cos-text.testcase \

Changes to test/sql_stmt_mathsql_tests/Makefile.in.

   249    249   	asin1.testcase \
   250    250   	asin20.testcase \
   251    251   	asin2.testcase \
   252    252   	asin-text.testcase \
   253    253   	atan00.testcase \
   254    254   	atan0.testcase \
   255    255   	atan-text.testcase \
   256         -	atan21.testcase \
   257         -	atan22.testcase \
   258         -	atan23.testcase \
   259         -	atan24.testcase \
   260         -	atan25.testcase \
   261         -	atan26.testcase \
   262         -	atan27.testcase \
   263         -	atan28.testcase \
   264    256   	ceilfloat2.testcase \
   265    257   	ceilfloat.testcase \
   266    258   	ceil-int.testcase \
   267    259   	ceilnull.testcase \
   268    260   	cos00.testcase \
   269    261   	cos0.testcase \
   270    262   	cos-text.testcase \

Deleted test/sql_stmt_mathsql_tests/atan21.testcase.

     1         -atan2 - first arg TEXT
     2         -:memory: # use in-memory database
     3         -SELECT atan2('test', 0.0);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2('test', 0.0) # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan22.testcase.

     1         -atan2 - first arg BLOB
     2         -:memory: # use in-memory database
     3         -SELECT atan2(zeroblob(4), 0.0);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(zeroblob(4), 0.0) # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan23.testcase.

     1         -atan2 - first arg NULL
     2         -:memory: # use in-memory database
     3         -SELECT atan2(NULL, 0.0);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(NULL, 0.0) # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan24.testcase.

     1         -atan2 - second arg NULL
     2         -:memory: # use in-memory database
     3         -SELECT atan2(0.0, NULL);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(0.0, NULL) # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan25.testcase.

     1         -atan2 - second arg BLOB
     2         -:memory: # use in-memory database
     3         -SELECT atan2(0.0, zeroblob(4));
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(0.0, zeroblob(4)) # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan26.testcase.

     1         -atan2 - second arg TEXT
     2         -:memory: # use in-memory database
     3         -SELECT atan2(0.0, 'test');
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(0.0, 'test') # header
     7         -(NULL)
     8         -

Deleted test/sql_stmt_mathsql_tests/atan27.testcase.

     1         -atan2 - second arg DOUBLE - valid
     2         -:memory: # use in-memory database
     3         -SELECT atan2(0.0, 0.0);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(0.0, 0.0) # header
     7         -0.0

Deleted test/sql_stmt_mathsql_tests/atan28.testcase.

     1         -atan2 - INT args - valid
     2         -:memory: # use in-memory database
     3         -SELECT atan2(0, 0);
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -atan2(0, 0) # header
     7         -0.0

Deleted test/sql_stmt_nocache_tests/Makefile.

     1         -# Makefile.in generated by automake 1.14.1 from Makefile.am.
     2         -# test/sql_stmt_nocache_tests/Makefile.  Generated from Makefile.in by configure.
     3         -
     4         -# Copyright (C) 1994-2013 Free Software Foundation, Inc.
     5         -
     6         -# This Makefile.in is free software; the Free Software Foundation
     7         -# gives unlimited permission to copy and/or distribute it,
     8         -# with or without modifications, as long as this notice is preserved.
     9         -
    10         -# This program is distributed in the hope that it will be useful,
    11         -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
    12         -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    13         -# PARTICULAR PURPOSE.
    14         -
    15         -
    16         -
    17         -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
    18         -am__make_running_with_option = \
    19         -  case $${target_option-} in \
    20         -      ?) ;; \
    21         -      *) echo "am__make_running_with_option: internal error: invalid" \
    22         -              "target option '$${target_option-}' specified" >&2; \
    23         -         exit 1;; \
    24         -  esac; \
    25         -  has_opt=no; \
    26         -  sane_makeflags=$$MAKEFLAGS; \
    27         -  if $(am__is_gnu_make); then \
    28         -    sane_makeflags=$$MFLAGS; \
    29         -  else \
    30         -    case $$MAKEFLAGS in \
    31         -      *\\[\ \	]*) \
    32         -        bs=\\; \
    33         -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
    34         -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    35         -    esac; \
    36         -  fi; \
    37         -  skip_next=no; \
    38         -  strip_trailopt () \
    39         -  { \
    40         -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
    41         -  }; \
    42         -  for flg in $$sane_makeflags; do \
    43         -    test $$skip_next = yes && { skip_next=no; continue; }; \
    44         -    case $$flg in \
    45         -      *=*|--*) continue;; \
    46         -        -*I) strip_trailopt 'I'; skip_next=yes;; \
    47         -      -*I?*) strip_trailopt 'I';; \
    48         -        -*O) strip_trailopt 'O'; skip_next=yes;; \
    49         -      -*O?*) strip_trailopt 'O';; \
    50         -        -*l) strip_trailopt 'l'; skip_next=yes;; \
    51         -      -*l?*) strip_trailopt 'l';; \
    52         -      -[dEDm]) skip_next=yes;; \
    53         -      -[JT]) skip_next=yes;; \
    54         -    esac; \
    55         -    case $$flg in \
    56         -      *$$target_option*) has_opt=yes; break;; \
    57         -    esac; \
    58         -  done; \
    59         -  test $$has_opt = yes
    60         -am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    61         -am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    62         -pkgdatadir = $(datadir)/libspatialite
    63         -pkgincludedir = $(includedir)/libspatialite
    64         -pkglibdir = $(libdir)/libspatialite
    65         -pkglibexecdir = $(libexecdir)/libspatialite
    66         -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    67         -install_sh_DATA = $(install_sh) -c -m 644
    68         -install_sh_PROGRAM = $(install_sh) -c
    69         -install_sh_SCRIPT = $(install_sh) -c
    70         -INSTALL_HEADER = $(INSTALL_DATA)
    71         -transform = $(program_transform_name)
    72         -NORMAL_INSTALL = :
    73         -PRE_INSTALL = :
    74         -POST_INSTALL = :
    75         -NORMAL_UNINSTALL = :
    76         -PRE_UNINSTALL = :
    77         -POST_UNINSTALL = :
    78         -build_triplet = x86_64-unknown-linux-gnu
    79         -host_triplet = x86_64-unknown-linux-gnu
    80         -subdir = test/sql_stmt_nocache_tests
    81         -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    82         -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    83         -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
    84         -	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
    85         -	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
    86         -	$(top_srcdir)/configure.ac
    87         -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    88         -	$(ACLOCAL_M4)
    89         -mkinstalldirs = $(install_sh) -d
    90         -CONFIG_HEADER = $(top_builddir)/config.h
    91         -CONFIG_CLEAN_FILES =
    92         -CONFIG_CLEAN_VPATH_FILES =
    93         -AM_V_P = $(am__v_P_$(V))
    94         -am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
    95         -am__v_P_0 = false
    96         -am__v_P_1 = :
    97         -AM_V_GEN = $(am__v_GEN_$(V))
    98         -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
    99         -am__v_GEN_0 = @echo "  GEN     " $@;
   100         -am__v_GEN_1 = 
   101         -AM_V_at = $(am__v_at_$(V))
   102         -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
   103         -am__v_at_0 = @
   104         -am__v_at_1 = 
   105         -SOURCES =
   106         -DIST_SOURCES =
   107         -am__can_run_installinfo = \
   108         -  case $$AM_UPDATE_INFO_DIR in \
   109         -    n|no|NO) false;; \
   110         -    *) (install-info --version) >/dev/null 2>&1;; \
   111         -  esac
   112         -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
   113         -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   114         -ACLOCAL = aclocal-1.14
   115         -AMTAR = $${TAR-tar}
   116         -AM_DEFAULT_VERBOSITY = 1
   117         -AR = ar
   118         -AS = as
   119         -AUTOCONF = autoconf
   120         -AUTOHEADER = autoheader
   121         -AUTOMAKE = automake-1.14
   122         -AWK = gawk
   123         -CC = gcc
   124         -CCDEPMODE = depmode=gcc3
   125         -CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
   126         -CPP = gcc -E
   127         -CPPFLAGS = 
   128         -CXX = g++
   129         -CXXCPP = g++ -E
   130         -CXXDEPMODE = depmode=gcc3
   131         -CXXFLAGS = -g -O2
   132         -CYGPATH_W = echo
   133         -DEFS = -DHAVE_CONFIG_H
   134         -DEPDIR = .deps
   135         -DLLTOOL = dlltool
   136         -DSYMUTIL = 
   137         -DUMPBIN = 
   138         -ECHO_C = 
   139         -ECHO_N = -n
   140         -ECHO_T = 
   141         -EGREP = /usr/bin/grep -E
   142         -EXEEXT = 
   143         -FGREP = /usr/bin/grep -F
   144         -GEOSCONFIG = /usr/bin/geos-config
   145         -GEOS_CFLAGS = -I/usr/include
   146         -GEOS_LDFLAGS = -L/usr/lib64
   147         -GREP = /usr/bin/grep
   148         -INSTALL = /usr/bin/install -c
   149         -INSTALL_DATA = ${INSTALL} -m 644
   150         -INSTALL_PROGRAM = ${INSTALL}
   151         -INSTALL_SCRIPT = ${INSTALL}
   152         -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
   153         -LD = /usr/bin/ld -m elf_x86_64
   154         -LDFLAGS = 
   155         -LIBOBJS = 
   156         -LIBS = -lfreexl -lproj -lz -lsqlite3  -L/usr/lib64 -lgeos_c -llwgeom -lgeos_c
   157         -LIBTOOL = $(SHELL) $(top_builddir)/libtool
   158         -LIBXML2_CFLAGS = -I/usr/include/libxml2 
   159         -LIBXML2_LIBS = -lxml2 
   160         -LIPO = 
   161         -LN_S = ln -s
   162         -LTLIBOBJS = 
   163         -MAINT = #
   164         -MAKEINFO = makeinfo
   165         -MANIFEST_TOOL = :
   166         -MKDIR_P = /usr/bin/mkdir -p
   167         -NM = /usr/bin/nm -B
   168         -NMEDIT = 
   169         -OBJDUMP = objdump
   170         -OBJEXT = o
   171         -OTOOL = 
   172         -OTOOL64 = 
   173         -PACKAGE = libspatialite
   174         -PACKAGE_BUGREPORT = a.furieri@lqt.it
   175         -PACKAGE_NAME = libspatialite
   176         -PACKAGE_STRING = libspatialite 4.3.0-devel
   177         -PACKAGE_TARNAME = libspatialite
   178         -PACKAGE_URL = 
   179         -PACKAGE_VERSION = 4.3.0-devel
   180         -PATH_SEPARATOR = :
   181         -PKG_CONFIG = /usr/bin/pkg-config
   182         -PKG_CONFIG_LIBDIR = 
   183         -PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
   184         -RANLIB = ranlib
   185         -SED = /usr/bin/sed
   186         -SET_MAKE = 
   187         -SHELL = /bin/sh
   188         -STRIP = strip
   189         -VERSION = 4.3.0-devel
   190         -abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_nocache_tests
   191         -abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_nocache_tests
   192         -abs_top_builddir = /home/sandro/fossil/libspatialite
   193         -abs_top_srcdir = /home/sandro/fossil/libspatialite
   194         -ac_ct_AR = ar
   195         -ac_ct_CC = gcc
   196         -ac_ct_CXX = g++
   197         -ac_ct_DUMPBIN = 
   198         -am__include = include
   199         -am__leading_dot = .
   200         -am__quote = 
   201         -am__tar = $${TAR-tar} chof - "$$tardir"
   202         -am__untar = $${TAR-tar} xf -
   203         -bindir = ${exec_prefix}/bin
   204         -build = x86_64-unknown-linux-gnu
   205         -build_alias = 
   206         -build_cpu = x86_64
   207         -build_os = linux-gnu
   208         -build_vendor = unknown
   209         -builddir = .
   210         -datadir = ${datarootdir}
   211         -datarootdir = ${prefix}/share
   212         -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
   213         -dvidir = ${docdir}
   214         -exec_prefix = ${prefix}
   215         -host = x86_64-unknown-linux-gnu
   216         -host_alias = 
   217         -host_cpu = x86_64
   218         -host_os = linux-gnu
   219         -host_vendor = unknown
   220         -htmldir = ${docdir}
   221         -includedir = ${prefix}/include
   222         -infodir = ${datarootdir}/info
   223         -install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
   224         -libdir = ${exec_prefix}/lib
   225         -libexecdir = ${exec_prefix}/libexec
   226         -localedir = ${datarootdir}/locale
   227         -localstatedir = ${prefix}/var
   228         -mandir = ${datarootdir}/man
   229         -mkdir_p = $(MKDIR_P)
   230         -oldincludedir = /usr/include
   231         -pdfdir = ${docdir}
   232         -prefix = /usr/local
   233         -program_transform_name = s,x,x,
   234         -psdir = ${docdir}
   235         -sbindir = ${exec_prefix}/sbin
   236         -sharedstatedir = ${prefix}/com
   237         -srcdir = .
   238         -sysconfdir = ${prefix}/etc
   239         -target_alias = 
   240         -top_build_prefix = ../../
   241         -top_builddir = ../..
   242         -top_srcdir = ../..
   243         -EXTRA_DIST = amphibious1.testcase \
   244         -	amphibious2.testcase \
   245         -	precision1.testcase \
   246         -	precision2.testcase 
   247         -
   248         -all: all-am
   249         -
   250         -.SUFFIXES:
   251         -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
   252         -	@for dep in $?; do \
   253         -	  case '$(am__configure_deps)' in \
   254         -	    *$$dep*) \
   255         -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   256         -	        && { if test -f $@; then exit 0; else break; fi; }; \
   257         -	      exit 1;; \
   258         -	  esac; \
   259         -	done; \
   260         -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile'; \
   261         -	$(am__cd) $(top_srcdir) && \
   262         -	  $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile
   263         -.PRECIOUS: Makefile
   264         -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   265         -	@case '$?' in \
   266         -	  *config.status*) \
   267         -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   268         -	  *) \
   269         -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   270         -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   271         -	esac;
   272         -
   273         -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   274         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   275         -
   276         -$(top_srcdir)/configure: # $(am__configure_deps)
   277         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   278         -$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
   279         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   280         -$(am__aclocal_m4_deps):
   281         -
   282         -mostlyclean-libtool:
   283         -	-rm -f *.lo
   284         -
   285         -clean-libtool:
   286         -	-rm -rf .libs _libs
   287         -tags TAGS:
   288         -
   289         -ctags CTAGS:
   290         -
   291         -cscope cscopelist:
   292         -
   293         -
   294         -distdir: $(DISTFILES)
   295         -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   296         -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   297         -	list='$(DISTFILES)'; \
   298         -	  dist_files=`for file in $$list; do echo $$file; done | \
   299         -	  sed -e "s|^$$srcdirstrip/||;t" \
   300         -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   301         -	case $$dist_files in \
   302         -	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   303         -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   304         -			   sort -u` ;; \
   305         -	esac; \
   306         -	for file in $$dist_files; do \
   307         -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   308         -	  if test -d $$d/$$file; then \
   309         -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   310         -	    if test -d "$(distdir)/$$file"; then \
   311         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   312         -	    fi; \
   313         -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   314         -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   315         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   316         -	    fi; \
   317         -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   318         -	  else \
   319         -	    test -f "$(distdir)/$$file" \
   320         -	    || cp -p $$d/$$file "$(distdir)/$$file" \
   321         -	    || exit 1; \
   322         -	  fi; \
   323         -	done
   324         -check-am: all-am
   325         -check: check-am
   326         -all-am: Makefile
   327         -installdirs:
   328         -install: install-am
   329         -install-exec: install-exec-am
   330         -install-data: install-data-am
   331         -uninstall: uninstall-am
   332         -
   333         -install-am: all-am
   334         -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   335         -
   336         -installcheck: installcheck-am
   337         -install-strip:
   338         -	if test -z '$(STRIP)'; then \
   339         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   340         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   341         -	      install; \
   342         -	else \
   343         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   344         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   345         -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
   346         -	fi
   347         -mostlyclean-generic:
   348         -
   349         -clean-generic:
   350         -
   351         -distclean-generic:
   352         -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   353         -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   354         -
   355         -maintainer-clean-generic:
   356         -	@echo "This command is intended for maintainers to use"
   357         -	@echo "it deletes files that may require special tools to rebuild."
   358         -clean: clean-am
   359         -
   360         -clean-am: clean-generic clean-libtool mostlyclean-am
   361         -
   362         -distclean: distclean-am
   363         -	-rm -f Makefile
   364         -distclean-am: clean-am distclean-generic
   365         -
   366         -dvi: dvi-am
   367         -
   368         -dvi-am:
   369         -
   370         -html: html-am
   371         -
   372         -html-am:
   373         -
   374         -info: info-am
   375         -
   376         -info-am:
   377         -
   378         -install-data-am:
   379         -
   380         -install-dvi: install-dvi-am
   381         -
   382         -install-dvi-am:
   383         -
   384         -install-exec-am:
   385         -
   386         -install-html: install-html-am
   387         -
   388         -install-html-am:
   389         -
   390         -install-info: install-info-am
   391         -
   392         -install-info-am:
   393         -
   394         -install-man:
   395         -
   396         -install-pdf: install-pdf-am
   397         -
   398         -install-pdf-am:
   399         -
   400         -install-ps: install-ps-am
   401         -
   402         -install-ps-am:
   403         -
   404         -installcheck-am:
   405         -
   406         -maintainer-clean: maintainer-clean-am
   407         -	-rm -f Makefile
   408         -maintainer-clean-am: distclean-am maintainer-clean-generic
   409         -
   410         -mostlyclean: mostlyclean-am
   411         -
   412         -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
   413         -
   414         -pdf: pdf-am
   415         -
   416         -pdf-am:
   417         -
   418         -ps: ps-am
   419         -
   420         -ps-am:
   421         -
   422         -uninstall-am:
   423         -
   424         -.MAKE: install-am install-strip
   425         -
   426         -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
   427         -	cscopelist-am ctags-am distclean distclean-generic \
   428         -	distclean-libtool distdir dvi dvi-am html html-am info info-am \
   429         -	install install-am install-data install-data-am install-dvi \
   430         -	install-dvi-am install-exec install-exec-am install-html \
   431         -	install-html-am install-info install-info-am install-man \
   432         -	install-pdf install-pdf-am install-ps install-ps-am \
   433         -	install-strip installcheck installcheck-am installdirs \
   434         -	maintainer-clean maintainer-clean-generic mostlyclean \
   435         -	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   436         -	tags-am uninstall uninstall-am
   437         -
   438         -
   439         -# Tell versions [3.59,3.63) of GNU make to not export all variables.
   440         -# Otherwise a system limit (for SysV at least) may be exceeded.
   441         -.NOEXPORT:

Deleted test/sql_stmt_nocache_tests/Makefile.am.

     1         -
     2         -EXTRA_DIST = amphibious1.testcase \
     3         -	amphibious2.testcase \
     4         -	precision1.testcase \
     5         -	precision2.testcase 
     6         -	

Deleted test/sql_stmt_nocache_tests/Makefile.in.

     1         -# Makefile.in generated by automake 1.14.1 from Makefile.am.
     2         -# @configure_input@
     3         -
     4         -# Copyright (C) 1994-2013 Free Software Foundation, Inc.
     5         -
     6         -# This Makefile.in is free software; the Free Software Foundation
     7         -# gives unlimited permission to copy and/or distribute it,
     8         -# with or without modifications, as long as this notice is preserved.
     9         -
    10         -# This program is distributed in the hope that it will be useful,
    11         -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
    12         -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    13         -# PARTICULAR PURPOSE.
    14         -
    15         -@SET_MAKE@
    16         -VPATH = @srcdir@
    17         -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
    18         -am__make_running_with_option = \
    19         -  case $${target_option-} in \
    20         -      ?) ;; \
    21         -      *) echo "am__make_running_with_option: internal error: invalid" \
    22         -              "target option '$${target_option-}' specified" >&2; \
    23         -         exit 1;; \
    24         -  esac; \
    25         -  has_opt=no; \
    26         -  sane_makeflags=$$MAKEFLAGS; \
    27         -  if $(am__is_gnu_make); then \
    28         -    sane_makeflags=$$MFLAGS; \
    29         -  else \
    30         -    case $$MAKEFLAGS in \
    31         -      *\\[\ \	]*) \
    32         -        bs=\\; \
    33         -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
    34         -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    35         -    esac; \
    36         -  fi; \
    37         -  skip_next=no; \
    38         -  strip_trailopt () \
    39         -  { \
    40         -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
    41         -  }; \
    42         -  for flg in $$sane_makeflags; do \
    43         -    test $$skip_next = yes && { skip_next=no; continue; }; \
    44         -    case $$flg in \
    45         -      *=*|--*) continue;; \
    46         -        -*I) strip_trailopt 'I'; skip_next=yes;; \
    47         -      -*I?*) strip_trailopt 'I';; \
    48         -        -*O) strip_trailopt 'O'; skip_next=yes;; \
    49         -      -*O?*) strip_trailopt 'O';; \
    50         -        -*l) strip_trailopt 'l'; skip_next=yes;; \
    51         -      -*l?*) strip_trailopt 'l';; \
    52         -      -[dEDm]) skip_next=yes;; \
    53         -      -[JT]) skip_next=yes;; \
    54         -    esac; \
    55         -    case $$flg in \
    56         -      *$$target_option*) has_opt=yes; break;; \
    57         -    esac; \
    58         -  done; \
    59         -  test $$has_opt = yes
    60         -am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    61         -am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    62         -pkgdatadir = $(datadir)/@PACKAGE@
    63         -pkgincludedir = $(includedir)/@PACKAGE@
    64         -pkglibdir = $(libdir)/@PACKAGE@
    65         -pkglibexecdir = $(libexecdir)/@PACKAGE@
    66         -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    67         -install_sh_DATA = $(install_sh) -c -m 644
    68         -install_sh_PROGRAM = $(install_sh) -c
    69         -install_sh_SCRIPT = $(install_sh) -c
    70         -INSTALL_HEADER = $(INSTALL_DATA)
    71         -transform = $(program_transform_name)
    72         -NORMAL_INSTALL = :
    73         -PRE_INSTALL = :
    74         -POST_INSTALL = :
    75         -NORMAL_UNINSTALL = :
    76         -PRE_UNINSTALL = :
    77         -POST_UNINSTALL = :
    78         -build_triplet = @build@
    79         -host_triplet = @host@
    80         -subdir = test/sql_stmt_nocache_tests
    81         -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    82         -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    83         -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
    84         -	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
    85         -	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
    86         -	$(top_srcdir)/configure.ac
    87         -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    88         -	$(ACLOCAL_M4)
    89         -mkinstalldirs = $(install_sh) -d
    90         -CONFIG_HEADER = $(top_builddir)/config.h
    91         -CONFIG_CLEAN_FILES =
    92         -CONFIG_CLEAN_VPATH_FILES =
    93         -AM_V_P = $(am__v_P_@AM_V@)
    94         -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    95         -am__v_P_0 = false
    96         -am__v_P_1 = :
    97         -AM_V_GEN = $(am__v_GEN_@AM_V@)
    98         -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    99         -am__v_GEN_0 = @echo "  GEN     " $@;
   100         -am__v_GEN_1 = 
   101         -AM_V_at = $(am__v_at_@AM_V@)
   102         -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
   103         -am__v_at_0 = @
   104         -am__v_at_1 = 
   105         -SOURCES =
   106         -DIST_SOURCES =
   107         -am__can_run_installinfo = \
   108         -  case $$AM_UPDATE_INFO_DIR in \
   109         -    n|no|NO) false;; \
   110         -    *) (install-info --version) >/dev/null 2>&1;; \
   111         -  esac
   112         -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
   113         -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   114         -ACLOCAL = @ACLOCAL@
   115         -AMTAR = @AMTAR@
   116         -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
   117         -AR = @AR@
   118         -AS = @AS@
   119         -AUTOCONF = @AUTOCONF@
   120         -AUTOHEADER = @AUTOHEADER@
   121         -AUTOMAKE = @AUTOMAKE@
   122         -AWK = @AWK@
   123         -CC = @CC@
   124         -CCDEPMODE = @CCDEPMODE@
   125         -CFLAGS = @CFLAGS@
   126         -CPP = @CPP@
   127         -CPPFLAGS = @CPPFLAGS@
   128         -CXX = @CXX@
   129         -CXXCPP = @CXXCPP@
   130         -CXXDEPMODE = @CXXDEPMODE@
   131         -CXXFLAGS = @CXXFLAGS@
   132         -CYGPATH_W = @CYGPATH_W@
   133         -DEFS = @DEFS@
   134         -DEPDIR = @DEPDIR@
   135         -DLLTOOL = @DLLTOOL@
   136         -DSYMUTIL = @DSYMUTIL@
   137         -DUMPBIN = @DUMPBIN@
   138         -ECHO_C = @ECHO_C@
   139         -ECHO_N = @ECHO_N@
   140         -ECHO_T = @ECHO_T@
   141         -EGREP = @EGREP@
   142         -EXEEXT = @EXEEXT@
   143         -FGREP = @FGREP@
   144         -GEOSCONFIG = @GEOSCONFIG@
   145         -GEOS_CFLAGS = @GEOS_CFLAGS@
   146         -GEOS_LDFLAGS = @GEOS_LDFLAGS@
   147         -GREP = @GREP@
   148         -INSTALL = @INSTALL@
   149         -INSTALL_DATA = @INSTALL_DATA@
   150         -INSTALL_PROGRAM = @INSTALL_PROGRAM@
   151         -INSTALL_SCRIPT = @INSTALL_SCRIPT@
   152         -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
   153         -LD = @LD@
   154         -LDFLAGS = @LDFLAGS@
   155         -LIBOBJS = @LIBOBJS@
   156         -LIBS = @LIBS@
   157         -LIBTOOL = @LIBTOOL@
   158         -LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
   159         -LIBXML2_LIBS = @LIBXML2_LIBS@
   160         -LIPO = @LIPO@
   161         -LN_S = @LN_S@
   162         -LTLIBOBJS = @LTLIBOBJS@
   163         -MAINT = @MAINT@
   164         -MAKEINFO = @MAKEINFO@
   165         -MANIFEST_TOOL = @MANIFEST_TOOL@
   166         -MKDIR_P = @MKDIR_P@
   167         -NM = @NM@
   168         -NMEDIT = @NMEDIT@
   169         -OBJDUMP = @OBJDUMP@
   170         -OBJEXT = @OBJEXT@
   171         -OTOOL = @OTOOL@
   172         -OTOOL64 = @OTOOL64@
   173         -PACKAGE = @PACKAGE@
   174         -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
   175         -PACKAGE_NAME = @PACKAGE_NAME@
   176         -PACKAGE_STRING = @PACKAGE_STRING@
   177         -PACKAGE_TARNAME = @PACKAGE_TARNAME@
   178         -PACKAGE_URL = @PACKAGE_URL@
   179         -PACKAGE_VERSION = @PACKAGE_VERSION@
   180         -PATH_SEPARATOR = @PATH_SEPARATOR@
   181         -PKG_CONFIG = @PKG_CONFIG@
   182         -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
   183         -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
   184         -RANLIB = @RANLIB@
   185         -SED = @SED@
   186         -SET_MAKE = @SET_MAKE@
   187         -SHELL = @SHELL@
   188         -STRIP = @STRIP@
   189         -VERSION = @VERSION@
   190         -abs_builddir = @abs_builddir@
   191         -abs_srcdir = @abs_srcdir@
   192         -abs_top_builddir = @abs_top_builddir@
   193         -abs_top_srcdir = @abs_top_srcdir@
   194         -ac_ct_AR = @ac_ct_AR@
   195         -ac_ct_CC = @ac_ct_CC@
   196         -ac_ct_CXX = @ac_ct_CXX@
   197         -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
   198         -am__include = @am__include@
   199         -am__leading_dot = @am__leading_dot@
   200         -am__quote = @am__quote@
   201         -am__tar = @am__tar@
   202         -am__untar = @am__untar@
   203         -bindir = @bindir@
   204         -build = @build@
   205         -build_alias = @build_alias@
   206         -build_cpu = @build_cpu@
   207         -build_os = @build_os@
   208         -build_vendor = @build_vendor@
   209         -builddir = @builddir@
   210         -datadir = @datadir@
   211         -datarootdir = @datarootdir@
   212         -docdir = @docdir@
   213         -dvidir = @dvidir@
   214         -exec_prefix = @exec_prefix@
   215         -host = @host@
   216         -host_alias = @host_alias@
   217         -host_cpu = @host_cpu@
   218         -host_os = @host_os@
   219         -host_vendor = @host_vendor@
   220         -htmldir = @htmldir@
   221         -includedir = @includedir@
   222         -infodir = @infodir@
   223         -install_sh = @install_sh@
   224         -libdir = @libdir@
   225         -libexecdir = @libexecdir@
   226         -localedir = @localedir@
   227         -localstatedir = @localstatedir@
   228         -mandir = @mandir@
   229         -mkdir_p = @mkdir_p@
   230         -oldincludedir = @oldincludedir@
   231         -pdfdir = @pdfdir@
   232         -prefix = @prefix@
   233         -program_transform_name = @program_transform_name@
   234         -psdir = @psdir@
   235         -sbindir = @sbindir@
   236         -sharedstatedir = @sharedstatedir@
   237         -srcdir = @srcdir@
   238         -sysconfdir = @sysconfdir@
   239         -target_alias = @target_alias@
   240         -top_build_prefix = @top_build_prefix@
   241         -top_builddir = @top_builddir@
   242         -top_srcdir = @top_srcdir@
   243         -EXTRA_DIST = amphibious1.testcase \
   244         -	amphibious2.testcase \
   245         -	precision1.testcase \
   246         -	precision2.testcase 
   247         -
   248         -all: all-am
   249         -
   250         -.SUFFIXES:
   251         -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
   252         -	@for dep in $?; do \
   253         -	  case '$(am__configure_deps)' in \
   254         -	    *$$dep*) \
   255         -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   256         -	        && { if test -f $@; then exit 0; else break; fi; }; \
   257         -	      exit 1;; \
   258         -	  esac; \
   259         -	done; \
   260         -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile'; \
   261         -	$(am__cd) $(top_srcdir) && \
   262         -	  $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile
   263         -.PRECIOUS: Makefile
   264         -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   265         -	@case '$?' in \
   266         -	  *config.status*) \
   267         -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   268         -	  *) \
   269         -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   270         -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   271         -	esac;
   272         -
   273         -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   274         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   275         -
   276         -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
   277         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   278         -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
   279         -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   280         -$(am__aclocal_m4_deps):
   281         -
   282         -mostlyclean-libtool:
   283         -	-rm -f *.lo
   284         -
   285         -clean-libtool:
   286         -	-rm -rf .libs _libs
   287         -tags TAGS:
   288         -
   289         -ctags CTAGS:
   290         -
   291         -cscope cscopelist:
   292         -
   293         -
   294         -distdir: $(DISTFILES)
   295         -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   296         -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   297         -	list='$(DISTFILES)'; \
   298         -	  dist_files=`for file in $$list; do echo $$file; done | \
   299         -	  sed -e "s|^$$srcdirstrip/||;t" \
   300         -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   301         -	case $$dist_files in \
   302         -	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   303         -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   304         -			   sort -u` ;; \
   305         -	esac; \
   306         -	for file in $$dist_files; do \
   307         -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   308         -	  if test -d $$d/$$file; then \
   309         -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   310         -	    if test -d "$(distdir)/$$file"; then \
   311         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   312         -	    fi; \
   313         -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   314         -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   315         -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   316         -	    fi; \
   317         -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   318         -	  else \
   319         -	    test -f "$(distdir)/$$file" \
   320         -	    || cp -p $$d/$$file "$(distdir)/$$file" \
   321         -	    || exit 1; \
   322         -	  fi; \
   323         -	done
   324         -check-am: all-am
   325         -check: check-am
   326         -all-am: Makefile
   327         -installdirs:
   328         -install: install-am
   329         -install-exec: install-exec-am
   330         -install-data: install-data-am
   331         -uninstall: uninstall-am
   332         -
   333         -install-am: all-am
   334         -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   335         -
   336         -installcheck: installcheck-am
   337         -install-strip:
   338         -	if test -z '$(STRIP)'; then \
   339         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   340         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   341         -	      install; \
   342         -	else \
   343         -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
   344         -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   345         -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
   346         -	fi
   347         -mostlyclean-generic:
   348         -
   349         -clean-generic:
   350         -
   351         -distclean-generic:
   352         -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   353         -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   354         -
   355         -maintainer-clean-generic:
   356         -	@echo "This command is intended for maintainers to use"
   357         -	@echo "it deletes files that may require special tools to rebuild."
   358         -clean: clean-am
   359         -
   360         -clean-am: clean-generic clean-libtool mostlyclean-am
   361         -
   362         -distclean: distclean-am
   363         -	-rm -f Makefile
   364         -distclean-am: clean-am distclean-generic
   365         -
   366         -dvi: dvi-am
   367         -
   368         -dvi-am:
   369         -
   370         -html: html-am
   371         -
   372         -html-am:
   373         -
   374         -info: info-am
   375         -
   376         -info-am:
   377         -
   378         -install-data-am:
   379         -
   380         -install-dvi: install-dvi-am
   381         -
   382         -install-dvi-am:
   383         -
   384         -install-exec-am:
   385         -
   386         -install-html: install-html-am
   387         -
   388         -install-html-am:
   389         -
   390         -install-info: install-info-am
   391         -
   392         -install-info-am:
   393         -
   394         -install-man:
   395         -
   396         -install-pdf: install-pdf-am
   397         -
   398         -install-pdf-am:
   399         -
   400         -install-ps: install-ps-am
   401         -
   402         -install-ps-am:
   403         -
   404         -installcheck-am:
   405         -
   406         -maintainer-clean: maintainer-clean-am
   407         -	-rm -f Makefile
   408         -maintainer-clean-am: distclean-am maintainer-clean-generic
   409         -
   410         -mostlyclean: mostlyclean-am
   411         -
   412         -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
   413         -
   414         -pdf: pdf-am
   415         -
   416         -pdf-am:
   417         -
   418         -ps: ps-am
   419         -
   420         -ps-am:
   421         -
   422         -uninstall-am:
   423         -
   424         -.MAKE: install-am install-strip
   425         -
   426         -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
   427         -	cscopelist-am ctags-am distclean distclean-generic \
   428         -	distclean-libtool distdir dvi dvi-am html html-am info info-am \
   429         -	install install-am install-data install-data-am install-dvi \
   430         -	install-dvi-am install-exec install-exec-am install-html \
   431         -	install-html-am install-info install-info-am install-man \
   432         -	install-pdf install-pdf-am install-ps install-ps-am \
   433         -	install-strip installcheck installcheck-am installdirs \
   434         -	maintainer-clean maintainer-clean-generic mostlyclean \
   435         -	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   436         -	tags-am uninstall uninstall-am
   437         -
   438         -
   439         -# Tell versions [3.59,3.63) of GNU make to not export all variables.
   440         -# Otherwise a system limit (for SysV at least) may be exceeded.
   441         -.NOEXPORT:

Deleted test/sql_stmt_nocache_tests/amphibious1.testcase.

     1         -GPKG amphibious mode - enable
     2         -:memory:
     3         -SELECT EnableGpkgAmphibiousMode(), GetGpkgAmphibiousMode();
     4         -1 # rows
     5         -2 # column
     6         -EnableGpkgAmphibiousMode()
     7         -GetGpkgAmphibiousMode()
     8         -(NULL)
     9         -0

Deleted test/sql_stmt_nocache_tests/amphibious2.testcase.

     1         -GPKG amphibious mode - disable
     2         -:memory:
     3         -SELECT DisableGpkgAmphibiousMode(), GetGpkgAmphibiousMode();
     4         -1 # rows
     5         -2 # column
     6         -DisableGpkgAmphibiousMode()
     7         -GetGpkgAmphibiousMode();
     8         -(NULL)
     9         -0

Deleted test/sql_stmt_nocache_tests/precision1.testcase.

     1         -decimal precision - 10
     2         -:memory:
     3         -SELECT SetDecimalPrecision(10), GetDecimalPrecision();
     4         -1 # rows
     5         -2 # column
     6         -SetDecimalPrecision(10)
     7         -GetDecimalPrecision()
     8         -(NULL)
     9         --1

Deleted test/sql_stmt_nocache_tests/precision2.testcase.

     1         -decimal precision - 100
     2         -:memory:
     3         -SELECT SetDecimalPrecision(100), GetDecimalPrecision();
     4         -1 # rows
     5         -2 # column
     6         -SetDecimalPrecision(100)
     7         -GetDecimalPrecision()
     8         -(NULL)
     9         --1

Changes to test/sql_stmt_tests/Makefile.am.

   133    133   	atmcreate16.testcase \
   134    134   	atmcreate17.testcase \
   135    135   	atmcreate18.testcase \
   136    136   	atmcreate19.testcase \
   137    137   	atmcreate20.testcase \
   138    138   	atmcreate21.testcase \
   139    139   	atmcreate22.testcase \
   140         -	atmcreate23.testcase \
   141    140   	atmcreatescale1.testcase \
   142    141   	atmcreatescale2.testcase \
   143    142   	atmcreatescale3.testcase \
   144    143   	atmcreatescale4.testcase \
   145    144   	atmcreatescale5.testcase \
   146    145   	atmcreatescale6.testcase \
   147    146   	atmcreatescale7.testcase \
................................................................................
   161    160   	atmcreatexroll3.testcase \
   162    161   	atmcreateyroll1.testcase \
   163    162   	atmcreateyroll2.testcase \
   164    163   	atmcreateyroll3.testcase \
   165    164   	atmcreatezroll1.testcase \
   166    165   	atmcreatezroll2.testcase \
   167    166   	atmcreatezroll3.testcase \
   168         -	atmdeterminant1.testcase \
   169         -	atmdeterminant2.testcase \
   170         -	atmdeterminant3.testcase \
   171         -	atmdeterminant4.testcase \
   172         -	atminvert1.testcase \
   173         -	atminvert2.testcase \
   174         -	atminvert3.testcase \
   175         -	atminvert4.testcase \
   176         -	atmisinvert1.testcase \
   177         -	atmisinvert2.testcase \
   178         -	atmisinvert3.testcase \
   179         -	atmisinvert4.testcase \
   180    167   	atmisvalid1.testcase \
   181    168   	atmisvalid2.testcase \
   182    169   	atmisvalid3.testcase \
   183    170   	atmisvalid4.testcase \
   184    171   	atmisvalid5.testcase \
   185    172   	atmisvalid6.testcase \
   186    173   	atmmultiply1.testcase \

Changes to test/sql_stmt_tests/Makefile.in.

   374    374   	atmcreate16.testcase \
   375    375   	atmcreate17.testcase \
   376    376   	atmcreate18.testcase \
   377    377   	atmcreate19.testcase \
   378    378   	atmcreate20.testcase \
   379    379   	atmcreate21.testcase \
   380    380   	atmcreate22.testcase \
   381         -	atmcreate23.testcase \
   382    381   	atmcreatescale1.testcase \
   383    382   	atmcreatescale2.testcase \
   384    383   	atmcreatescale3.testcase \
   385    384   	atmcreatescale4.testcase \
   386    385   	atmcreatescale5.testcase \
   387    386   	atmcreatescale6.testcase \
   388    387   	atmcreatescale7.testcase \
................................................................................
   402    401   	atmcreatexroll3.testcase \
   403    402   	atmcreateyroll1.testcase \
   404    403   	atmcreateyroll2.testcase \
   405    404   	atmcreateyroll3.testcase \
   406    405   	atmcreatezroll1.testcase \
   407    406   	atmcreatezroll2.testcase \
   408    407   	atmcreatezroll3.testcase \
   409         -	atmdeterminant1.testcase \
   410         -	atmdeterminant2.testcase \
   411         -	atmdeterminant3.testcase \
   412         -	atmdeterminant4.testcase \
   413         -	atminvert1.testcase \
   414         -	atminvert2.testcase \
   415         -	atminvert3.testcase \
   416         -	atminvert4.testcase \
   417         -	atmisinvert1.testcase \
   418         -	atmisinvert2.testcase \
   419         -	atmisinvert3.testcase \
   420         -	atmisinvert4.testcase \
   421    408   	atmisvalid1.testcase \
   422    409   	atmisvalid2.testcase \
   423    410   	atmisvalid3.testcase \
   424    411   	atmisvalid4.testcase \
   425    412   	atmisvalid5.testcase \
   426    413   	atmisvalid6.testcase \
   427    414   	atmmultiply1.testcase \

Deleted test/sql_stmt_tests/atmcreate23.testcase.

     1         -ATM_Create() - invalid 12th arg
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Create(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 'a')
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Create(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 'a')
     7         -(NULL)

Deleted test/sql_stmt_tests/atmdeterminant1.testcase.

     1         -ATM_Determinant() - NULL arg
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Determinant(NULL)
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Determinant(NULL)
     7         -0.0

Deleted test/sql_stmt_tests/atmdeterminant2.testcase.

     1         -ATM_Determinant() - invalid BLOB
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Determinant(zeroblob(4))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Determinant(zeroblob(4))
     7         -0.0

Deleted test/sql_stmt_tests/atmdeterminant3.testcase.

     1         -ATM_Determinant() - invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Determinant(ATM_CreateScale(2,2,2))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Determinant(ATM_CreateScale(2,2,2))
     7         -8.0

Deleted test/sql_stmt_tests/atmdeterminant4.testcase.

     1         -ATM_Determinant() - not invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Determinant(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Determinant(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     7         -0.0

Deleted test/sql_stmt_tests/atminvert1.testcase.

     1         -ATM_Invert() - NULL arg
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Invert(NULL)
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Invert(NULL)
     7         -(NULL)

Deleted test/sql_stmt_tests/atminvert2.testcase.

     1         -ATM_Invert() - invalid BLOB
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Invert(zeroblob(4))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Invert(zeroblob(4))
     7         -(NULL)

Deleted test/sql_stmt_tests/atminvert3.testcase.

     1         -ATM_Invert() - invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_IsValid(ATM_Invert(ATM_CreateScale(2,2,2)))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_IsValid(ATM_Invert(ATM_CreateScale(2,2,2)))
     7         -1

Deleted test/sql_stmt_tests/atminvert4.testcase.

     1         -ATM_Invert() - not invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_Invert(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_Invert(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     7         -(NULL)

Deleted test/sql_stmt_tests/atmisinvert1.testcase.

     1         -ATM_IsInvertible() - NULL arg
     2         -:memory: #use in-memory database
     3         -SELECT ATM_IsInvertible(NULL)
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_IsInvertible(NULL)
     7         --1

Deleted test/sql_stmt_tests/atmisinvert2.testcase.

     1         -ATM_IsInvertible() - invalid BLOB
     2         -:memory: #use in-memory database
     3         -SELECT ATM_IsInvertible(zeroblob(4))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_IsInvertible(zeroblob(4))
     7         -0

Deleted test/sql_stmt_tests/atmisinvert3.testcase.

     1         -ATM_IsInvertible() - invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_IsInvertible(ATM_CreateScale(2,2,2))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_IsInvertible(ATM_CreateScale(2,2,2))
     7         -1

Deleted test/sql_stmt_tests/atmisinvert4.testcase.

     1         -ATM_IsInvertible() - not invertible
     2         -:memory: #use in-memory database
     3         -SELECT ATM_IsInvertible(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -ATM_IsInvertible(ATM_Create(1,2,3,4,5,6,7,8,9,10,11,12))
     7         -0

Changes to test/sql_stmt_tests/atmscale1.testcase.

     1      1   ATM_Scale() - valid (int)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Scale(ATM_Create(), 1, 2))
            3  +SELECT Hex(ATM_Scale(1, 2, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Scale(ATM_Create(), 1, 2))
            6  +Hex(ATM_Scale(1, 2, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000000403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmscale10.testcase.

     1      1   ATM_Scale() - invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(zeroblob(5), 1.0, 2.0)
            3  +SELECT ATM_Scale(1.0, 2.0, zeroblob(5))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(zeroblob(5), 1.0, 2.0)
            6  +ATM_Scale(1.0, 2.0, zeroblob(5))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale11.testcase.

     1      1   ATM_Scale() - 3rd invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(zeroblob(5), 1.0, 2.0, 3.0)
            3  +SELECT ATM_Scale(1.0, 2.0, 3.0, zeroblob(5))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(zeroblob(5), 1.0, 2.0, 3.0)
            6  +ATM_Scale(1.0, 2.0, 3.0, zeroblob(5))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale12.testcase.

     1      1   ATM_Scale() - invalid matrix
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale('a', 1.0, 2.0)
            3  +SELECT ATM_Scale(1.0, 2.0, 'a')
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale('a', 1.0, 2.0)
            6  +ATM_Scale(1.0, 2.0, 'a')
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale13.testcase.

     1      1   ATM_Scale() - 3rd invalid matrix
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale('a', 1.0, 2.0, 3.0)
            3  +SELECT ATM_Scale(1.0, 2.0, 3.0, 'a')
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale('a', 1.0, 2.0, 3.0)
            6  +ATM_Scale(1.0, 2.0, 3.0, 'a')
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale2.testcase.

     1      1   ATM_Scale() - valid (double)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Scale(ATM_Create(), 1.0, 2.0))
            3  +SELECT Hex(ATM_Scale(1.0, 2.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Scale(ATM_Create(), 1.0, 2.0))
            6  +Hex(ATM_Scale(1.0, 2.0, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000000403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmscale3.testcase.

     1      1   ATM_Scale() - invalid 1st arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(ATM_Create(), 'a', 2.0)
            3  +SELECT ATM_Scale('a', 2.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(ATM_Create(), 'a', 2.0)
            6  +ATM_Scale('a', 2.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale4.testcase.

     1      1   ATM_Scale() - invalid 2st arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(ATM_Create(), 1.0, 'a')
            3  +SELECT ATM_Scale(1.0, 'a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(ATM_Create(), 1.0, 'a')
            6  +ATM_Scale(1.0, 'a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale5.testcase.

     1      1   ATM_Scale() - valid 3d (int)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Scale(ATM_Create(), 1, 2, 3))
            3  +SELECT Hex(ATM_Scale(1, 2, 3, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Scale(ATM_Create(), 1, 2, 3))
            6  +Hex(ATM_Scale(1, 2, 3, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000000403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000008403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmscale6.testcase.

     1      1   ATM_Scale() - valid 3d (double)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Scale(ATM_Create(), 1.0, 2.0, 3.0))
            3  +SELECT Hex(ATM_Scale(1.0, 2.0, 3.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Scale(ATM_Create(), 1.0, 2.0, 3.0))
            6  +Hex(ATM_Scale(1.0, 2.0, 3.0, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000000403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A00000000000008403A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmscale7.testcase.

     1      1   ATM_Scale() - 3d invalid 1st arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(ATM_Create(), 'a', 2.0, 3.0)
            3  +SELECT ATM_Scale('a', 2.0, 3.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(ATM_Create(), 'a', 2.0, 3.0)
            6  +ATM_Scale('a', 2.0, 3.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale8.testcase.

     1      1   ATM_Scale() - 3d invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(ATM_Create(), 1.0, 'a', 3.0)
            3  +SELECT ATM_Scale(1.0, 'a', 3.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(ATM_Create(), 1.0, 'a', 3.0)
            6  +ATM_Scale(1.0, 'a', 3.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmscale9.testcase.

     1      1   ATM_Scale() - 3rd invalid 3nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Scale(ATM_Create(), 1.0, 2.0, 'a')
            3  +SELECT ATM_Scale(1.0, 2.0, 'a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Scale(ATM_Create(), 1.0, 2.0, 'a')
            6  +ATM_Scale(1.0, 2.0, 'a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans1.testcase.

     1      1   ATM_Translate() - valid 2d (int)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Translate(ATM_Create(), 1, 2))
            3  +SELECT Hex(ATM_Translate(1, 2, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Translate(ATM_Create(), 1, 2))
            6  +Hex(ATM_Translate(1, 2, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A000000000000F03F3A00000000000000003A00000000000000403A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmtrans10.testcase.

     1      1   ATM_Translate() - invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(zeroblob(10), 1.0, 2.0)
            3  +SELECT ATM_Translate(1.0, 2.0, zeroblob(10))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(zeroblob(10), 1.0, 2.0)
            6  +ATM_Translate(1.0, 2.0, zeroblob(10))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans11.testcase.

     1      1   ATM_Translate() - 3d invalid 3rd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(zeroblob(10), 1.0, 2.0, 3.0)
            3  +SELECT ATM_Translate(1.0, 2.0, 3.0, zeroblob(10))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(zeroblob(10), 1.0, 2.0, 3.0)
            6  +ATM_Translate(1.0, 2.0, 3.0, zeroblob(10))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans12.testcase.

     1      1   ATM_Translate() - invalid matrix
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(1, 1.0, 2.0)
            3  +SELECT ATM_Translate(1.0, 2.0, 1)
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(1, 1.0, 2.0)
            6  +ATM_Translate(1.0, 2.0, 1)
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans13.testcase.

     1      1   ATM_Translate() - 3d invalid matrix
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(1, 1.0, 2.0, 3.0)
            3  +SELECT ATM_Translate(1.0, 2.0, 3.0, 1)
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(1, 1.0, 2.0, 3.0)
            6  +ATM_Translate(1.0, 2.0, 3.0, 1)
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans2.testcase.

     1      1   ATM_Translate() - valid 2d (double)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Translate(ATM_Create(), 1.0, 2.0))
            3  +SELECT Hex(ATM_Translate(1.0, 2.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Translate(ATM_Create(), 1.0, 2.0))
            6  +Hex(ATM_Translate(1.0, 2.0, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A000000000000F03F3A00000000000000003A00000000000000403A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmtrans3.testcase.

     1      1   ATM_Translate() - 2d invalid 1st arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(ATM_Create(), 'a', 2.0)
            3  +SELECT ATM_Translate('a', 2.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(ATM_Create(), 'a', 2.0)
            6  +ATM_Translate('a', 2.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans4.testcase.

     1      1   ATM_Translate() - 2d invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(ATM_Create(), 1.0, 'a')
            3  +SELECT ATM_Translate(1.0, 'a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(ATM_Create(), 1.0, 'a')
            6  +ATM_Translate(1.0, 'a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans5.testcase.

     1      1   ATM_Translate() - valid 3d (int)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Translate(ATM_Create(), 1, 2, 3))
            3  +SELECT Hex(ATM_Translate(1, 2, 3, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Translate(ATM_Create(), 1, 2, 3))
            6  +Hex(ATM_Translate(1, 2, 3, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A000000000000F03F3A00000000000000003A00000000000000403A00000000000000003A00000000000000003A000000000000F03F3A00000000000008403A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmtrans6.testcase.

     1      1   ATM_Translate() - valid 3d (double)
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_Translate(ATM_Create(), 1.0, 2.0, 3.0))
            3  +SELECT Hex(ATM_Translate(1.0, 2.0, 3.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_Translate(ATM_Create(), 1.0, 2.0, 3.0))
            6  +Hex(ATM_Translate(1.0, 2.0, 3.0, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A000000000000F03F3A00000000000000003A00000000000000403A00000000000000003A00000000000000003A000000000000F03F3A00000000000008403A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmtrans7.testcase.

     1      1   ATM_Translate() - 3d invalid 1st arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(ATM_Create(), 'a', 2.0, 3.0)
            3  +SELECT ATM_Translate('a', 2.0, 3.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(ATM_Create(), 'a', 2.0, 3.0)
            6  +ATM_Translate('a', 2.0, 3.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans8.testcase.

     1      1   ATM_Translate() - 3d invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(ATM_Create(), 1.0, 'a', 3.0)
            3  +SELECT ATM_Translate(1.0, 'a', 3.0, ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(ATM_Create(), 1.0, 'a', 3.0)
            6  +ATM_Translate(1.0, 'a', 3.0, ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmtrans9.testcase.

     1      1   ATM_Translate() - 3d invalid 3rd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_Translate(ATM_Create(), 1.0, 2.0, 'a')
            3  +SELECT ATM_Translate(1.0, 2.0, 'a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_Translate(ATM_Create(), 1.0, 2.0, 'a')
            6  +ATM_Translate(1.0, 2.0, 'a', ATM_Create())
     7      7   (NULL)

Deleted test/sql_stmt_tests/atmtransform10.testcase.

     1         -ATM_Transform() - invalid Srid
     2         -:memory: #use in-memory database
     3         -SELECT AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633.0));
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633.0));
     7         -(NULL)

Deleted test/sql_stmt_tests/atmtransform9.testcase.

     1         -ATM_Transform() - 4326 Srid
     2         -:memory: #use in-memory database
     3         -SELECT AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633));
     4         -1 # rows (not including the header row)
     5         -1 # columns
     6         -AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633));
     7         -SRID=32633;POINT(0 0)

Changes to test/sql_stmt_tests/atmxroll1.testcase.

     1      1   ATM_XRoll() - invalid angle
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_XRoll(ATM_Create(), 'a')
            3  +SELECT ATM_XRoll('a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_XRoll(ATM_Create(), 'a')
            6  +ATM_XRoll('a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmxroll2.testcase.

     1      1   ATM_XRoll() - valid int
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_XRoll(ATM_Create(), 15))
            3  +SELECT Hex(ATM_XRoll(15, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_XRoll(ATM_Create(), 15))
            6  +Hex(ATM_XRoll(15, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A15BF4847DDE8EE3F3A900693C17D90D0BF3A00000000000000003A00000000000000003A900693C17D90D03F3A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmxroll3.testcase.

     1      1   ATM_XRoll() - valid double
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_XRoll(ATM_Create(), 15.0))
            3  +SELECT Hex(ATM_XRoll(15.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_XRoll(ATM_Create(), 15.0))
            6  +Hex(ATM_XRoll(15.0, ATM_Create()))
     7      7   0001000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A15BF4847DDE8EE3F3A900693C17D90D0BF3A00000000000000003A00000000000000003A900693C17D90D03F3A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmxroll4.testcase.

     1      1   ATM_XRoll() - invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_XRoll(zeroblob(4), 15)
            3  +SELECT ATM_XRoll(15, zeroblob(4))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_XRoll(zeroblob(4), 15)
            6  +ATM_XRoll(15, zeroblob(4))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmxroll5.testcase.

     1         -ATM_XRoll() - invalid 1st arg
            1  +ATM_XRoll() - invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_XRoll('a', 15)
            3  +SELECT ATM_XRoll(15, 'a')
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_XRoll('a', 15)
            6  +ATM_XRoll(15, 'a')
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmyroll1.testcase.

     1      1   ATM_YRoll() - invalid angle
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_YRoll(ATM_Create(), 'a')
            3  +SELECT ATM_YRoll('a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_YRoll(ATM_Create(), 'a')
            6  +ATM_YRoll('a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmyroll2.testcase.

     1      1   ATM_YRoll() - valid int
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_YRoll(ATM_Create(), 15))
            3  +SELECT Hex(ATM_YRoll(15, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_YRoll(ATM_Create(), 15))
            6  +Hex(ATM_YRoll(15, ATM_Create()))
     7      7   000115BF4847DDE8EE3F3A00000000000000003A900693C17D90D03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A900693C17D90D0BF3A00000000000000003A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmyroll3.testcase.

     1      1   ATM_YRoll() - valid double
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_YRoll(ATM_Create(), 15.0))
            3  +SELECT Hex(ATM_YRoll(15.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_YRoll(ATM_Create(), 15.0))
            6  +Hex(ATM_YRoll(15.0, ATM_Create()))
     7      7   000115BF4847DDE8EE3F3A00000000000000003A900693C17D90D03F3A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A900693C17D90D0BF3A00000000000000003A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmyroll4.testcase.

     1      1   ATM_YRoll() - invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_YRoll(zeroblob(4), 15)
            3  +SELECT ATM_YRoll(15, zeroblob(4))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_YRoll(zeroblob(4), 15)
            6  +ATM_YRoll(15, zeroblob(4))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmyroll5.testcase.

     1         -ATM_YRoll() - invalid 1st arg
            1  +ATM_YRoll() - invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_YRoll('a', 15)
            3  +SELECT ATM_YRoll(15, 'a')
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_YRoll('a', 15)
            6  +ATM_YRoll(15, 'a')
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmzroll1.testcase.

     1      1   ATM_ZRoll() - invalid angle
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_ZRoll(ATM_Create(), 'a')
            3  +SELECT ATM_ZRoll('a', ATM_Create())
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_ZRoll(ATM_Create(), 'a')
            6  +ATM_ZRoll('a', ATM_Create())
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmzroll2.testcase.

     1      1   ATM_ZRoll() - valid int
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_ZRoll(ATM_Create(), 15))
            3  +SELECT Hex(ATM_ZRoll(15, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_ZRoll(ATM_Create(), 15))
            6  +Hex(ATM_ZRoll(15, ATM_Create()))
     7      7   000115BF4847DDE8EE3F3A900693C17D90D0BF3A00000000000000003A00000000000000003A900693C17D90D03F3A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmzroll3.testcase.

     1      1   ATM_ZRoll() - valid double
     2      2   :memory: #use in-memory database
     3         -SELECT Hex(ATM_ZRoll(ATM_Create(), 15.0))
            3  +SELECT Hex(ATM_ZRoll(15.0, ATM_Create()))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -Hex(ATM_ZRoll(ATM_Create(), 15.0))
            6  +Hex(ATM_ZRoll(15.0, ATM_Create()))
     7      7   000115BF4847DDE8EE3F3A900693C17D90D0BF3A00000000000000003A00000000000000003A900693C17D90D03F3A15BF4847DDE8EE3F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03F3A00000000000000003A00000000000000003A00000000000000003A00000000000000003A000000000000F03FB3

Changes to test/sql_stmt_tests/atmzroll4.testcase.

     1      1   ATM_ZRoll() - invalid blob
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_ZRoll(zeroblob(4), 15)
            3  +SELECT ATM_ZRoll(15, zeroblob(4))
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_ZRoll(zeroblob(4), 15)
            6  +ATM_ZRoll(15, zeroblob(4))
     7      7   (NULL)

Changes to test/sql_stmt_tests/atmzroll5.testcase.

     1         -ATM_ZRoll() - invalid 1st arg
            1  +ATM_ZRoll() - invalid 2nd arg
     2      2   :memory: #use in-memory database
     3         -SELECT ATM_ZRoll('a', 15)
            3  +SELECT ATM_ZRoll(15, 'a')
     4      4   1 # rows (not including the header row)
     5      5   1 # columns
     6         -ATM_ZRoll('a', 15)
            6  +ATM_ZRoll(15, 'a')
     7      7   (NULL)