From bf4527a7c30ac8a4d40586743da0dec3b049d728 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Fri, 17 May 2024 14:51:26 +0200 Subject: [PATCH 1/8] Fixes #1935 --- docs/odata-csdl-json/odata-csdl-json.html | 19 ++++++++++------- docs/odata-csdl-json/odata-csdl-json.md | 5 ++++- docs/odata-csdl-xml/odata-csdl-xml.html | 21 ++++++++++++------- docs/odata-csdl-xml/odata-csdl-xml.md | 5 ++++- docs/odata-json-format/odata-json-format.html | 7 ++++++- docs/odata-json-format/odata-json-format.md | 3 +++ odata-csdl/1 Introduction.md | 5 +++++ odata-csdl/13 Entity Container.md | 2 +- odata-json-format/1 Introduction.md | 3 +++ odata-json-format/7 Structural Property.md | 2 ++ 10 files changed, 53 insertions(+), 19 deletions(-) diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html index 11e8ec0b3..f834d7ae3 100644 --- a/docs/odata-csdl-json/odata-csdl-json.html +++ b/docs/odata-csdl-json/odata-csdl-json.html @@ -389,31 +389,36 @@

525 +Section 3.4.5 +SRID value variable is deprecated + 1935 + + Section 4 Additional $Version value 4.02 - + Section 14.3.13 Constant Geo values in annotations 654 - + Section 14.3.14 Constant Stream values in annotations 654 - + Section 14.4.1.2 New path evaluation rules for annotations targeting annotations and external targeting via container 575 - + Section 14.4.7 Nested If without else part in collections 326 - + Section 17 Additional conformance clauses for version 4.02 @@ -764,7 +769,7 @@

$Unicode

3.4.5 SRID

For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-

The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types.

+

The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as OData-JSON defines no representation for instance-specific spatial reference systems.

The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

$SRID

@@ -1876,7 +1881,7 @@

Entity C

13.1 Extending an Entity Container

An entity container MAY specify that it extends another entity container in scope. All children of the “base” entity container are added to the “extending” entity container.

If the “extending” entity container defines an entity set with the same name as defined in any of its “base” containers, then the entity set’s type MUST specify an entity type derived from the entity type specified for the identically named entity set in the “base” container. The same holds for singletons. Action imports and function imports cannot be redefined, nor can the “extending” container define a child with the same name as a child of a different kind in a “base” container.

-

Note: services should not introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers.

+

Note: services SHOULD NOT introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers.

$Extends

