core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1115: New keys: projSourceString and projTargetString

This commit is contained in:
Shahram Najm 2020-06-09 15:17:23 +01:00
parent fb41fb9c2b
commit 8ab83fae9a
5 changed files with 7190 additions and 6738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
definitions/grib1/section.4.def
View File

@ -231,7 +231,9 @@ alias ls.gridType=gridType;
alias geography.gridType=gridType; alias geography.gridType=gridType;
alias typeOfGrid=gridType; alias typeOfGrid=gridType;
meta projString proj_string(gridType): hidden; constant projSourceString = "EPSG:4326" : hidden;
meta projTargetString proj_string(gridType): hidden;
alias projString = projTargetString : hidden;
meta getNumberOfValues size(values) : edition_specific,dump ; meta getNumberOfValues size(values) : edition_specific,dump ;

4
definitions/grib2/section.3.def
View File

@ -120,4 +120,6 @@ alias typeOfGrid=gridType;
meta md5Section3 md5(offsetSection3,section3Length); meta md5Section3 md5(offsetSection3,section3Length);
alias md5GridSection = md5Section3; alias md5GridSection = md5Section3;
meta projString proj_string(gridType): hidden; constant projSourceString = "EPSG:4326" : hidden;
meta projTargetString proj_string(gridType): hidden;
alias projString = projTargetString : hidden;

12570
src/grib_hash_keys.c
View File

File diff suppressed because it is too large Load Diff

6
tests/grib_proj_string.sh
View File

@ -24,7 +24,9 @@ fi
for f in `echo $files`; do for f in `echo $files`; do
file=${data_dir}/$f file=${data_dir}/$f
ps=`${tools_dir}/grib_get -wcount=1 -p projString $file` ps=`${tools_dir}/grib_get -wcount=1 -p projSourceString $file`
[ "$ps" = "EPSG:4326" ]
ps=`${tools_dir}/grib_get -wcount=1 -p projTargetString $file`
# Check length of result is nonzero # Check length of result is nonzero
[ -n "$ps" ] [ -n "$ps" ]
# Check contents (basic) # Check contents (basic)
@ -40,4 +42,4 @@ done
# Reminder # Reminder
keysfile=${proj_dir}/tests/keys keysfile=${proj_dir}/tests/keys
grep -q projString $keysfile grep -q projTargetString $keysfile

1344
tests/keys
View File

File diff suppressed because it is too large Load Diff