diff --git a/ch05.adoc b/ch05.adoc index c8a8497b..9a6a0122 100644 --- a/ch05.adoc +++ b/ch05.adoc @@ -550,42 +550,42 @@ variables: crs:reference_ellipsoid_name = "Airy 1830" ; crs:prime_meridian_name = "Greenwich" ; crs:towgs84 = 375., -111., 431., 0., 0., 0., 0. ; - crs:crs_wkt = "COMPOUNDCRS ["OSGB 1936 / British National Grid + ODN", - PROJCRS ["OSGB 1936 / British National Grid", - GEODCRS ["OSGB 1936", - DATUM ["OSGB 1936", - ELLIPSOID ["Airy 1830", 6377563.396, 299.3249646, - LENGTHUNIT[“metre”,1.0]], - TOWGS84[375, -111, 431, 0, 0, 0, 0] + crs:crs_wkt = "COMPOUNDCRS["OSGB 1936 / British National Grid + ODN", + PROJCRS["OSGB 1936 / British National Grid", + BASEGEODCRS["OSGB 1936", + DATUM["OSGB 1936", + ELLIPSOID["Airy 1830", 6377563.396, 299.3249646, + LENGTHUNIT["metre",1.0]] ], PRIMEM ["Greenwich", 0], UNIT ["degree", 0.0174532925199433] ], CONVERSION["OSGB", - METHOD["Transverse Mercator", - PARAMETER["False easting", 400000, LENGTHUNIT[“metre”,1.0]], - PARAMETER["False northing", -100000, LENGTHUNIT[“metre”,1.0]], + METHOD["Transverse Mercator"], + PARAMETER["False easting", 400000, LENGTHUNIT["metre",1.0]], + PARAMETER["False northing", -100000, LENGTHUNIT["metre",1.0]], PARAMETER["Longitude of natural origin", -2.0, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Latitude of natural origin", 49.0, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Longitude of false origin", -7.556, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Latitude of false origin", 49.766, - ANGLEUNIT[“degree”,0.0174532925199433]], - PARAMETER["Scale factor at natural origin", 0.9996012717, SCALEUNIT[“Unity”,1.0]], - AUTHORITY["EPSG", "27700"]] - CS[Cartesian,2], - AXIS["easting (X)",east], - AXIS["northing (Y)",north], - LENGTHUNIT[“metre”, 1.0], + ANGLEUNIT["degree",0.0174532925199433]], + PARAMETER["Scale factor at natural origin", 0.9996012717, SCALEUNIT["Unity",1.0]] + ], + CS[Cartesian, 2], + AXIS["easting (X)",east], + AXIS["northing (Y)",north], + LENGTHUNIT["metre",1.0], + ID["EPSG",27700] ], - VERTCRS ["Newlyn", - VDATUM ["Ordnance Datum Newlyn", 2005], - AUTHORITY ["EPSG", "5701"] + VERTCRS["Newlyn", + VDATUM["Ordnance Datum Newlyn"], CS[vertical,1], - AXIS["gravity-related height (H)",up], - LENGTHUNIT[“metre”,1.0] + AXIS["gravity-related height (H)",up], + LENGTHUNIT["metre",1.0], + ID["EPSG",5701] ] ]" ; ... diff --git a/history.adoc b/history.adoc index 1eb03c81..64d6f82b 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,7 @@ === Working version (most recent first) +* {issues}566[Issue #566]: Fix invalid CRS WKT attribute in example 5.12. * {issues}527[Issue #527]: Clarify the conventions for boundary variables, especially for auxiliary coordinate variables of more than one dimension, state that there is no default for boundaries, add more information about bounds in section 1. * {issues}550[Issue #550]: Include a link to CF area-type table and make explicit the need to use standardized area-type strings in Section 7.3.3. * {issues}542[Issue #542]: Clarify and rearrange text of section 4.4 about time coordinate units and calendars; introduce new text and a diagram explaining leap-seconds in existing calendars; define leap_second keyword of units_metadata attribute; define utc and tai calendars; define "datetime" in section 1.3.