The value of $Extends is the qualified name of the entity container to be extended.

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md index 7ae0f106c..7f182da73 100644 --- a/docs/odata-csdl-json/odata-csdl-json.md +++ b/docs/odata-csdl-json/odata-csdl-json.md @@ -265,6 +265,7 @@ modifications made necessary to fully cover OData CSDL Version 4.01. Section | Feature / Change | Issue --------|------------------|------ [Section 3.3](#PrimitiveTypes)| Allow stream-valued non-binding parameters| [525](https://github.com/oasis-tcs/odata-specs/issues/525) +[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935) [Section 4](#CSDLJSONDocument) | Additional `$Version` value `4.02` | [Section 14.3.13](#GeoValues) | Constant Geo values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654) [Section 14.3.14](#StreamValues) | Constant Stream values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654) @@ -846,6 +847,8 @@ spatial reference system is applied to its values. The value of the `SRID` facet MUST be a non-negative integer or the special value `variable`. If no value is specified, the facet defaults to `0` for `Geometry` types or `4326` for `Geography` types. +Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON) +defines no representation for instance-specific spatial reference systems. The valid values of the `SRID` facet and their meanings are as defined by the European Petroleum Survey Group [EPSG](#_EPSG). @@ -3162,7 +3165,7 @@ holds for singletons. Action imports and function imports cannot be redefined, nor can the "extending" container define a child with the same name as a child of a different kind in a "base" container. -Note: services should not introduce cycles by extending entity +Note: services SHOULD NOT introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers. diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html index 9c2a908a0..2818e39b3 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.html +++ b/docs/odata-csdl-xml/odata-csdl-xml.html @@ -388,36 +388,41 @@

525 +Section 3.4.5 +SRID value variable is deprecated + 1935 + + Section 4 Additional Version value 4.02 - + Section 13 All children of edm:EntityContainer are optional 464 - + Section 14.3.13 Constant Geo values in annotations 654 - + Section 14.3.14 Constant Stream values in annotations 654 - + Section 14.4.1.2 New path evaluation rules for annotations targeting annotations and external targeting via container 575 - + Section 14.4.7 Nested If without else part in collections 326 - + Section 17 Additional conformance clauses for version 4.02 @@ -750,7 +755,7 @@

Attribute

3.4.5 SRID

For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-

The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types.

+

The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as OData-JSON defines no representation for instance-specific spatial reference systems.

The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

Attribute SRID

@@ -1713,7 +1718,7 @@

13.1 Extending an Entity Container

An entity container MAY specify that it extends another entity container in scope. All children of the “base” entity container are added to the “extending” entity container.

If the “extending” entity container defines an entity set with the same name as defined in any of its “base” containers, then the entity set’s type MUST specify an entity type derived from the entity type specified for the identically named entity set in the “base” container. The same holds for singletons. Action imports and function imports cannot be redefined, nor can the “extending” container define a child with the same name as a child of a different kind in a “base” container.

-

Note: services should not introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers.

+

Note: services SHOULD NOT introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers.

Attribute Extends

The value of Extends is the qualified name of the entity container to be extended.

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md index 6e47aa8f3..687529cd3 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.md +++ b/docs/odata-csdl-xml/odata-csdl-xml.md @@ -265,6 +265,7 @@ Schema Definition Language (XSD) 1.1 as described in Section | Feature / Change | Issue --------|------------------|------ [Section 3.3](#PrimitiveTypes)| Allow stream-valued non-binding parameters| [525](https://github.com/oasis-tcs/odata-specs/issues/525) +[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935) [Section 4](#CSDLXMLDocument) | Additional `Version` value `4.02` | [Section 13](#EntityContainer)| All children of `edm:EntityContainer` are optional| [464](https://github.com/oasis-tcs/odata-specs/issues/464) [Section 14.3.13](#GeoValues) | Constant Geo values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654) @@ -779,6 +780,8 @@ spatial reference system is applied to its values. The value of the `SRID` facet MUST be a non-negative integer or the special value `variable`. If no value is specified, the facet defaults to `0` for `Geometry` types or `4326` for `Geography` types. +Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON) +defines no representation for instance-specific spatial reference systems. The valid values of the `SRID` facet and their meanings are as defined by the European Petroleum Survey Group [EPSG](#_EPSG). @@ -2971,7 +2974,7 @@ holds for singletons. Action imports and function imports cannot be redefined, nor can the "extending" container define a child with the same name as a child of a different kind in a "base" container. -Note: services should not introduce cycles by extending entity +Note: services SHOULD NOT introduce cycles by extending entity containers. Clients should be prepared to process cycles introduced by extending entity containers. diff --git a/docs/odata-json-format/odata-json-format.html b/docs/odata-json-format/odata-json-format.html index ad2d60b72..51290b00f 100644 --- a/docs/odata-json-format/odata-json-format.html +++ b/docs/odata-json-format/odata-json-format.html @@ -315,6 +315,11 @@

mediaContentType can be null 536 + +Section 7, Section A.2 +Removed reference to obsolete version of GeoJSON +456 +

1.2 Glossary

@@ -764,7 +769,7 @@

7.1

Primitive values that cannot be represented, for example due to server conversion issues or IEEE754 limitations on the size of an Edm.Int64 or Edm.Decimal value, are annotated with the Core.ValueException term. In this case, the payload MAY include an approximation of the value and MAY specify a string representation of the exact value in the value property of the annotation.

Enumeration values are represented as JSON strings whose content satisfies the rule enumValue in OData-ABNF. The preferred representation is the enumerationMember. If no enumerationMember (or combination of named enumeration members) is available, the enumMemberValue representation may be used.

Geography and geometry values are represented as geometry types as defined in RFC7946.

-

Geography and geometry types have the same representation in a JSON payload. Whether the value represents a geography type or geometry type is inferred from its usage or specified using the type control information.

+

Geography and geometry types have the same representation in a JSON payload. Whether the value represents a geography type or geometry type is inferred from its usage or specified using the type control information. RFC7946 does not define means for expressing instance-specific Coordinate Reference Systems.

Example 12:

{
diff --git a/docs/odata-json-format/odata-json-format.md b/docs/odata-json-format/odata-json-format.md
index 0f6245526..cd0ea774d 100644
--- a/docs/odata-json-format/odata-json-format.md
+++ b/docs/odata-json-format/odata-json-format.md
@@ -213,6 +213,7 @@ An OData JSON payload may represent:
 Section | Feature / Change | Issue
 --------|------------------|------
 [Section 4.5.12](#ControlInformationmediaodatamedia)|  `mediaContentType` can be `null`| [536](https://github.com/oasis-tcs/odata-specs/issues/536)
+[Section 7](#StructuralProperty), [Section A.2](#InformativeReferences)| Removed reference to obsolete version of GeoJSON| [456](https://github.com/oasis-tcs/odata-specs/issues/456)
 
 ## 1.2 Glossary
 
@@ -1403,6 +1404,8 @@ payload. Whether the value represents a geography type or geometry type
 is inferred from its usage or specified using the
 [`type`](#ControlInformationtypeodatatype)
 control information.
+[RFC7946](#rfc7946) does not define means for expressing instance-specific
+[Coordinate Reference Systems](https://datatracker.ietf.org/doc/html/rfc7946#section-4).
 
 ::: example
 Example 12:
diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index 0a63f2c82..726bac0b3 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -32,6 +32,9 @@ Section | Feature / Change | Issue
 [Section ##PrimitiveTypes]| 
 Allow stream-valued non-binding parameters| 
 [525](https://github.com/oasis-tcs/odata-specs/issues/525)
+[Section ##SRID]| 
+SRID value `variable` is deprecated| 
+[ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
 : varjson
 [Section ##CSDLJSONDocument] | Additional `$Version` value `4.02` |
 :
@@ -812,6 +815,8 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
+Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON)
+defines no representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).
diff --git a/odata-csdl/13 Entity Container.md b/odata-csdl/13 Entity Container.md
index a7fa49a91..d027bc4f2 100644
--- a/odata-csdl/13 Entity Container.md	
+++ b/odata-csdl/13 Entity Container.md	
@@ -211,7 +211,7 @@ holds for singletons. Action imports and function imports cannot be
 redefined, nor can the "extending" container define a child with the
 same name as a child of a different kind in a "base" container.
 
-Note: services should not introduce cycles by extending entity
+Note: services SHOULD NOT introduce cycles by extending entity
 containers. Clients should be prepared to process cycles introduced by
 extending entity containers.
 
diff --git a/odata-json-format/1 Introduction.md b/odata-json-format/1 Introduction.md
index df58433a3..976ce0410 100644
--- a/odata-json-format/1 Introduction.md	
+++ b/odata-json-format/1 Introduction.md	
@@ -24,6 +24,9 @@ Section | Feature / Change | Issue
 [Section ##ControlInformationmediaodatamedia]| 
  `mediaContentType` can be `null`| 
 [536](https://github.com/oasis-tcs/odata-specs/issues/536)
+[Section ##StructuralProperty], [Section ##InformativeReferences]| 
+Removed reference to obsolete version of GeoJSON| 
+[456](https://github.com/oasis-tcs/odata-specs/issues/456)
 
 ## ##subsec Glossary
 
diff --git a/odata-json-format/7 Structural Property.md b/odata-json-format/7 Structural Property.md
index 691e5069c..188159e40 100644
--- a/odata-json-format/7 Structural Property.md	
+++ b/odata-json-format/7 Structural Property.md	
@@ -61,6 +61,8 @@ payload. Whether the value represents a geography type or geometry type
 is inferred from its usage or specified using the
 [`type`](#ControlInformationtypeodatatype)
 control information.
+[RFC7946](#rfc7946) does not define means for expressing instance-specific
+[Coordinate Reference Systems](https://datatracker.ietf.org/doc/html/rfc7946#section-4).
 
 ::: example
 Example ##ex:

From d5f10f7a20a28ef813cb3a93f761983129112b06 Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Tue, 21 May 2024 14:11:39 +0200
Subject: [PATCH 2/8] Superfluous whitespace

---
 docs/odata-csdl-json/odata-csdl-json.html | 2 +-
 docs/odata-csdl-json/odata-csdl-json.md   | 2 +-
 docs/odata-csdl-xml/odata-csdl-xml.html   | 2 +-
 docs/odata-csdl-xml/odata-csdl-xml.md     | 2 +-
 odata-csdl/1 Introduction.md              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html
index f834d7ae3..0dee1cdda 100644
--- a/docs/odata-csdl-json/odata-csdl-json.html
+++ b/docs/odata-csdl-json/odata-csdl-json.html
@@ -391,7 +391,7 @@ 

 Section 3.4.5
 SRID value variable is deprecated
- 1935
+1935
 
 
 Section 4
diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md
index 7f182da73..1fe3a48d7 100644
--- a/docs/odata-csdl-json/odata-csdl-json.md
+++ b/docs/odata-csdl-json/odata-csdl-json.md
@@ -265,7 +265,7 @@ modifications made necessary to fully cover OData CSDL Version 4.01.
 Section | Feature / Change | Issue
 --------|------------------|------
 [Section 3.3](#PrimitiveTypes)| Allow stream-valued non-binding parameters| [525](https://github.com/oasis-tcs/odata-specs/issues/525)
-[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
+[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
 [Section 4](#CSDLJSONDocument) | Additional `$Version` value `4.02` |
 [Section 14.3.13](#GeoValues) | Constant Geo values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654)
 [Section 14.3.14](#StreamValues) | Constant Stream values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654)
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
index 2818e39b3..d0dc64d06 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -390,7 +390,7 @@ 

 Section 3.4.5
 SRID value variable is deprecated
- 1935
+1935
 
 
 Section 4
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
index 687529cd3..e5a12e8b3 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -265,7 +265,7 @@ Schema Definition Language (XSD) 1.1 as described in
 Section | Feature / Change | Issue
 --------|------------------|------
 [Section 3.3](#PrimitiveTypes)| Allow stream-valued non-binding parameters| [525](https://github.com/oasis-tcs/odata-specs/issues/525)
-[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
+[Section 3.4.5](#SRID)| SRID value `variable` is deprecated| [1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
 [Section 4](#CSDLXMLDocument) | Additional `Version` value `4.02` |
 [Section 13](#EntityContainer)| All children of `edm:EntityContainer` are optional| [464](https://github.com/oasis-tcs/odata-specs/issues/464)
 [Section 14.3.13](#GeoValues) | Constant Geo values in annotations | [654](https://github.com/oasis-tcs/odata-specs/issues/654)
diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index 726bac0b3..70a155d21 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -34,7 +34,7 @@ Allow stream-valued non-binding parameters|
 [525](https://github.com/oasis-tcs/odata-specs/issues/525)
 [Section ##SRID]| 
 SRID value `variable` is deprecated| 
-[ 1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
+[1935](https://github.com/oasis-tcs/odata-specs/issues/1935)
 : varjson
 [Section ##CSDLJSONDocument] | Additional `$Version` value `4.02` |
 :

From 8d16aede9e9a1a54e2dc83b9ec16d2232ad6fac6 Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Thu, 13 Jun 2024 14:13:35 +0200
Subject: [PATCH 3/8] Rebuilt

---
 docs/odata-json-format/odata-json-format.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/odata-json-format/odata-json-format.html b/docs/odata-json-format/odata-json-format.html
index dee4c92ef..d62802806 100644
--- a/docs/odata-json-format/odata-json-format.html
+++ b/docs/odata-json-format/odata-json-format.html
@@ -338,7 +338,7 @@ 
mediaContentType can be null
 536
 
-
+
 Section 7, Section A.2
 Removed reference to obsolete version of GeoJSON
 456

From 3548ca2e1bc2c717b1408dfc656ccb371ef6751c Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Thu, 20 Jun 2024 16:26:46 +0200
Subject: [PATCH 4/8] Reference JSON format as one example

---
 docs/odata-csdl-json/odata-csdl-json.html |  8 ++++++--
 docs/odata-csdl-json/odata-csdl-json.md   | 11 ++++++-----
 docs/odata-csdl-xml/odata-csdl-xml.html   |  8 ++++++--
 docs/odata-csdl-xml/odata-csdl-xml.md     | 11 ++++++-----
 odata-csdl/1 Introduction.md              | 11 ++++++-----
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html
index 7b0b6e337..8479252cc 100644
--- a/docs/odata-csdl-json/odata-csdl-json.html
+++ b/docs/odata-csdl-json/odata-csdl-json.html
@@ -743,7 +743,11 @@ 
3.3
 
Edm.Decimal with a Scale value of floating, Edm.Double, and Edm.Single allow the special numeric values -INF, INF, and NaN.

 
Edm.Stream is a primitive type that can be used as a property of an entity type or complex type, the underlying type for a type definition, or a binding or non-binding parameter or return type of an action or function. Edm.Stream, or a type definition whose underlying type is Edm.Stream, cannot be used in collections.

 
Some of these types allow facets, defined in section “Type Facets”.

-
See rule primitiveLiteral in OData-ABNF for the representation of primitive type values in URLs and OData-JSON for the representation in requests and responses.

+
Representation of primitive type values is usage specific, see for example

+
    
+
  • rule primitiveLiteral in OData-ABNF for the representation in URLs, and
    • 
+
  • OData-JSON for the representation in JSON request and response bodies.
    • 
+

 
 

 
3.4 Type Facets

@@ -848,7 +852,7 @@ 
$Unicode

 
3.4.5 SRID

 
 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as OData-JSON defines no representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON defines no representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
$SRID

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md
index 427817339..2b6b8d687 100644
--- a/docs/odata-csdl-json/odata-csdl-json.md
+++ b/docs/odata-csdl-json/odata-csdl-json.md
@@ -641,10 +641,11 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-See rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation of primitive type values in URLs and
-[OData-JSON](#ODataJSON) for the representation in requests and
-responses.
+Representation of primitive type values is usage specific, see for example
+- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
+representation in URLs, and
+- [OData-JSON](#ODataJSON) for the representation in JSON request and
+response bodies.
 
 ## 3.4 Type Facets
 
@@ -847,7 +848,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON)
+Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
 defines no representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
index 8d47eba9d..98adce3eb 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -739,7 +739,11 @@ 
3.3
 
Edm.Decimal with a Scale value of floating, Edm.Double, and Edm.Single allow the special numeric values -INF, INF, and NaN.

 
Edm.Stream is a primitive type that can be used as a property of an entity type or complex type, the underlying type for a type definition, or a binding or non-binding parameter or return type of an action or function. Edm.Stream, or a type definition whose underlying type is Edm.Stream, cannot be used in collections.

 
Some of these types allow facets, defined in section “Type Facets”.

-
See rule primitiveLiteral in OData-ABNF for the representation of primitive type values in URLs and OData-JSON for the representation in requests and responses.

+
Representation of primitive type values is usage specific, see for example

+
    
+
  • rule primitiveLiteral in OData-ABNF for the representation in URLs, and
    • 
+
  • OData-JSON for the representation in JSON request and response bodies.
    • 
+

 

 

 
3.4 Type Facets

@@ -828,7 +832,7 @@ 
Attribute 
 
3.4.5 SRID

 

 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as OData-JSON defines no representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON defines no representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
Attribute SRID

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
index 8f74c39ec..8a5cb8c45 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -584,10 +584,11 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-See rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation of primitive type values in URLs and
-[OData-JSON](#ODataJSON) for the representation in requests and
-responses.
+Representation of primitive type values is usage specific, see for example
+- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
+representation in URLs, and
+- [OData-JSON](#ODataJSON) for the representation in JSON request and
+response bodies.
 
 ## 3.4 Type Facets
 
@@ -780,7 +781,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON)
+Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
 defines no representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index 70a155d21..231590955 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -528,10 +528,11 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-See rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation of primitive type values in URLs and
-[OData-JSON](#ODataJSON) for the representation in requests and
-responses.
+Representation of primitive type values is usage specific, see for example
+- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
+representation in URLs, and
+- [OData-JSON](#ODataJSON) for the representation in JSON request and
+response bodies.
 
 ## ##subsec Type Facets
 
@@ -815,7 +816,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as [OData-JSON](#ODataJSON)
+Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
 defines no representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined

From 02b0935747b55107c98d856452c2a3d43bb03617 Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Thu, 20 Jun 2024 16:29:07 +0200
Subject: [PATCH 5/8] Formulation

---
 docs/odata-csdl-json/odata-csdl-json.html | 2 +-
 docs/odata-csdl-json/odata-csdl-json.md   | 2 +-
 docs/odata-csdl-xml/odata-csdl-xml.html   | 2 +-
 docs/odata-csdl-xml/odata-csdl-xml.md     | 2 +-
 odata-csdl/1 Introduction.md              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html
index 8479252cc..8563f9b72 100644
--- a/docs/odata-csdl-json/odata-csdl-json.html
+++ b/docs/odata-csdl-json/odata-csdl-json.html
@@ -852,7 +852,7 @@ 
$Unicode

 
3.4.5 SRID

 
 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON defines no representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON format does not define a representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
$SRID

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md
index 2b6b8d687..291bccc58 100644
--- a/docs/odata-csdl-json/odata-csdl-json.md
+++ b/docs/odata-csdl-json/odata-csdl-json.md
@@ -849,7 +849,7 @@ The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
 Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-defines no representation for instance-specific spatial reference systems.
+format does not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
index 98adce3eb..8adb472ea 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -832,7 +832,7 @@ 
Attribute 
 
3.4.5 SRID

 
 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON defines no representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON format does not define a representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
Attribute SRID

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
index 8a5cb8c45..8f58e5f61 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -782,7 +782,7 @@ The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
 Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-defines no representation for instance-specific spatial reference systems.
+format does not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).
diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index 231590955..71e335fc3 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -817,7 +817,7 @@ The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
 Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-defines no representation for instance-specific spatial reference systems.
+format does not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).

From 3122b57f48decdd1dcec2cc8e35371f072a278d3 Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Wed, 26 Jun 2024 17:32:46 +0200
Subject: [PATCH 6/8] Update odata-csdl/1 Introduction.md

---
 odata-csdl/1 Introduction.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index 71e335fc3..fcf63af5f 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -528,11 +528,8 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-Representation of primitive type values is usage specific, see for example
-- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation in URLs, and
-- [OData-JSON](#ODataJSON) for the representation in JSON request and
-response bodies.
+Representation of primitive type values within a URL is defined by the rule `primitiveLiteral` in [OData-ABNF](#ODataABNF).
+Representation within request and response bodies is format specific.
 
 ## ##subsec Type Facets
 

From 0fd74a3150f208ec4946d73ca916ecaa05c80974 Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Wed, 26 Jun 2024 17:33:04 +0200
Subject: [PATCH 7/8] Rebuilt

---
 docs/odata-csdl-json/odata-csdl-json.html | 6 +-----
 docs/odata-csdl-json/odata-csdl-json.md   | 7 ++-----
 docs/odata-csdl-xml/odata-csdl-xml.html   | 6 +-----
 docs/odata-csdl-xml/odata-csdl-xml.md     | 7 ++-----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html
index 0aa492423..35432f71b 100644
--- a/docs/odata-csdl-json/odata-csdl-json.html
+++ b/docs/odata-csdl-json/odata-csdl-json.html
@@ -743,11 +743,7 @@ 
3.3
 
Edm.Decimal with a Scale value of floating, Edm.Double, and Edm.Single allow the special numeric values -INF, INF, and NaN.

 
Edm.Stream is a primitive type that can be used as a property of an entity type or complex type, the underlying type for a type definition, or a binding or non-binding parameter or return type of an action or function. Edm.Stream, or a type definition whose underlying type is Edm.Stream, cannot be used in collections.

 
Some of these types allow facets, defined in section “Type Facets”.

-
Representation of primitive type values is usage specific, see for example

-
    
-
  • rule primitiveLiteral in OData-ABNF for the representation in URLs, and
    • 
-
  • OData-JSON for the representation in JSON request and response bodies.
    • 
-

+
Representation of primitive type values within a URL is defined by the rule primitiveLiteral in OData-ABNF. Representation within request and response bodies is format specific.

 

 

 
3.4 Type Facets

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md
index 36485ca73..2b2875398 100644
--- a/docs/odata-csdl-json/odata-csdl-json.md
+++ b/docs/odata-csdl-json/odata-csdl-json.md
@@ -641,11 +641,8 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-Representation of primitive type values is usage specific, see for example
-- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation in URLs, and
-- [OData-JSON](#ODataJSON) for the representation in JSON request and
-response bodies.
+Representation of primitive type values within a URL is defined by the rule `primitiveLiteral` in [OData-ABNF](#ODataABNF).
+Representation within request and response bodies is format specific.
 
 ## 3.4 Type Facets
 
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
index 9681c97b7..6666b85fb 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -739,11 +739,7 @@ 
3.3
 
Edm.Decimal with a Scale value of floating, Edm.Double, and Edm.Single allow the special numeric values -INF, INF, and NaN.

 
Edm.Stream is a primitive type that can be used as a property of an entity type or complex type, the underlying type for a type definition, or a binding or non-binding parameter or return type of an action or function. Edm.Stream, or a type definition whose underlying type is Edm.Stream, cannot be used in collections.

 
Some of these types allow facets, defined in section “Type Facets”.

-
Representation of primitive type values is usage specific, see for example

-
    
-
  • rule primitiveLiteral in OData-ABNF for the representation in URLs, and
    • 
-
  • OData-JSON for the representation in JSON request and response bodies.
    • 
-

+
Representation of primitive type values within a URL is defined by the rule primitiveLiteral in OData-ABNF. Representation within request and response bodies is format specific.

 

 

 
3.4 Type Facets

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
index f76da3f3d..a573c3581 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -584,11 +584,8 @@ underlying type is `Edm.Stream`, cannot be used in collections.
 Some of these types allow facets, defined in section
 "[Type Facets](#TypeFacets)".
 
-Representation of primitive type values is usage specific, see for example
-- rule `primitiveLiteral` in [OData-ABNF](#ODataABNF) for the
-representation in URLs, and
-- [OData-JSON](#ODataJSON) for the representation in JSON request and
-response bodies.
+Representation of primitive type values within a URL is defined by the rule `primitiveLiteral` in [OData-ABNF](#ODataABNF).
+Representation within request and response bodies is format specific.
 
 ## 3.4 Type Facets
 

From 8ee724f1ae28321a6591b8037bc9e6267320cb4d Mon Sep 17 00:00:00 2001
From: Ralf Handl 
Date: Wed, 26 Jun 2024 17:39:35 +0200
Subject: [PATCH 8/8] Rephrased

---
 docs/odata-csdl-json/odata-csdl-json.html | 2 +-
 docs/odata-csdl-json/odata-csdl-json.md   | 3 +--
 docs/odata-csdl-xml/odata-csdl-xml.html   | 2 +-
 docs/odata-csdl-xml/odata-csdl-xml.md     | 3 +--
 odata-csdl/1 Introduction.md              | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html
index 35432f71b..e83140bf1 100644
--- a/docs/odata-csdl-json/odata-csdl-json.html
+++ b/docs/odata-csdl-json/odata-csdl-json.html
@@ -848,7 +848,7 @@ 
$Unicode

 
3.4.5 SRID

 
 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON format does not define a representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as some formats, for example OData-JSON, do not define a representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
$SRID

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md
index 2b2875398..f59c00566 100644
--- a/docs/odata-csdl-json/odata-csdl-json.md
+++ b/docs/odata-csdl-json/odata-csdl-json.md
@@ -845,8 +845,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-format does not define a representation for instance-specific spatial reference systems.
+Services SHOULD NOT use the special value `variable` as some formats, for example [OData-JSON](#ODataJSON), do not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
index 6666b85fb..3cc4f2dcc 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -828,7 +828,7 @@ 
Attribute 
 
3.4.5 SRID

 
 
For a geometry- or geography-typed model element the SRID facet identifies which spatial reference system is applied to its values.

-
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as, for example, the OData-JSON format does not define a representation for instance-specific spatial reference systems.

+
The value of the SRID facet MUST be a non-negative integer or the special value variable. If no value is specified, the facet defaults to 0 for Geometry types or 4326 for Geography types. Services SHOULD NOT use the special value variable as some formats, for example OData-JSON, do not define a representation for instance-specific spatial reference systems.

 
The valid values of the SRID facet and their meanings are as defined by the European Petroleum Survey Group EPSG.

 

 
Attribute SRID

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
index a573c3581..dada55534 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -778,8 +778,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-format does not define a representation for instance-specific spatial reference systems.
+Services SHOULD NOT use the special value `variable` as some formats, for example [OData-JSON](#ODataJSON), do not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).
diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
index fcf63af5f..3ff3e739a 100644
--- a/odata-csdl/1 Introduction.md	
+++ b/odata-csdl/1 Introduction.md	
@@ -813,8 +813,7 @@ spatial reference system is applied to its values.
 The value of the `SRID` facet MUST be a non-negative integer or the
 special value `variable`. If no value is specified, the facet defaults
 to `0` for `Geometry` types or `4326` for `Geography` types.
-Services SHOULD NOT use the special value `variable` as, for example, the [OData-JSON](#ODataJSON)
-format does not define a representation for instance-specific spatial reference systems.
+Services SHOULD NOT use the special value `variable` as some formats, for example [OData-JSON](#ODataJSON), do not define a representation for instance-specific spatial reference systems.
 
 The valid values of the `SRID` facet and their meanings are as defined
 by the European Petroleum Survey Group [EPSG](#_EPSG).