diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-24 01:55:15 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-24 01:55:15 +0000 |
| commit | f163f7cf2050c90c8738fc9d694045b31f5b3e6a (patch) | |
| tree | dc869f59fadef66522042c36e9b3a0aa420e5000 | |
| parent | a7d17d5e8ea36d0aa45475ec5bdb8072f02396a6 (diff) | |
| download | PROJ-f163f7cf2050c90c8738fc9d694045b31f5b3e6a.tar.gz PROJ-f163f7cf2050c90c8738fc9d694045b31f5b3e6a.zip | |
move 900913 definition from esri.extra to other.extra - more appropriate
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2038 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nad/esri.extra | 4 | ||||
| -rw-r--r-- | nad/other.extra | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -1,5 +1,8 @@ 2011-05-23 Frank Warmerdam <warmerdam@pobox.com> + * nad/esri.extra, nad/other.extra: moved 900913 definition from + esri.extra to other.extra since it has nothing to do with esri. + * nad/epsg: updated to EPSG 7.6. 2011-05-20 Frank Warmerdam <warmerdam@pobox.com> diff --git a/nad/esri.extra b/nad/esri.extra index 2514b33c..611dd660 100644 --- a/nad/esri.extra +++ b/nad/esri.extra @@ -946,7 +946,3 @@ <104304> +proj=longlat +a=6378249.2 +b=6356514.999904194 no_defs <> # GCS Voirol Unifie 1960 Degree <104305> +proj=longlat +ellps=clrk80 no_defs <> -# -# Chris' funny epsgish code for the google mercator -# -<900913> +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs <> diff --git a/nad/other.extra b/nad/other.extra index 168525d2..92785ae0 100644 --- a/nad/other.extra +++ b/nad/other.extra @@ -47,3 +47,7 @@ <42310> +proj=merc +lat_ts=0 +lon_0=0 +k=1.000000 +x_0=0 +y_0=0 +ellps=GRS80 +datum=WGS84 +units=m +no_defs no_defs <> # NAD83 / LCC Statcan <42311> +proj=lcc +lat_1=49 +lat_2=77 +lat_0=63.390675 +lon_0=-91.86666700000001 +x_0=6200000 +y_0=3000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs no_defs <> +# +# Chris' funny epsgish code for the google mercator +# +<900913> +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs <> |