aboutsummaryrefslogtreecommitdiff
path: root/src/wkt2_grammar.y
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-11-16 13:57:09 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-11-16 14:34:33 +0100
commit63f9f4e09ab26f1a52751cec15f394e88660b8bf (patch)
treedf6541743ae031304b3ea7419db0b2a33d9b1bf6 /src/wkt2_grammar.y
parent1a98229ed2c738bd563122084a08d36b2bf0ebaf (diff)
downloadPROJ-63f9f4e09ab26f1a52751cec15f394e88660b8bf.tar.gz
PROJ-63f9f4e09ab26f1a52751cec15f394e88660b8bf.zip
WKT2 parsing: several fixes related to map projection parameter units
- WKT2 grammar: accept PARAMETER[name,value,id] without unit - Recognize "Ellipsoid scaling factor" as a parameter with a scaling unit, and defaults to Unity when not specified - WKT2 parsing: implement the requirement of 18-010r7.html#80, that is when a map projection parameter has no explicit unit, use metre/degree/unity as the default unit (contrary to WKT1 parsing rules where they are deduced from the GeogCRS angular unit and coordinate system)
Diffstat (limited to 'src/wkt2_grammar.y')
-rw-r--r--src/wkt2_grammar.y1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wkt2_grammar.y b/src/wkt2_grammar.y
index 4f30b5b2..fc2e8bf0 100644
--- a/src/wkt2_grammar.y
+++ b/src/wkt2_grammar.y
@@ -1073,6 +1073,7 @@ map_projection_parameter: parameter_keyword left_delimiter parameter_name
right_delimiter
opt_separator_param_unit_identifier_list:
+ | wkt_separator identifier opt_separator_identifier_list
| wkt_separator map_projection_parameter_unit opt_separator_identifier_list
parameter_keyword: T_PARAMETER