diff --git a/README.md b/README.md index a14a0b0..a236ded 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Location Data -This extension adds address and location fields to item objects, to communicate the location of proposed or executed contract delivery. +This extension adds address and location fields to tenders and items, to communicate the location of proposed or executed contract delivery. The `locationGazetteers.csv` codelist's `Category` column indicates whether the gazetteer has identifiers for the whole world ('Universal') or only some subset ('National' or 'Sub-National'). @@ -112,6 +112,12 @@ Report issues for this extension in the [ocds-extensions repository](https://git ## Changelog +### v1.1.7 + +* Add `Tender.deliveryAddresses` and `Tender.deliveryLocations` +* Deprecate the `Item.deliveryAddress` field in favor of the new `Item.deliveryAddresses` field, to support items with multiple delivery addresses. +* Deprecate the `Item.deliveryLocation` field in favor of the new `Item.deliveryLocations` field, to support items with multiple delivery locations. + ### v1.1.6 * Add "format": "uri" to `Location.uri` diff --git a/release-schema.json b/release-schema.json index f0951a5..70c8af0 100644 --- a/release-schema.json +++ b/release-schema.json @@ -1,16 +1,68 @@ { "definitions": { + "Tender": { + "properties": { + "deliveryLocations": { + "title": "Delivery Locations", + "description": "The locations where activity related to this tender will take place.", + "type": "array", + "items": { + "$ref": "#/definitions/Location" + }, + "uniqueItems": true, + "wholeListMerge": true + }, + "deliveryAddresses": { + "title": "Delivery Addresses", + "description": "The addresses to which, or where, goods or services related to this tender will be delivered.", + "type": "array", + "items": { + "$ref": "#/definitions/Address" + }, + "uniqueItems": true, + "wholeListMerge": true + } + } + }, "Item": { "properties": { + "deliveryLocations": { + "title": "Delivery Locations", + "description": "The locations where activity related to this tender, contract or license will be delivered", + "type": "array", + "items": { + "$ref": "#/definitions/Location" + }, + "uniqueItems": true, + "wholeListMerge": true + }, "deliveryLocation": { "title": "Delivery Location", "description": "The location where activity related to this tender, contract or license will be delivered, or will take place.", - "$ref": "#/definitions/Location" + "$ref": "#/definitions/Location", + "deprecated": { + "description": "This field is deprecated in favour of `.deliveryLocations` to support items with multiple delivery locations.", + "deprecatedVersion": "1.1.6" + } + }, + "deliveryAddresses": { + "title": "Delivery Addresses", + "description": "The addresses to which, or where, goods or services related to this tender, contract or license will be delivered.", + "type": "array", + "items": { + "$ref": "#/definitions/Address" + }, + "uniqueItems": true, + "wholeListMerge": true }, "deliveryAddress": { "title": "Delivery Address", "description": "The address to which, or where, goods or services related to this tender, contract or license will be delivered.", - "$ref": "#/definitions/Address" + "$ref": "#/definitions/Address", + "deprecated": { + "description": "This field is deprecated in favour of `.deliveryAddresses` to support items with multiple delivery locations.", + "deprecatedVersion": "1.1.6" + } } } },