Commit 01d080fb authored by thomas Bousselin's avatar thomas Bousselin
Browse files

feat: scope propertyNames,relationshipNames and attributeNames behind information.

parent fd575b11

md/annex-b.md

+17 −9
Original line number Diff line number Diff line
@@ -289,7 +289,23 @@ Such definition has been tested using [i.19]. 
      }

    },

    "idPattern": "ngsi-ld:idPattern",

    "information": "ngsi-ld:information",

    "information": {

      "@id": "ngsi-ld:information",

      "@context": {

        "propertyNames": {

          "@id": "ngsi-ld:propertyNames",

          "@type": "@vocab"

        },

        "relationshipNames": {

          "@id": "ngsi-ld:relationshipNames",

          "@type": "@vocab"

        },

        "attributeNames": {

          "@id": "ngsi-ld:attributeNames",

          "@type": "@vocab"

        }

      }

    },

    "instanceId": {

      "@id": "ngsi-ld:instanceId",

      "@type": "@id"
@@ -518,18 +534,10 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:problemDetails",

      "@type": "@json"

    },

    "propertyNames": {

      "@id": "ngsi-ld:propertyNames",

      "@type": "@vocab"

    },

    "q": "ngsi-ld:q",

    "refreshRate": "ngsi-ld:refreshRate",

    "registrationId": "ngsi-ld:registrationId",

    "registrationName": "ngsi-ld:registrationName",

    "relationshipNames": {

      "@id": "ngsi-ld:relationshipNames",

      "@type": "@vocab"

    },

    "resultStatus": "ngsi-ld:resultStatus",

    "scope": "ngsi-ld:scope",

    "scopeQ": "ngsi-ld:scopeQ",

md/clause-5.md

+6 −2
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ Table: Matrix of all Attributes 
+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`attributeNames`_                 | EntityType, RegistrationInfo                                          | Type-scoped definition within                 |

|                                    |                                                                       | [type="EntityType"]{.HTML-Code},              |

|                                    |                                                                       | property-scoped definition within             |

|                                    |                                                                       | '_`information`_'                             |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`attributeTypes`_                 | Attribute                                                             | Type-scoped definition within                 |

|                                    |                                                                       | [type="Attribute"]{.HTML-Code}                |
@@ -658,7 +660,8 @@ Table: Matrix of all Attributes 
| _`properties`_                     | Feature                                                               | Type-scoped definition within                 |

|                                    |                                                                       | [type="Feature"]{.HTML-Code}                  |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`propertyNames`_                  | RegistrationInfo                                                      |                                               |

| _`propertyNames`_                  | RegistrationInfo                                                      | property-scoped definition within             |

|                                    |                                                                       | '_`information`_'                             |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`q`_                              | Query, Subscription                                                   |                                               |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+
@@ -673,7 +676,8 @@ Table: Matrix of all Attributes 
+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`registrationName`_               | CSourceRegistration                                                   |                                               |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`relationshipNames`_              | RegistrationInfo                                                      |                                               |

| _`relationshipNames`_              | RegistrationInfo                                                      | property-scoped definition within             |

|                                    |                                                                       | '_`information`_'                             |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+

| _`resultStatus`_                   | ExecutionResult                                                       |                                               |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+