Переглянути джерело

backported fixes from GDAL/data/

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41225 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 15 роки тому
батько
коміт
33513219d8
3 змінених файлів з 31 додано та 7 видалено
  1. 21 6
      lib/proj/gcs.override.csv
  2. 8 0
      lib/proj/pcs.override.csv
  3. 2 1
      lib/proj/stateplane.csv

+ 21 - 6
lib/proj/gcs.override.csv

@@ -1,14 +1,22 @@
-"COORD_REF_SYS_CODE","COORD_REF_SYS_NAME","DATUM_CODE","DATUM_NAME","GREENWICH_DATUM","UOM_CODE","ELLIPSOID_CODE","PRIME_MERIDIAN_CODE","SHOW_CRS","DEPRECATED","COORD_OP_METHOD_CODE","DX","DY","DZ","RX","RY","RZ","DS"
+"COORD_REF_SYS_CODE","COORD_REF_SYS_NAME","DATUM_CODE","DATUM_NAME","GREENWICH_DATUM","UOM_CODE","ELLIPSOID_CODE","PRIME_MERIDIAN_CODE","SHOW_CRS","DEPRECATED","COORD_SYS_CODE","COORD_OP_METHOD_CODE","DX","DY","DZ","RX","RY","RZ","DS"
+#
+# NOTICE: The master version of this file is in the libgeotiff subversion at:
+#
+# https://svn.osgeo.org/metacrs/geotiff/trunk/libgeotiff/csv/gcs.override.csv
+#
+# Do *not* change other copies without upstreaming the results to libgeotiff.
+#
+#
 #
 # See http://bugzilla.remotesensing.org/show_bug.cgi?id=339
 # Or http://www.linz.govt.nz/rcs/linz/pub/web/root/core/SurveySystem/GeodeticInfo/geodeticdatums/index.jsp
 #
-4272,NZGD49,6272,New Zealand Geodetic Datum 1949,6272,9122,7022,8901,1,0,9606,59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993
+4272,NZGD49,6272,New Zealand Geodetic Datum 1949,6272,9122,7022,8901,1,0,6422,9606,59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993
 #
 #
 # Use the seven-parameter transformation from the BEV (1618) for MGI (bug 870)
 #
-4312,MGI,6312,Militar-Geographische Institut,6312,9108,7004,8901,1,0,9606,577.326,90.129,463.919,5.137,1.474,5.297,2.4232
+4312,MGI,6312,Militar-Geographische Institut,6312,9108,7004,8901,1,0,6422,9606,577.326,90.129,463.919,5.137,1.474,5.297,2.4232
 #
 # Bart van den Eijnden and Jan Hartmann suggest this datum shift value:
 #
@@ -16,12 +24,19 @@
 #
 # Per http://bugzilla.remotesensing.org/show_bug.cgi?id=1305
 # 
-4218,Bogota 1975,6218,Bogota 1975,6218,9122,7022,8901,1,0,9603,307,304,-318,,,,
+4218,Bogota 1975,6218,Bogota 1975,6218,9122,7022,8901,1,0,6422,9603,307,304,-318,,,,
 #
 # Per http://bugzilla.remotesensing.org/show_bug.cgi?id=957
 #
-4149,CH1903,6149,CH1903,6149,9122,7004,8901,1,0,9603,674.374,15.056,405.346,,,,
+4149,CH1903,6149,CH1903,6149,9122,7004,8901,1,0,6422,9603,674.374,15.056,405.346,,,,
 #
 # From Jan: http://bugzilla.remotesensing.org/show_bug.cgi?id=1336
 #
-4313,Belge 1972,6313,Reseau National Belge 1972,6313,9122,7022,8901,1,0,9606,106.868628,-52.297783,103.723893,-0.336570,0.456955,-1.842183,1.0000012747
+4313,Belge 1972,6313,Reseau National Belge 1972,6313,9122,7022,8901,1,0,6422,9606,106.868628,-52.297783,103.723893,-0.336570,0.456955,-1.842183,1.0000012747
+#
+# Seven-parameter transformation for Pulkovo 1942
+# as defined by the GOST P 51794-2001.
+# See http://trac.osgeo.org/gdal/ticket/3176 for details.
+#
+4284,Pulkovo 1942,6284,Pulkovo 1942,6284,9122,7024,8901,1,0,6422,9607,23.9,-141.3,-80.9,0,-0.37,-0.85,-0.12
+

Різницю між файлами не показано, бо вона завелика
+ 8 - 0
lib/proj/pcs.override.csv


+ 2 - 1
lib/proj/stateplane.csv

@@ -33,6 +33,7 @@
 1402,IOWA,SOUTH,2,NAD83,1402,26976
 1501,KANSAS,NORTH,2,NAD83,1501,26977
 1502,KANSAS,SOUTH,2,NAD83,1502,26978
+1600,KENTUCKY,SINGLE ZONE,2,NAD83,1600,3088 
 1601,KENTUCKY,NORTH,2,NAD83,1601,2205
 1602,KENTUCKY,SOUTH,2,NAD83,1602,26980
 1701,LOUISIANA,NORTH,2,NAD83,1701,26981
@@ -135,7 +136,7 @@
 10404,CALIFORNIA,IV,2,NAD27,404,26744
 10405,CALIFORNIA,V,2,NAD27,405,26745
 10406,CALIFORNIA,VI,2,NAD27,406,26746
-10407,CALIFORNIA,VII,2,NAD27,407,26747
+10407,CALIFORNIA,VII,2,NAD27,407,26799
 10501,COLORADO,NORTH,2,NAD27,501,26753
 10502,COLORADO,CENTRAL,2,NAD27,502,26754
 10503,COLORADO,SOUTH,2,NAD27,503,26755