Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tender locations and addresses, make item locations and addresses plural #34

Merged
merged 5 commits into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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').

Expand Down Expand Up @@ -112,6 +112,12 @@ Report issues for this extension in the [ocds-extensions repository](https://git

## Changelog

### v1.1.6

* 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.5

* Remove type information from field descriptions
Expand Down
56 changes: 54 additions & 2 deletions release-schema.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
},
Expand Down