Commit 81aa1621 authored by Jason Fox's avatar Jason Fox
Browse files

Fix Merge Conflict with DATA(25)000177_NGSI-LD_Core_Temporal_Pagination 

# Conflicts:
#	md/annex-b.md
#	md/clause-5.md
parents afb6f83e 44eb5486

md/annex-b.md

+2 −0
Original line number Diff line number Diff line
@@ -531,7 +531,9 @@ Such definition has been tested using [i.19]. 
          "@id": "ngsi-ld:endTimeAt",

          "@type": "DateTime"

        },

        "firstN": "ngsi-ld:firstN",

        "lastN": "ngsi-ld:lastN",

        "offsetN": "ngsi-ld:offsetN",

        "timeAt": {

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

          "@type": "DateTime"

md/clause-11.md

+15 −2
Original line number Diff line number Diff line
@@ -577,9 +577,15 @@ Figure: Retrieve Temporal Evolution of an Entity use case 
  (optional).

- An NGSI-LD temporal query as mandated by Clause+++clause-7+++root.2.6

  (optional).

- A parameter (_`firstN`_) conveying that only the first N instances (per

  Attribute) within the concerned temporal interval shall be retrieved

  (optional).

- A parameter (_`lastN`_) conveying that only the last N instances (per

  Attribute) within the concerned temporal interval shall be retrieved

  (optional).

- A parameter (_`offsetN`_) conveying the offset when paginating temporal

  Attribute instances (optional). To be used in combination with _`firstN`_

  (ascending order) or _`lastN`_ (descending order).

- An optional JSON-LD context.

- A flag indicating whether to return the location of the [Entity

  Map]{.HTML-Keyboard} used within the operation (optional).
@@ -741,8 +747,15 @@ Figure: Query Temporal Evolution of Entities use case 
  per Clause+++clause-7+++root.2.3 (optional).

- A limit to the number of Entities to be retrieved. See

  Clause+++clause-7+++root.4.2.

- A parameter (lastN) conveying that only the last N instances (per Attribute)

  within the concerned temporal interval shall be retrieved (optional).

- A parameter (_`firstN`_) conveying that only the first N instances (per

  Attribute) within the concerned temporal interval shall be retrieved

  (optional).

- A parameter (_`lastN`_) conveying that only the last N instances (per

  Attribute) within the concerned temporal interval shall be retrieved

  (optional).

- A parameter (_`offsetN`_) conveying the offset when paginating temporal

  Attribute instances (optional). To be used in combination with _`firstN`_

  (ascending order) or _`lastN`_ (descending order).

- A specified language filter as per Clause+++clause-7+++root.2.7 (optional).

- A list (one or more) of Attribute names whose values shall be expanded to URIs

  prior to executing a query (optional).

md/clause-5.md

+6 −0
Original line number Diff line number Diff line
@@ -462,6 +462,9 @@ Table: Matrix of all Attributes 
| _`features`_                       | FeatureCollection                                                     | Type-scoped definition within                 |

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

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

| _`firstN`_                         | TemporalParams                                                        | Property-scoped definition within             |

|                                    |                                                                       |  _`temporalQ`_                                |

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

| _`format`_                         | NotificationParams                                                    | Property-scoped definition within             |

|                                    |                                                                       |  _`notification`_                             |

+------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------+
@@ -567,6 +570,9 @@ Table: Matrix of all Attributes 
|                                    | LanguageProperty, JsonProperty, VocabProperty                         |                                               |

|                                    |                                                                       |                                               |

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

| _`offsetN`_                        | TemporalParams                                                        | Property-scoped definition within             |

|                                    |                                                                       |  _`temporalQ`_                                |

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

| _`omit`_                           | Query, NotificationParams                                             |                                               |

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

| _`operations`_                     | CSourceRegistration                                                   |                                               |

md/clause-7.md

+16 −0
Original line number Diff line number Diff line
@@ -1734,6 +1734,22 @@ Entities no longer fulfilling the filter criteria of the query. As a result, the 
first page when going backward, and the last page, when going forward, may have

less than the maximum number of Entities.



#### 7.4.2.5 Temporal pagination



Temporal representation of resources adds an additional dimension to the pagination.

Depending on the requested time range, the response will contain multiple instances

of the requested Attribute, and therefore an additional pagination mechanism for

those temporal representations is required, in order to limit the time range of the

response. If no limits are specified, a default limit is enforced, depending on

implementation specific configurations. 



Temporal pagination can be done in ascending order using the _`firstN`_ parameter

and in descending order using the _`lastN`_ parameter, whose respective value (N) 

indicates the **limit**, i.e. the maximum number of temporal instances of any

Attribute allowed on a page. If the transparent behaviour described in 

Clause+++root.4.2.3 is applied to temporal pagination, _`offsetN`_ is used to select

the respective page in the chosen order.



## 7.5 Counting results



Given that NGSI-LD Query operations can potentially return a result set