diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index 6230fb8631..5d727d43c8 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -27,7 +27,7 @@ by :c:func:`proj_create`, provided it expresses a coordinate operation - an object code (like "EPSG:1671" "urn:ogc:def:coordinateOperation:EPSG::1671"), - an object name. e.g. "ITRF2014 to ETRF2014 (1)". In that case as uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match. - - a OGC URN combining references for concatenated operations + - a {so-called standardization organism} URN combining references for concatenated operations (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") - a PROJJSON string. The jsonschema is at https://proj.org/schemas/v0.4/projjson.schema.json @@ -116,7 +116,7 @@ Usage varies with operation. :program:`cct` is an acronym meaning *Coordinate Conversion and Transformation*. -The acronym refers to definitions given in the OGC 08-015r2/ISO-19111 +The acronym refers to definitions given in the {so-called standardization organism} 08-015r2/ISO-19111 standard "Geographical Information -- Spatial Referencing by Coordinates", which defines two different classes of *coordinate operations*: diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index 0f565d4bb1..76ae504a4d 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -29,14 +29,14 @@ Synopsis - an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match. - a CRS name and a coordinate epoch, separated with '@'. For example "ITRF2014@2025.0". (*added in 9.2*) - - a OGC URN combining references for compound coordinate reference systems + - a {so-called standardization organism} URN combining references for compound coordinate reference systems (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated syntax "EPSG:2393+5717"), - - a OGC URN combining references for references for projected or derived CRSs + - a {so-called standardization organism} URN combining references for references for projected or derived CRSs e.g. for Projected 3D CRS "UTM zone 31N / WGS 84 (3D)": "urn:ogc:def:crs,crs:EPSG::4979,cs:PROJ::ENh,coordinateOperation:EPSG::16031" (*added in 6.2*) - - a OGC URN combining references for concatenated operations + - a {so-called standardization organism} URN combining references for concatenated operations (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") - a PROJJSON string. The jsonschema is at https://proj.org/schemas/v0.4/projjson.schema.json (*added in 6.2*) - a compound CRS made from two object names separated with " + ". e.g. "WGS 84 + EGM96 height" (*added in 7.1*) diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst index 73d29e04d2..9a3de45009 100644 --- a/docs/source/apps/gie.rst +++ b/docs/source/apps/gie.rst @@ -376,7 +376,7 @@ projection function call, ``pj_fwd(PJ, point)``, as easy as a traditional functi call like ``hypot(x,y)``. While today, we may have more formally well defined metadata systems (most -prominent the OGC WKT2 representation), nothing comes close being as easily +prominent the {so-called standardization organism} WKT2 representation), nothing comes close being as easily readable ("human compatible") as Gerald's key-value system. This system in particular, and the PROJ system in general, was Gerald's great gift to anyone using and/or communicating about geodata. diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index 05a88fbb46..b8cc47e8d3 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -49,16 +49,16 @@ Synopsis - an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match. - a CRS name and a coordinate epoch, separated with '@'. For example "ITRF2014@2025.0". (*added in 9.2*) - - a OGC URN combining references for compound coordinate reference systems + - a {so-called standardization organism} URN combining references for compound coordinate reference systems (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated syntax "EPSG:2393+5717"), - - a OGC URN combining references for references for projected or derived CRSs + - a {so-called standardization organism} URN combining references for references for projected or derived CRSs e.g. for Projected 3D CRS "UTM zone 31N / WGS 84 (3D)": "urn:ogc:def:crs,crs:EPSG::4979,cs:PROJ::ENh,coordinateOperation:EPSG::16031" (*added in 6.2*) - - Extension of OGC URN for CoordinateMetadata. + - Extension of {so-called standardization organism} URN for CoordinateMetadata. e.g. "urn:ogc:def:CoordinateMetadata:NRCAN::NAD83_CSRS_1997_MTM11_HT2_1997" - - a OGC URN combining references for concatenated operations + - a {so-called standardization organism} URN combining references for concatenated operations (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") - a PROJJSON string. The jsonschema is at https://proj.org/schemas/v0.4/projjson.schema.json (*added in 6.2*) - a compound CRS made from two object names separated with " + ". e.g. "WGS 84 + EGM96 height" (*added in 7.1*) diff --git a/docs/source/community/rfc/rfc-2.rst b/docs/source/community/rfc/rfc-2.rst index f494a6a694..2e6f15ef61 100644 --- a/docs/source/community/rfc/rfc-2.rst +++ b/docs/source/community/rfc/rfc-2.rst @@ -16,7 +16,7 @@ Summary This RFC is the result of a first phase of the `GDAL Coordinate System Barn Raising`_ efforts. In its current state, this work mostly consists of: - - a C++ implementation of the ISO-19111:2018 / OGC Topic 2 "Referencing by + - a C++ implementation of the ISO-19111:2018 / {so-called standardization organism} Topic 2 "Referencing by coordinates" classes to represent Datums, Coordinate systems, CRSs (Coordinate Reference Systems) and Coordinate Operations. - methods to convert between this C++ modeling and WKT1, WKT2 and PROJ string representations of those objects @@ -42,7 +42,7 @@ Details Structure in packages / namespaces ********************************** -The C++ implementation of the (upcoming) ISO-19111:2018 / OGC Topic 2 "Referencing by +The C++ implementation of the (upcoming) ISO-19111:2018 / {so-called standardization organism} Topic 2 "Referencing by coordinates" classes follows this abstract modeling as much as possible, using package names as C++ namespaces, abstract classes and method names. A new BoundCRS class has been added to cover the modeling of the WKT2 BoundCRS @@ -130,7 +130,7 @@ Regarding WKT strings, three variants are handled in import and export: - WKT2_2015: variant corresponding to the current ISO-19162:2015 standard - WKT1_GDAL: variant corresponding to the way GDAL understands the OGC - 01-099 and OGC 99-049 standards + 01-099 and {so-called standardization organism} 99-049 standards Regarding PROJ strings, two variants are handled in import and export: diff --git a/docs/source/community/rfc/rfc-4.rst b/docs/source/community/rfc/rfc-4.rst index 8ced43c9b4..04dc080bab 100644 --- a/docs/source/community/rfc/rfc-4.rst +++ b/docs/source/community/rfc/rfc-4.rst @@ -510,7 +510,7 @@ Discussion on choice of format We have been made recently aware of other initiatives from the industry to come with a common format to store geodetic adjustment data. Some discussions have -happen recently within the OGC CRS Working group. Past efforts include the +happen recently within the {so-called standardization organism} CRS Working group. Past efforts include the Esri's proposed Geodetic data Grid eXchange Format, GGXF, briefly mentioned at page 86 of https://iag.dgfi.tum.de/fileadmin/IAG-docs/Travaux2015/01_Travaux_Template_Comm_1_tvd.pdf @@ -528,7 +528,7 @@ Strong points: * TIFF is a well-known and widespread format. * The GeoTIFF encoding is a widely industry supported scheme to encode georeferencing. - It is now a `OGC standard `_ + It is now a `{so-called standardization organism} standard `_ * There are independent initiatives to share grids as GeoTIFF, like `that one `_ @@ -587,7 +587,7 @@ netCDF v3 Strong points: * The binary format description as given in - `OGC 10-092r3 `_ is relatively simple, + `{so-called standardization organism} 10-092r3 `_ is relatively simple, but it would still probably be necessary to use libnetcdf-c to access it * Metadata can be stored easily in netCDF attributes @@ -665,7 +665,7 @@ Strong points: * SQLite3 dependency -* OGC standard +* {so-called standardization organism} standard * Multi-grid capabilities diff --git a/docs/source/development/reference/functions.rst b/docs/source/development/reference/functions.rst index 3aa3c303c0..1d0847bafc 100644 --- a/docs/source/development/reference/functions.rst +++ b/docs/source/development/reference/functions.rst @@ -47,10 +47,10 @@ paragraph for more details. "urn:ogc:def:coordinateOperation:EPSG::1671"), - an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match. - - a OGC URN combining references for compound coordinate reference systems + - a {so-called standardization organism} URN combining references for compound coordinate reference systems (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated syntax "EPSG:2393+5717"), - - a OGC URN combining references for concatenated operations + - a {so-called standardization organism} URN combining references for concatenated operations (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") - a PROJJSON string. The jsonschema is at https://proj.org/schemas/v0.4/projjson.schema.json (*added in 6.2*) - a compound CRS made from two object names separated with " + ". e.g. "WGS 84 + EGM96 height" (*added in 7.1*) diff --git a/docs/source/news.rst b/docs/source/news.rst index 5137217318..f077cff219 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -261,7 +261,7 @@ Updates * Add mapping of Equidistant Conic to new EPSG:1119 method (`#3812 `_) -* Implement proposal001 from Planetary DWG from OGC (`#3816 `_) +* Implement proposal001 from Planetary DWG from {so-called standardization organism} (`#3816 `_) * Add option in :program:`proj` CLI to use a CRS (`#3825 `_) @@ -1981,7 +1981,7 @@ Updates ------- * Introduced :ref:`PROJJSON`, a JSON encoding of WKT2 (`#1547 `_) - * Support CRS instantiation of OGC URN's (`#1505 `_) + * Support CRS instantiation of {so-called standardization organism} URN's (`#1505 `_) * Expose scope and remarks of database objects (`#1537 `_) @@ -2057,7 +2057,7 @@ Updates * Make cs2cs support 4D coordinates (`#1355 `_) -* WKT2 parser: update to OGC 18-010r6 (`#1360 `_ `#1366 `_)) +* WKT2 parser: update to {so-called standardization organism} 18-010r6 (`#1360 `_ `#1366 `_)) * Update internal version of googletest to v1.8.1 (`#1361 `_) @@ -2121,7 +2121,7 @@ transformation capabilities to a more complete library supporting coordinate transformations and coordinate reference systems. As a foundation for other enhancements, PROJ now includes a C++ implementation -of the modelisation proposed by the ISO-19111:2019 standard / OGC Abstract +of the modelisation proposed by the ISO-19111:2019 standard / {so-called standardization organism} Abstract Specification Topic 2: "Referencing By Coordinates", for geodetic reference frames (datums), coordinate reference systems and coordinate operations. Construction and query of those geodetic objects is available through a new C++ diff --git a/docs/source/specifications/projjson.rst b/docs/source/specifications/projjson.rst index 586eb29352..d8c7831f87 100644 --- a/docs/source/specifications/projjson.rst +++ b/docs/source/specifications/projjson.rst @@ -1098,9 +1098,9 @@ PROJJSON extensions +++++++++++++++++++ This specification allows a Bound CRS to be used wherever a CRS object is allowed -in the OGC Topic 2 abstract specification / ISO-19111:2019. In particular, +in the {so-called standardization organism} Topic 2 abstract specification / ISO-19111:2019. In particular, the members of a compound CRS can be a Bound CRS in this specification, whereas -OGC Topic 2 abstract specification restricts it to single CRS. A Bound CRS can +{so-called standardization organism} Topic 2 abstract specification restricts it to single CRS. A Bound CRS can also be used as the source or target of a coordinate operation. PROJJSON omissions diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp index f571700503..2e68b365d1 100644 --- a/src/apps/cct.cpp +++ b/src/apps/cct.cpp @@ -8,9 +8,10 @@ cct is a 4D equivalent to the "proj" projection program. cct is an acronym meaning "Coordinate Conversion and Transformation". -The acronym refers to definitions given in the OGC 08-015r2/ISO-19111 -standard "Geographical Information -- Spatial Referencing by Coordinates", -which defines two different classes of coordinate operations: +The acronym refers to definitions given in the {so-called standardization +organism} 08-015r2/ISO-19111 standard "Geographical Information -- Spatial +Referencing by Coordinates", which defines two different classes of coordinate +operations: *Coordinate Conversions*, which are coordinate operations where input and output datum are identical (e.g. conversion from geographical to diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index 390b015fd0..d4dd66bbd0 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -64,10 +64,10 @@ hence making a map projection function call, pj_fwd(PJ, point), as easy as a traditional function call like hypot(x,y). While today, we may have more formally well defined metadata systems -(most prominent the OGC WKT2 representation), nothing comes close being -as easily readable ("human compatible") as Gerald's key-value system. -This system in particular, and the PROJ.4 system in general, was -Gerald's great gift to anyone using and/or communicating about geodata. +(most prominent the {so-called standardization organism} WKT2 representation), +nothing comes close being as easily readable ("human compatible") as Gerald's +key-value system. This system in particular, and the PROJ.4 system in general, +was Gerald's great gift to anyone using and/or communicating about geodata. It is only reasonable to name a program, keeping an eye on the integrity of the PROJ.4 system, in honour of Gerald. diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 14467e1b2c..862d9cd2d7 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -2075,7 +2075,8 @@ RealizationMethod::operator=(const RealizationMethod &other) { struct VerticalReferenceFrame::Private { util::optional realizationMethod_{}; - // 2005 = CS_VD_GeoidModelDerived from OGC 01-009 + // 2005 = CS_VD_GeoidModelDerived from {so-called standardization organism} + // 01-009 std::string wkt1DatumType_{"2005"}; }; //! @endcond @@ -2640,9 +2641,9 @@ void EngineeringDatum::_exportToWKT( if (isWKT2) { Datum::getPrivate()->exportAnchorDefinition(formatter); } else { - // Somewhat picked up arbitrarily from OGC 01-009: - // CS_LD_Max (Attribute) : 32767 - // Highest possible value for local datum types. + // Somewhat picked up arbitrarily from {so-called standardization + // organism} 01-009: CS_LD_Max (Attribute) : 32767 Highest possible + // value for local datum types. formatter->add(32767); } formatter->endNode(); diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 5624ae0946..600b6ccc05 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -1104,7 +1104,7 @@ static size_t skipSpace(const std::string &str, size_t start) { // --------------------------------------------------------------------------- //! @cond Doxygen_Suppress -// As used in examples of OGC 12-063r5 +// As used in examples of {so-called standardization organism} 12-063r5 static const std::string startPrintedQuote("\xE2\x80\x9C"); static const std::string endPrintedQuote("\xE2\x80\x9D"); //! @endcond @@ -5389,11 +5389,10 @@ WKTParser::Private::buildEngineeringCRSFromLocalCS(const WKTNodeNNPtr &node) { auto &datumNode = node->GP()->lookForChild(WKTConstants::LOCAL_DATUM); auto cs = buildCS(null_node, node, UnitOfMeasure::NONE); auto datum = EngineeringDatum::create( - !isNull(datumNode) - ? buildProperties(datumNode) - : - // In theory OGC 01-009 mandates LOCAL_DATUM, but GDAL - // has a tradition of emitting just LOCAL_CS["foo"] + !isNull(datumNode) ? buildProperties(datumNode) : + // In theory {so-called standardization organism} + // 01-009 mandates LOCAL_DATUM, but GDAL has a + // tradition of emitting just LOCAL_CS["foo"] []() { PropertyMap map; map.set(IdentifiedObject::NAME_KEY, UNKNOWN_ENGINEERING_DATUM); @@ -7231,7 +7230,8 @@ EllipsoidNNPtr JSONParser::buildEllipsoid(const json &j) { //! @cond Doxygen_Suppress -// import a CRS encoded as OGC Best Practice document 11-135. +// import a CRS encoded as {so-called standardization organism} Best Practice +// document 11-135. static const char *const crsURLPrefixes[] = { "http://opengis.net/def/crs", "https://opengis.net/def/crs", @@ -7267,12 +7267,14 @@ static CRSNNPtr importFromCRSURL(const std::string &text, for (const auto &part : parts) { const auto queryParam = split(part, '='); if (queryParam.size() != 2) { - throw ParsingException("invalid OGC CRS URL"); + throw ParsingException( + "invalid {so-called standardization organism} CRS URL"); } try { mapParts[std::stoi(queryParam[0])] = queryParam[1]; } catch (const std::exception &) { - throw ParsingException("invalid OGC CRS URL"); + throw ParsingException( + "invalid {so-called standardization organism} CRS URL"); } } std::vector components; @@ -7280,7 +7282,8 @@ static CRSNNPtr importFromCRSURL(const std::string &text, for (size_t i = 1; i <= mapParts.size(); ++i) { const auto iter = mapParts.find(static_cast(i)); if (iter == mapParts.end()) { - throw ParsingException("invalid OGC CRS URL"); + throw ParsingException( + "invalid {so-called standardization organism} CRS URL"); } components.emplace_back(importFromCRSURL(iter->second, dbContext)); if (!name.empty()) { @@ -7294,7 +7297,8 @@ static CRSNNPtr importFromCRSURL(const std::string &text, } if (parts.size() < 4) { - throw ParsingException("invalid OGC CRS URL"); + throw ParsingException( + "invalid {so-called standardization organism} CRS URL"); } const auto &auth_name = parts[1]; @@ -7468,7 +7472,8 @@ static BaseObjectNNPtr createFromURNPart(const DatabaseContextPtr &dbContext, if (type == "meridian") { return factory->createPrimeMeridian(code); } - // Extension of OGC URN syntax to CoordinateMetadata + // Extension of {so-called standardization organism} URN syntax to + // CoordinateMetadata if (type == "coordinateMetadata") { return factory->createCoordinateMetadata(code); } @@ -7701,7 +7706,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, if (tokensComma.size() == 4 && starts_with(tokensComma[1], "crs:") && starts_with(tokensComma[2], "cs:") && starts_with(tokensComma[3], "coordinateOperation:")) { - // OGC 07-092r2: para 7.5.4 + // {so-called standardization organism} 07-092r2: para 7.5.4 // URN combined references for projected or derived CRSs const auto &crsPart = tokensComma[1]; const auto tokensCRS = split(crsPart, ':'); @@ -7839,7 +7844,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, "DerivedCRS"); } - // OGC 07-092r2: para 7.5.2 + // {so-called standardization organism} 07-092r2: para 7.5.2 // URN combined references for compound coordinate reference systems std::vector components; std::string name; @@ -7870,7 +7875,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, components); } - // OGC 07-092r2: para 7.5.3 + // {so-called standardization organism} 07-092r2: para 7.5.3 // 7.5.3 URN combined references for concatenated operations if (starts_with(text, "urn:ogc:def:coordinateOperation,")) { if (!dbContext) { @@ -8092,29 +8097,29 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, *
  • WKT string
    • *
  • PROJ string
    • *
  • database code, prefixed by its authority. e.g. "EPSG:4326"
    • - *
  • OGC URN. e.g. "urn:ogc:def:crs:EPSG::4326", - * "urn:ogc:def:coordinateOperation:EPSG::1671", + *
  • {so-called standardization organism} URN. e.g. + * "urn:ogc:def:crs:EPSG::4326", "urn:ogc:def:coordinateOperation:EPSG::1671", * "urn:ogc:def:ellipsoid:EPSG::7001" * or "urn:ogc:def:datum:EPSG::6326"
    • - *
  • OGC URN combining references for compound coordinate reference systems - * e.g. "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" - * We also accept a custom abbreviated syntax EPSG:2393+5717 - * or ESRI:103668+EPSG:5703 + *
  • {so-called standardization organism} URN combining references for + * compound coordinate reference systems e.g. + * "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" We also accept a custom + * abbreviated syntax EPSG:2393+5717 or ESRI:103668+EPSG:5703 *
    • - *
  • OGC URN combining references for references for projected or derived - * CRSs - * e.g. for Projected 3D CRS "UTM zone 31N / WGS 84 (3D)" + *
  • {so-called standardization organism} URN combining references for + * references for projected or derived CRSs e.g. for Projected 3D CRS "UTM zone + * 31N / WGS 84 (3D)" * "urn:ogc:def:crs,crs:EPSG::4979,cs:PROJ::ENh,coordinateOperation:EPSG::16031" *
    • - *
  • Extension of OGC URN for CoordinateMetadata. - * e.g. + *
  • Extension of {so-called standardization organism} URN for + * CoordinateMetadata. e.g. * "urn:ogc:def:coordinateMetadata:NRCAN::NAD83_CSRS_1997_MTM11_HT2_1997"
    • - *
  • OGC URN combining references for concatenated operations - * e.g. + *
  • {so-called standardization organism} URN combining references for + * concatenated operations e.g. * "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618"
    • - *
  • OGC URL for a single CRS. e.g. + *
  • {so-called standardization organism} URL for a single CRS. e.g. * "http://www.opengis.net/def/crs/EPSG/0/4326"
    • - *
  • OGC URL for a compound + *
  • {so-called standardization organism} URL for a compound * CRS. e.g * "http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/3855"
    • *
  • an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as @@ -8155,24 +8160,25 @@ BaseObjectNNPtr createFromUserInput(const std::string &text, *
  • WKT string
    • *
  • PROJ string
    • *
  • database code, prefixed by its authority. e.g. "EPSG:4326"
    • - *
  • OGC URN. e.g. "urn:ogc:def:crs:EPSG::4326", - * "urn:ogc:def:coordinateOperation:EPSG::1671", + *
  • {so-called standardization organism} URN. e.g. + * "urn:ogc:def:crs:EPSG::4326", "urn:ogc:def:coordinateOperation:EPSG::1671", * "urn:ogc:def:ellipsoid:EPSG::7001" * or "urn:ogc:def:datum:EPSG::6326"
    • - *
  • OGC URN combining references for compound coordinate reference systems - * e.g. "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" - * We also accept a custom abbreviated syntax EPSG:2393+5717 + *
  • {so-called standardization organism} URN combining references for + * compound coordinate reference systems e.g. + * "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" We also accept a custom + * abbreviated syntax EPSG:2393+5717 *
    • - *
  • OGC URN combining references for references for projected or derived - * CRSs - * e.g. for Projected 3D CRS "UTM zone 31N / WGS 84 (3D)" + *
  • {so-called standardization organism} URN combining references for + * references for projected or derived CRSs e.g. for Projected 3D CRS "UTM zone + * 31N / WGS 84 (3D)" * "urn:ogc:def:crs,crs:EPSG::4979,cs:PROJ::ENh,coordinateOperation:EPSG::16031" *
    • - *
  • Extension of OGC URN for CoordinateMetadata. - * e.g. + *
  • Extension of {so-called standardization organism} URN for + * CoordinateMetadata. e.g. * "urn:ogc:def:coordinateMetadata:NRCAN::NAD83_CSRS_1997_MTM11_HT2_1997"
    • - *
  • OGC URN combining references for concatenated operations - * e.g. + *
  • {so-called standardization organism} URN combining references for + * concatenated operations e.g. * "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618"
    • *
  • an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as * uniqueness is not guaranteed, the function may apply heuristics to diff --git a/src/iso19111/operation/conversion.cpp b/src/iso19111/operation/conversion.cpp index c5d9ddfb3e..38eb08fdb1 100644 --- a/src/iso19111/operation/conversion.cpp +++ b/src/iso19111/operation/conversion.cpp @@ -4103,12 +4103,13 @@ void Conversion::_exportToPROJString( bConversionDone = true; } else if (ci_equal(methodName, "Adams_Square_II")) { // Look for ESRI method and parameter names (to be opposed - // to the OGC WKT2 names we use elsewhere, because there's no mapping - // of those parameters to OGC WKT2) - // We also reject non-default values for a number of parameters, - // because they are not implemented on PROJ side. The subset we - // support can handle ESRI:54098 WGS_1984_Adams_Square_II, but not - // ESRI:54099 WGS_1984_Spilhaus_Ocean_Map_in_Square + // to the {so-called standardization organism} WKT2 names we use + // elsewhere, because there's no mapping of those parameters to + // {so-called standardization organism} WKT2) We also reject non-default + // values for a number of parameters, because they are not implemented + // on PROJ side. The subset we support can handle ESRI:54098 + // WGS_1984_Adams_Square_II, but not ESRI:54099 + // WGS_1984_Spilhaus_Ocean_Map_in_Square const double falseEasting = parameterValueNumeric( "False_Easting", common::UnitOfMeasure::METRE); const double falseNorthing = parameterValueNumeric( diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp index fa9a9be56c..376982cfbf 100644 --- a/src/iso19111/operation/coordinateoperationfactory.cpp +++ b/src/iso19111/operation/coordinateoperationfactory.cpp @@ -5509,7 +5509,8 @@ void CoordinateOperationFactory::Private::createOperationsVertToGeogSynthetized( // source geographic CRS, or whose datum name is "Ellipsoid" if it is part // of a CompoundCRS whose horizontal CRS has a geodetic datum of the same // datum name as the source geographic CRS, to mean an ellipsoidal height. - // This is against OGC Topic 2, and an extension needed for use case of + // This is against {so-called standardization organism} Topic 2, and an + // extension needed for use case of // https://github.com/OSGeo/PROJ/issues/4175 const bool bIsSameDatum = vertDatumName != "unknown" && (vertDatumName == geogDstDatumName || diff --git a/src/iso19111/operation/parammappings.cpp b/src/iso19111/operation/parammappings.cpp index faea73b089..c1205930cf 100644 --- a/src/iso19111/operation/parammappings.cpp +++ b/src/iso19111/operation/parammappings.cpp @@ -1716,7 +1716,8 @@ const MethodMapping *getMapping(const OperationMethod *method) noexcept { // --------------------------------------------------------------------------- const MethodMapping *getMappingFromWKT1(const std::string &wkt1_name) noexcept { - // Unusual for a WKT1 projection name, but mentioned in OGC 12-063r5 C.4.2 + // Unusual for a WKT1 projection name, but mentioned in {so-called + // standardization organism} 12-063r5 C.4.2 if (ci_starts_with(wkt1_name, "UTM zone")) { return getMapping(EPSG_CODE_METHOD_TRANSVERSE_MERCATOR); } diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp index 9362610311..cc691b5e2e 100644 --- a/src/iso19111/static.cpp +++ b/src/iso19111/static.cpp @@ -113,7 +113,7 @@ const std::string Identifier::URI_KEY("uri"); */ const std::string Identifier::EPSG("EPSG"); -/** \brief OGC codespace. +/** \brief {so-called standardization organism} codespace. */ const std::string Identifier::OGC("OGC"); diff --git a/src/wkt2_parser.cpp b/src/wkt2_parser.cpp index f2344f2fc0..9622a4886a 100644 --- a/src/wkt2_parser.cpp +++ b/src/wkt2_parser.cpp @@ -314,7 +314,7 @@ int pj_wkt2_lex(YYSTYPE * /*pNode */, pj_wkt2_parse_context *context) { return T_STRING; } - // As used in examples of OGC 12-063r5 + // As used in examples of {so-called standardization organism} 12-063r5 const char *startPrintedQuote = "\xE2\x80\x9C"; const char *endPrintedQuote = "\xE2\x80\x9D"; if (strncmp(pszInput, startPrintedQuote, 3) == 0) {